fix(pkg/driverbuilder): use a single constant for the Cmake command.

FedeDP · FedeDP · commit 13171b633d81 · 2024-02-28T16:10:40.000+01:00
Moreover, add back some now unused cmake variables, ie:
* PROBE_NAME
* PROBE_VERSION
* PROBE_DEVICE_NAME

Signed-off-by: Federico Di Pierro &lt;nierro92@gmail.com&gt;
diff --git a/pkg/driverbuilder/builder/builders.go b/pkg/driverbuilder/builder/builders.go
@@ -31,7 +31,25 @@ import (
 )
 
 // DriverDirectory is the directory the processor uses to store the driver.
-const DriverDirectory = "/tmp/driver"
+const (
+	DriverDirectory = "/tmp/driver"
+	cmakeCmdFmt     = `cmake -Wno-dev \
+  -DUSE_BUNDLED_DEPS=On \
+  -DCREATE_TEST_TARGETS=Off \
+  -DBUILD_LIBSCAP_GVISOR=Off \
+  -DBUILD_LIBSCAP_MODERN_BPF=Off \
+  -DENABLE_DRIVERS_TESTS=Off \
+  -DDRIVER_NAME=%s \
+  -DPROBE_NAME=%s \
+  -DBUILD_BPF=On \
+  -DDRIVER_VERSION=%s \
+  -DPROBE_VERSION=%s \
+  -DGIT_COMMIT=%s \
+  -DDRIVER_DEVICE_NAME=%s \
+  -DPROBE_DEVICE_NAME=%s \
+  .. && \
+  sed -i s/'DRIVER_COMMIT ""'/'DRIVER_COMMIT "%s"'/g driver/src/driver_config.h`
+)
 
 var HeadersNotFoundErr = errors.New("kernel headers not found")
 
@@ -59,6 +77,7 @@ type commonTemplateData struct {
 	BuildModule       bool
 	BuildProbe        bool
 	GCCVersion        string
+	CmakeCmd          string
 }
 
 // Builder represents a builder capable of generating a script for a driverkit target.
@@ -293,6 +312,15 @@ func (c Config) toTemplateData(b Builder, kr kernelrelease.KernelRelease) common
 		BuildModule:       len(c.ModuleFilePath) > 0,
 		BuildProbe:        len(c.ProbeFilePath) > 0,
 		GCCVersion:        c.GCCVersion,
+		CmakeCmd: fmt.Sprintf(cmakeCmdFmt,
+			c.DriverName,
+			c.DriverName,
+			c.DriverVersion,
+			c.DriverVersion,
+			c.DriverVersion,
+			c.DeviceName,
+			c.DeviceName,
+			c.DriverVersion),
 	}
 }
 
diff --git a/pkg/driverbuilder/builder/templates/alinux.sh b/pkg/driverbuilder/builder/templates/alinux.sh
@@ -41,7 +41,7 @@ mv usr/src/kernels/*/* /tmp/kernel
 
 cd {{ .DriverBuildDir }}
 mkdir -p build && cd build
-cmake -DUSE_BUNDLED_DEPS=On -DCREATE_TEST_TARGETS=Off -DBUILD_LIBSCAP_GVISOR=Off -DBUILD_LIBSCAP_MODERN_BPF=Off -DENABLE_DRIVERS_TESTS=Off -DDRIVER_NAME={{ .ModuleDriverName }} -DBUILD_BPF=On ..
+{{ .CmakeCmd }}
 
 {{ if .BuildModule }}
 # Build the module
diff --git a/pkg/driverbuilder/builder/templates/almalinux.sh b/pkg/driverbuilder/builder/templates/almalinux.sh
@@ -41,7 +41,7 @@ mv usr/src/kernels/*/* /tmp/kernel
 
 cd {{ .DriverBuildDir }}
 mkdir -p build && cd build
-cmake -DUSE_BUNDLED_DEPS=On -DCREATE_TEST_TARGETS=Off -DBUILD_LIBSCAP_GVISOR=Off -DBUILD_LIBSCAP_MODERN_BPF=Off -DENABLE_DRIVERS_TESTS=Off -DDRIVER_NAME={{ .ModuleDriverName }} -DBUILD_BPF=On ..
+{{ .CmakeCmd }}
 
 {{ if .BuildModule }}
 # Build the module
