Skip to content

M
Mock Turtle
Commit e0ccf1aa authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

ci: add WBGEN2 generated file to distributed file 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent a174a79e
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 7 deletions
.gitlab-ci.yml
View file @ e0ccf1aa
...@@ -9,6 +9,10 @@ variables: ...@@ -9,6 +9,10 @@ variables:
DIST_PATH: distribution DIST_PATH: distribution
BUILD_PATH: ${DIST_PATH}/build BUILD_PATH: ${DIST_PATH}/build
before_script:
- git clone https://ohwr.org/project/wishbone-gen.git ~/git/wbgen2
- export WBGEN2=~/git/wbgen2/wbgen2
stages: stages:
- static-analysis - static-analysis
- build - build
...@@ -28,8 +32,8 @@ build: ...@@ -28,8 +32,8 @@ build:
stage: build stage: build
script: script:
- yum install -y kernel-devel lua git - yum install -y kernel-devel lua git
- git clone https://ohwr.org/project/wishbone-gen.git ~/git/wbgen2 - export LINUX=/usr/src/kernels/*/
- WBGEN2=~/git/wbgen2/wbgen2 LINUX=/usr/src/kernels/*/ make - make
artifacts: artifacts:
paths: paths:
- include/ - include/
...@@ -39,7 +43,8 @@ build_srpm: ...@@ -39,7 +43,8 @@ build_srpm:
stage: srpm stage: srpm
script: script:
- yum-builddep -y ${DIST_PATH}/*.spec - yum-builddep -y ${DIST_PATH}/*.spec
- LINUX=/usr/src/kernels/*/ make -C distribution srpm - export LINUX=/usr/src/kernels/*/
- make -C distribution srpm
artifacts: artifacts:
paths: paths:
- distribution/build/SRPMS/${CI_PROJECT_NAME}*src.rpm - distribution/build/SRPMS/${CI_PROJECT_NAME}*src.rpm
......
distribution/Makefile
View file @ e0ccf1aa
...@@ -104,12 +104,20 @@ devel-rpm: userspace-tar ...@@ -104,12 +104,20 @@ devel-rpm: userspace-tar
.PHONY: dkmstree dkms-add kernel-dkms-tar userspace-dir userspace-spec userspace-tar userspace-rpm tools-rpm lib-static-rpm lib-rpm .PHONY: dkmstree dkms-add kernel-dkms-tar userspace-dir userspace-spec userspace-tar userspace-rpm tools-rpm lib-static-rpm lib-rpm
sources-tar: sources-tar:
mkdir -p $(SOURCES) @mkdir -p $(SOURCES)
cd $(TRTL) && $(GIT) archive --format=tar.gz -o $(SOURCES)/$(DIR_NAME).tar.gz --prefix=$(DIR_NAME)/ HEAD @cd $(TRTL) && $(GIT) archive --format=tar -o $(SOURCES)/$(DIR_NAME).tar --prefix=$(DIR_NAME)/ HEAD
sources: sources-tar sources-tar-replace-autogen: sources-tar wbgen2-headers
@tar -rf $(SOURCES)/$(DIR_NAME).tar --transform "s,^,"$(DIR_NAME)"/," $(TRTL_SW)/include/mockturtle/hw/mockturtle_cpu_lr.h $(TRTL_SW)/include/mockturtle/hw/mockturtle_cpu_csr.h
@tar --delete -f $(SOURCES)/$(DIR_NAME).tar $(DIR_NAME)/software/include/mockturtle/hw/Makefile
sources-tar-gz: sources-tar sources-tar-replace-autogen
@gzip $(SOURCES)/$(DIR_NAME).tar
sources: sources-tar-gz
@tar -C $(SOURCES) -xvf $(SOURCES)/$(DIR_NAME).tar.gz $(DIR_NAME)/CHANGELOG.rst @tar -C $(SOURCES) -xvf $(SOURCES)/$(DIR_NAME).tar.gz $(DIR_NAME)/CHANGELOG.rst
@mv $(SOURCES)/$(DIR_NAME)/CHANGELOG.rst $(SOURCES)/CHANGELOG @mv $(SOURCES)/$(DIR_NAME)/CHANGELOG.rst $(SOURCES)/CHANGELOG
@rmdir $(SOURCES)/$(DIR_NAME)
srpm-changelog: sources srpm-changelog: sources
$(eval $@_pattern := ^\[([0-9]+\.[0-9]+\.[0-9]+)\]\s-\s([0-9]{4}-[0-9]{2}-[0-9]{2})$) $(eval $@_pattern := ^\[([0-9]+\.[0-9]+\.[0-9]+)\]\s-\s([0-9]{4}-[0-9]{2}-[0-9]{2})$)
...@@ -136,3 +144,6 @@ endif ...@@ -136,3 +144,6 @@ endif
clean: clean:
@rm -rf $(BUILD) $(SOURCES) *.tar.gz $(RPM_SPEC) @rm -rf $(BUILD) $(SOURCES) *.tar.gz $(RPM_SPEC)
.PHONY: sources-tar-reeplace-autogen sources-tar sources-tar-gz sources srpm-changelog rpm-spec srpm-changelog srpm
software/include/Makefile
View file @ e0ccf1aa
...@@ -5,11 +5,16 @@ ...@@ -5,11 +5,16 @@
PREFIX ?= / PREFIX ?= /
INCLUDEDESTDIR ?= $(PREFIX)/usr/local/include INCLUDEDESTDIR ?= $(PREFIX)/usr/local/include
all: all:
ifneq ($(wildcard ./mockturtle/hw/Makefile),) # Removed during distribution
$(MAKE) -C mockturtle/hw $(MAKE) -C mockturtle/hw
endif
clean: clean:
ifneq ($(wildcard ./mockturtle/hw/Makefile),) # Removed during distribution
$(MAKE) -C mockturtle/hw clean $(MAKE) -C mockturtle/hw clean
endif
install: all install: all
install -d $(INCLUDEDESTDIR)/mockturtle install -d $(INCLUDEDESTDIR)/mockturtle
...@@ -23,3 +28,5 @@ uninstall: ...@@ -23,3 +28,5 @@ uninstall:
rm -f $(INCLUDEDESTDIR)/mockturtle/* rm -f $(INCLUDEDESTDIR)/mockturtle/*
rmdir --ignore-fail-on-non-empty $(INCLUDEDESTDIR)/mockturtle rmdir --ignore-fail-on-non-empty $(INCLUDEDESTDIR)/mockturtle
rmdir --ignore-fail-on-non-empty $(INCLUDEDESTDIR) rmdir --ignore-fail-on-non-empty $(INCLUDEDESTDIR)
.PHONY: all clean install uninstall
software/kernel/Makefile
View file @ e0ccf1aa
...@@ -47,7 +47,7 @@ all modules: hw_header ...@@ -47,7 +47,7 @@ all modules: hw_header
hw_header: hw_header:
ifeq ($(DKMS), 0) ifeq ($(DKMS), 0)
$(MAKE) -C $(TRTL_SW)/include/mockturtle/hw/ $(MAKE) -C $(TRTL_SW)/include/
endif endif
install: modules_install install: modules_install
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment