Source: jool Version: 4.1.13-1 Severity: important Tags: patch Hi,
I have a few updates for the -dkms package: * Having '-dkms' as suffix of the dkms module name (i.e. the PACKAGE_NAME value in dkms.conf, not the name of the Debian binary package) is highly unusual and jook-dkms is the last *-dkms package in Debian doing this. So lets drop that and bring the package in line with all other *.dkms packages. * Fix the CLEAN command in dkms.conf to not assume linux-headers-$(uname -r) is available, too, after the module has been built for a different kernel. * Set BUILD_EXCLUSIVE_KERNEL_MIN in dkms.conf to the oldest Linux version where the module can be built successfully. Thanks for considering Andreas
>From 2e7376ba03b52e78f1bcb8ee6d9a21dbc22c693f Mon Sep 17 00:00:00 2001 From: Andreas Beckmann <[email protected]> Date: Thu, 20 Feb 2025 11:11:37 +0100 Subject: [PATCH 1/3] Remove -dkms suffix from dkms module name Having -dkms in the module name is highly unusual, i.e. jool is the only -dkms package in the Debian archive doing this. --- debian/jool-dkms.dkms | 2 +- debian/rules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/jool-dkms.dkms b/debian/jool-dkms.dkms index 40d8359..003635d 100644 --- a/debian/jool-dkms.dkms +++ b/debian/jool-dkms.dkms @@ -1,4 +1,4 @@ -PACKAGE_NAME="jool-dkms" +PACKAGE_NAME="jool" PACKAGE_VERSION="#MODULE_VERSION#" AUTOINSTALL="yes" diff --git a/debian/rules b/debian/rules index cca15a7..2c3e9f7 100755 --- a/debian/rules +++ b/debian/rules @@ -27,7 +27,7 @@ override_dh_install: dh_install -Njool-dkms dh_install -pjool-dkms \ -X/usr/ -X.o -XMakefile.in -XMakefile.am \ - src usr/src/jool-dkms-$(DEB_VERSION_UPSTREAM) + src usr/src/jool-$(DEB_VERSION_UPSTREAM) # -- Overrides needed by the systemd unit files -- -- 2.39.5
>From 69d8a3ff152324db800dcf3cbcd5f383c79dedca Mon Sep 17 00:00:00 2001 From: Andreas Beckmann <[email protected]> Date: Thu, 20 Feb 2025 12:21:56 +0100 Subject: [PATCH 2/3] dkms.conf: Fix CLEAN command: use the headers that were used for building --- debian/jool-dkms.dkms | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/jool-dkms.dkms b/debian/jool-dkms.dkms index 003635d..6e7989e 100644 --- a/debian/jool-dkms.dkms +++ b/debian/jool-dkms.dkms @@ -6,7 +6,7 @@ MAKE[0]="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_V && make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/src/mod/nat64 modules \ && make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/src/mod/siit modules" -CLEAN="make -C ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/src/mod clean" +CLEAN="make KERNEL_DIR=${kernel_source_dir} -C ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/src/mod clean" BUILT_MODULE_NAME[0]="jool_common" BUILT_MODULE_LOCATION[0]="src/mod/common/" -- 2.39.5
>From 3d2c834b165aa2e9b2b324193afa3b2ffcb1d5e9 Mon Sep 17 00:00:00 2001 From: Andreas Beckmann <[email protected]> Date: Mon, 24 Feb 2025 18:42:36 +0100 Subject: [PATCH 3/3] dkms.conf: Set BUILD_EXCLUSIVE_KERNEL_MIN="4.12" the 5th argument to nla_validate() was added in Linux v4.12 --- debian/jool-dkms.dkms | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/jool-dkms.dkms b/debian/jool-dkms.dkms index 6e7989e..8a7d068 100644 --- a/debian/jool-dkms.dkms +++ b/debian/jool-dkms.dkms @@ -2,6 +2,9 @@ PACKAGE_NAME="jool" PACKAGE_VERSION="#MODULE_VERSION#" AUTOINSTALL="yes" +# 5-argument nla_validate() +BUILD_EXCLUSIVE_KERNEL_MIN="4.12" + MAKE[0]="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/src/mod/common modules \ && make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/src/mod/nat64 modules \ && make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/src/mod/siit modules" -- 2.39.5