diff --git a/pkg/driverbuilder/builder/templates/amazonlinux.sh b/pkg/driverbuilder/builder/templates/amazonlinux.sh
@@ -44,7 +44,7 @@ mv usr/src/kernels/*/* /tmp/kernel
 
 cd {{ .DriverBuildDir }}
 mkdir -p build && cd build
-cmake -DUSE_BUNDLED_DEPS=On -DCREATE_TEST_TARGETS=Off -DBUILD_LIBSCAP_GVISOR=Off -DBUILD_LIBSCAP_MODERN_BPF=Off -DENABLE_DRIVERS_TESTS=Off -DDRIVER_NAME={{ .ModuleDriverName }} -DBUILD_BPF=On ..
+{{ .CmakeCmd }}
 
 {{ if .BuildModule }}
 # Build the module
diff --git a/pkg/driverbuilder/builder/templates/archlinux.sh b/pkg/driverbuilder/builder/templates/archlinux.sh
@@ -41,7 +41,7 @@ mv usr/lib/modules/*/build/* /tmp/kernel
 
 cd {{ .DriverBuildDir }}
 mkdir -p build && cd build
-cmake -DUSE_BUNDLED_DEPS=On -DCREATE_TEST_TARGETS=Off -DBUILD_LIBSCAP_GVISOR=Off -DBUILD_LIBSCAP_MODERN_BPF=Off -DENABLE_DRIVERS_TESTS=Off -DDRIVER_NAME={{ .ModuleDriverName }} -DBUILD_BPF=On ..
+{{ .CmakeCmd }}
 
 {{ if .BuildModule }}
 # Build the module
diff --git a/pkg/driverbuilder/builder/templates/centos.sh b/pkg/driverbuilder/builder/templates/centos.sh
@@ -42,7 +42,7 @@ mv usr/src/kernels/*/* /tmp/kernel
 cd {{ .DriverBuildDir }}
 sed -i 's/$(MAKE) -C $(KERNELDIR)/$(MAKE) KCFLAGS="-Wno-incompatible-pointer-types" -C $(KERNELDIR)/g' driver/Makefile.in
 mkdir -p build && cd build
-cmake -DUSE_BUNDLED_DEPS=On -DCREATE_TEST_TARGETS=Off -DBUILD_LIBSCAP_GVISOR=Off -DBUILD_LIBSCAP_MODERN_BPF=Off -DENABLE_DRIVERS_TESTS=Off -DDRIVER_NAME={{ .ModuleDriverName }} -DBUILD_BPF=On ..
+{{ .CmakeCmd }}
 
 {{ if .BuildModule }}
 # Build the module
