Merge branch '17-fix-default-repo_parent' into 'master'

Resolve "fix default REPO_PARENT" Closes #17 See merge request be-cem-edl/fec/hardware-modules/fmc-delay-1ns-8cha!8

Merge branch '17-fix-default-repo_parent' into 'master'
Resolve "fix default REPO_PARENT" Closes #17 See merge request be-cem-edl/fec/hardware-modules/fmc-delay-1ns-8cha!8
d16139eb · Federico Vaga · e7d82165 · 10608453 · d16139eb · d16139eb
Commit d16139eb authored Dec 13, 2022 by Federico Vaga
6 changed files
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,10 +14,18 @@ include:
      - 'edl-gitlab-ci.yml'
  - local: 'hdl/syn/.gitlab-ci.yml'

+.script_fetch_kernel_dep: &script_fetch_kernel_dep
+  - git clone -b v1.1.5 --depth 1 https://ohwr.org/project/fmc-sw.git ~/git/fmc
+  - export FMC=~/git/fmc
+  - git clone -b v1.4.4 --depth 1 https://ohwr.org/project/zio.git ~/git/zio
+  - export ZIO=~/git/zio
+
 cppcheck:
  stage: analyse
  image:
    name: gitlab-registry.cern.ch/coht/common-containers/static-analysis:latest
+  before_script:
+    - *script_fetch_kernel_dep
  script:
    - make -C software cppcheck

@@ -25,15 +33,11 @@ flawfinder:
  stage: analyse
  image:
    name: gitlab-registry.cern.ch/coht/common-containers/static-analysis:latest
+  before_script:
+    - *script_fetch_kernel_dep
  script:
    - make -C software/tools flawfinder

-.script_fetch_kernel_dep: &script_fetch_kernel_dep
-  - git clone -b v1.1.5 --depth 1 https://ohwr.org/project/fmc-sw.git ~/git/fmc
-  - export FMC=~/git/fmc
-  - git clone -b v1.4.4 --depth 1 https://ohwr.org/project/zio.git ~/git/zio
-  - export ZIO=~/git/zio
-
 .script_build_kernel_dep: &script_build_kernel_dep
  - make -C $FMC/drivers/fmc all
  - make -C $ZIO/drivers/zio all

--- a/software/Makefile
+++ b/software/Makefile
@@ -4,7 +4,6 @@

 # include parent_common.mk for buildsystem's defines
 # use absolute path for REPO_PARENT
-REPO_PARENT ?= $(shell pwd)/../..
 -include $(REPO_PARENT)/parent_common.mk

 all: kernel lib tools

--- a/software/kernel/Makefile
+++ b/software/kernel/Makefile
@@ -5,7 +5,6 @@
 -include Makefile.specific
 # include parent_common.mk for buildsystem's defines
 #use absolute path for REPO_PARENT
-REPO_PARENT ?= $(shell pwd)/../../..
 -include $(REPO_PARENT)/parent_common.mk

 CPPCHECK ?= cppcheck

--- a/software/lib/Makefile
+++ b/software/lib/Makefile
@@ -11,7 +11,6 @@

 # include parent_common.mk for buildsystem's defines
 IGNORE_CPU_SUFFIX := y
-REPO_PARENT= $(shell pwd)/../../..
 -include $(REPO_PARENT)/parent_common.mk

 ifdef REPO_PARENT

--- a/software/oldtools/Makefile
+++ b/software/oldtools/Makefile
@@ -11,7 +11,6 @@

 M = $(shell /bin/pwd)/../kernel

-REPO_PARENT ?= $(shell pwd)/../../..
 ZIO_ABS_PATH ?= $(REPO_PARENT)/zio

 HOST_EXTRACFLAGS += -I$(M) -I../lib -I$(ZIO_ABS_PATH)/include -Wno-trigraphs -Wall -ggdb

--- a/software/tools/Makefile
+++ b/software/tools/Makefile
@@ -11,7 +11,6 @@

 # include parent_common.mk for buildsystem's defines
 IGNORE_CPU_SUFFIX := y
-REPO_PARENT ?= $(pwd)/../../..
 -include $(REPO_PARENT)/parent_common.mk

 DESTDIR ?= /usr/local