Merge branch '48-build-entire-sw-in-ci-cd-and-install-the-output' into 'master'

Resolve "Build entire SW in CI/CD and install the output" Closes #48 See merge request be-cem-edl/fec/hardware-modules/fmc-adc-100m14b4cha!16

Merge branch '48-build-entire-sw-in-ci-cd-and-install-the-output' into 'master'
Resolve "Build entire SW in CI/CD and install the output" Closes #48 See merge request be-cem-edl/fec/hardware-modules/fmc-adc-100m14b4cha!16
cf44c311 · Federico Vaga · 9a190948 · 84517a43 · cf44c311 · cf44c311
Commit cf44c311 authored Sep 28, 2023 by Federico Vaga
5 changed files
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,12 +26,12 @@ flawfinder:
  image:
    name: gitlab-registry.cern.ch/coht/common-containers/static-analysis:latest
  script:
-    - make -C software/tools flawfinder
+    - make -C software flawfinder

-kernel_build_cc7:
-  extends: .kernel_build_cc7
+software_build:
+  extends: .build_fec_os_sw
  variables:
-    EDL_CI_KBUILD_PATHS: software/kernel
+    EDL_CI_SW_PATHS: software

 kernel_build_validation:
  extends: .kernel_build_validation

--- a/LICENSES/LGPL-2.1-or-later.txt
+++ b/LICENSES/LGPL-2.1-or-later.txt
--- a/software/Makefile
+++ b/software/Makefile
@@ -8,7 +8,9 @@

 all: kernel tools

-DIRS =kernel tools
+C_DIRS = kernel tools
+
+DIRS = $(C_DIRS)

 .PHONY: all clean modules install modules_install cppcheck $(DIRS)

@@ -25,5 +27,5 @@ modules_install: TARGET = modules_install
 $(DIRS):
 	$(MAKE) -C $@ $(TARGET)

-cppcheck:
-	@$(MAKE) -C tools $@
+cppcheck flawfinder:
+	for d in $(DIRS); do $(MAKE) -C $$d $@ || exit 1; done
--- a/software/kernel/Makefile
+++ b/software/kernel/Makefile
@@ -64,7 +64,12 @@ clean modules help modules_install coccicheck:
 		GIT_VERSION=$(GIT_VERSION) \
 		VMEBUS_ABS=$(VMEBUS_ABS) $@

+install: modules modules_install
+
 cppcheck:
 	$(CPPCHECK) -q -I. -I$(ZIO_ABS)/include -I$(FMC_BUS_ABS)/  --suppress=missingIncludeSystem --enable=all *.c *.h

-.PHONY: all coccicheck clean cppcheck modules modules_install
+flawfinder:
+	$(FLAWFINDER) -SQDC --error-level=3 .
+
+.PHONY: all coccicheck clean cppcheck modules modules_install flawfinder install
--- a/software/tools/Makefile
+++ b/software/tools/Makefile
@@ -12,8 +12,6 @@ REPO_PARENT ?= ../..
 -include $(REPO_PARENT)/parent_common.mk

 # user-space tools for spec-fine-delay
-DESTDIR ?= /usr/local
-
 GIT_VERSION := $(shell git describe --dirty --long --tags)
 CFLAGS += -I../kernel -Wno-trigraphs -Wall -Werror -ggdb -O2  $(EXTRACFLAGS)
 CFLAGS += -DGIT_VERSION="\"$(GIT_VERSION)\""
@@ -36,9 +34,14 @@ clean:
 # make nothing for modules_install, but avoid errors
 modules_install:

-install:
-	install -d $(DESTDIR)/bin
-	install -D $(progs) $(DESTDIR)/bin
+DESTDIR ?=
+prefix ?= /usr/local
+exec_prefix ?= $(prefix)
+bindir ?= $(exec_prefix)/bin
+
+install: all
+	mkdir -m 0775 -p $(DESTDIR)$(bindir)
+	install -D -t $(DESTDIR)$(bindir) -m 0755 $(progs)

 # we need this as we are out of the kernel
 %: %.c