diff --git a/pkg/driverbuilder/builder/templates/debian.sh b/pkg/driverbuilder/builder/templates/debian.sh
@@ -49,7 +49,7 @@ sourcedir=$(find . -type d -name "{{ .KernelHeadersPattern }}" | head -n 1 | xar
 
 cd {{ .DriverBuildDir }}
 mkdir -p build && cd build
-cmake -DUSE_BUNDLED_DEPS=On -DCREATE_TEST_TARGETS=Off -DBUILD_LIBSCAP_GVISOR=Off -DBUILD_LIBSCAP_MODERN_BPF=Off -DENABLE_DRIVERS_TESTS=Off -DDRIVER_NAME={{ .ModuleDriverName }} -DBUILD_BPF=On ..
+{{ .CmakeCmd }}
 
 {{ if .BuildModule }}
 # Build the module
diff --git a/pkg/driverbuilder/builder/templates/fedora.sh b/pkg/driverbuilder/builder/templates/fedora.sh
@@ -41,7 +41,7 @@ mv usr/src/kernels/*/* /tmp/kernel
 
 cd {{ .DriverBuildDir }}
 mkdir -p build && cd build
-cmake -DUSE_BUNDLED_DEPS=On -DCREATE_TEST_TARGETS=Off -DBUILD_LIBSCAP_GVISOR=Off -DBUILD_LIBSCAP_MODERN_BPF=Off -DENABLE_DRIVERS_TESTS=Off -DDRIVER_NAME={{ .ModuleDriverName }} -DBUILD_BPF=On ..
+{{ .CmakeCmd }}
 
 {{ if .BuildModule }}
 # Build the module
diff --git a/pkg/driverbuilder/builder/templates/flatcar.sh b/pkg/driverbuilder/builder/templates/flatcar.sh
@@ -48,7 +48,7 @@ make KCONFIG_CONFIG=/tmp/kernel.config modules_prepare
 
 cd {{ .DriverBuildDir }}
 mkdir -p build && cd build
-cmake -DUSE_BUNDLED_DEPS=On -DCREATE_TEST_TARGETS=Off -DBUILD_LIBSCAP_GVISOR=Off -DBUILD_LIBSCAP_MODERN_BPF=Off -DENABLE_DRIVERS_TESTS=Off -DDRIVER_NAME={{ .ModuleDriverName }} -DBUILD_BPF=On ..
+{{ .CmakeCmd }}
 
 {{ if .BuildModule }}
 # Build the module
diff --git a/pkg/driverbuilder/builder/templates/local.sh b/pkg/driverbuilder/builder/templates/local.sh
@@ -38,7 +38,7 @@ cd {{ .DriverBuildDir }}
 {{ if .DownloadSrc }}
 echo "* Configuring sources with cmake"
 mkdir -p build && cd build
-cmake -DUSE_BUNDLED_DEPS=On -DCREATE_TEST_TARGETS=Off -DBUILD_LIBSCAP_GVISOR=Off -DBUILD_LIBSCAP_MODERN_BPF=Off -DENABLE_DRIVERS_TESTS=Off -DDRIVER_NAME={{ .ModuleDriverName }} -DBUILD_BPF=On ..
+{{ .CmakeCmd }}
 {{ end }}
 {{ end }}
 
diff --git a/pkg/driverbuilder/builder/templates/opensuse.sh b/pkg/driverbuilder/builder/templates/opensuse.sh
@@ -44,7 +44,7 @@ sourcedir="$(find . -type d -name "linux-*-obj" | head -n 1 | xargs readlink -f)
 
 cd {{ .DriverBuildDir }}
 mkdir -p build && cd build
-cmake -DUSE_BUNDLED_DEPS=On -DCREATE_TEST_TARGETS=Off -DBUILD_LIBSCAP_GVISOR=Off -DBUILD_LIBSCAP_MODERN_BPF=Off -DENABLE_DRIVERS_TESTS=Off -DDRIVER_NAME={{ .ModuleDriverName }} -DBUILD_BPF=On ..
+{{ .CmakeCmd }}
 
 {{ if .BuildModule }}
 # Build the module
diff --git a/pkg/driverbuilder/builder/templates/oracle.sh b/pkg/driverbuilder/builder/templates/oracle.sh
@@ -41,7 +41,7 @@ mv usr/src/kernels/*/* /tmp/kernel
 
 cd {{ .DriverBuildDir }}
 mkdir -p build && cd build
-cmake -DUSE_BUNDLED_DEPS=On -DCREATE_TEST_TARGETS=Off -DBUILD_LIBSCAP_GVISOR=Off -DBUILD_LIBSCAP_MODERN_BPF=Off -DENABLE_DRIVERS_TESTS=Off -DDRIVER_NAME={{ .ModuleDriverName }} -DBUILD_BPF=On ..
+{{ .CmakeCmd }}
 
 {{ if .BuildModule }}
 # Build the module
diff --git a/pkg/driverbuilder/builder/templates/photonos.sh b/pkg/driverbuilder/builder/templates/photonos.sh
@@ -44,7 +44,7 @@ mv usr/src/linux-*headers-*/* /tmp/kernel
 
 cd {{ .DriverBuildDir }}
 mkdir -p build && cd build
-cmake -DUSE_BUNDLED_DEPS=On -DCREATE_TEST_TARGETS=Off -DBUILD_LIBSCAP_GVISOR=Off -DBUILD_LIBSCAP_MODERN_BPF=Off -DENABLE_DRIVERS_TESTS=Off -DDRIVER_NAME={{ .ModuleDriverName }} -DBUILD_BPF=On ..
+{{ .CmakeCmd }}
 
 {{ if .BuildModule }}
 # Build the module
diff --git a/pkg/driverbuilder/builder/templates/redhat.sh b/pkg/driverbuilder/builder/templates/redhat.sh
@@ -43,7 +43,7 @@ mv usr/src/kernels/*/* /tmp/kernel
 
 cd {{ .DriverBuildDir }}
 mkdir -p build && cd build
-cmake -DUSE_BUNDLED_DEPS=On -DCREATE_TEST_TARGETS=Off -DBUILD_LIBSCAP_GVISOR=Off -DBUILD_LIBSCAP_MODERN_BPF=Off -DENABLE_DRIVERS_TESTS=Off -DDRIVER_NAME={{ .ModuleDriverName }} -DBUILD_BPF=On ..
+{{ .CmakeCmd }}
 
 {{ if .BuildModule }}
 # Build the module
diff --git a/pkg/driverbuilder/builder/templates/rocky.sh b/pkg/driverbuilder/builder/templates/rocky.sh
@@ -41,7 +41,7 @@ mv usr/src/kernels/*/* /tmp/kernel
 
 cd {{ .DriverBuildDir }}
 mkdir -p build && cd build
-cmake -DUSE_BUNDLED_DEPS=On -DCREATE_TEST_TARGETS=Off -DBUILD_LIBSCAP_GVISOR=Off -DBUILD_LIBSCAP_MODERN_BPF=Off -DENABLE_DRIVERS_TESTS=Off -DDRIVER_NAME={{ .ModuleDriverName }} -DBUILD_BPF=On ..
+{{ .CmakeCmd }}
 
 {{ if .BuildModule }}
 # Build the module
diff --git a/pkg/driverbuilder/builder/templates/sles.sh b/pkg/driverbuilder/builder/templates/sles.sh
@@ -46,7 +46,7 @@ sourcedir="$(find . -type d -name "linux-*-obj" | head -n 1 | xargs readlink -f)
 
 cd {{ .DriverBuildDir }}
 mkdir -p build && cd build
-cmake -DUSE_BUNDLED_DEPS=On -DCREATE_TEST_TARGETS=Off -DBUILD_LIBSCAP_GVISOR=Off -DBUILD_LIBSCAP_MODERN_BPF=Off -DENABLE_DRIVERS_TESTS=Off -DDRIVER_NAME={{ .ModuleDriverName }} -DBUILD_BPF=On ..
+{{ .CmakeCmd }}
 
 {{ if .BuildModule }}
 # Build the module
diff --git a/pkg/driverbuilder/builder/templates/ubuntu.sh b/pkg/driverbuilder/builder/templates/ubuntu.sh
@@ -45,7 +45,7 @@ sourcedir=$(find . -type d -name "{{ .KernelHeadersPattern }}" | head -n 1 | xar
 
 cd {{ .DriverBuildDir }}
 mkdir -p build && cd build
-cmake -DUSE_BUNDLED_DEPS=On -DCREATE_TEST_TARGETS=Off -DBUILD_LIBSCAP_GVISOR=Off -DBUILD_LIBSCAP_MODERN_BPF=Off -DENABLE_DRIVERS_TESTS=Off -DDRIVER_NAME={{ .ModuleDriverName }} -DBUILD_BPF=On ..
+{{ .CmakeCmd }}
 
 {{ if .BuildModule }}
 # Build the module
diff --git a/pkg/driverbuilder/builder/templates/vanilla.sh b/pkg/driverbuilder/builder/templates/vanilla.sh
@@ -58,7 +58,7 @@ export KBUILD_MODPOST_WARN=1
 
 cd {{ .DriverBuildDir }}
 mkdir -p build && cd build
-cmake -DUSE_BUNDLED_DEPS=On -DCREATE_TEST_TARGETS=Off -DBUILD_LIBSCAP_GVISOR=Off -DBUILD_LIBSCAP_MODERN_BPF=Off -DENABLE_DRIVERS_TESTS=Off -DDRIVER_NAME={{ .ModuleDriverName }} -DBUILD_BPF=On ..
+{{ .CmakeCmd }}
 
 {{ if .BuildModule }}
 # Build the module
