Bug#1101804: rtpengine-kernel-dkms: dkms updates
Andreas Beckmann
anbe at debian.org
Tue Apr 1 08:44:13 BST 2025
Package: rtpengine-kernel-dkms
Version: 12.5.1.27-1
Severity: normal
Tags: patch
Hi,
here are a few updates for the -dkms package.
The first patch sets BUILD_EXCLUSIVE_KERNEL_MIN in dkms.conf to clearly
document the oldest supported kernel version. This is mostly interesting
for QA.
The next solves the asymmetry between postinst and prerm - prerm needs
to apply the same container checks as postinst and avoid affecting the
host kernel.
The last patch fixes building twice in a row by removing a new generated
file. That should probably be better fixed in the upsteam build system.
Andreas
-------------- next part --------------
>From 30fd3d55a1d8bfbf6f53ca81a97a8677d1c893fe Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <anbe at debian.org>
Date: Mon, 31 Mar 2025 11:15:46 +0200
Subject: [PATCH 1/3] dkms.conf: declare BUILD_EXCLUSIVE_KERNEL_MIN="5.1"
---
debian/rtpengine-kernel-dkms.dkms | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/debian/rtpengine-kernel-dkms.dkms b/debian/rtpengine-kernel-dkms.dkms
index d3584f3..d6cd94d 100644
--- a/debian/rtpengine-kernel-dkms.dkms
+++ b/debian/rtpengine-kernel-dkms.dkms
@@ -1,5 +1,9 @@
PACKAGE_NAME="rtpengine"
PACKAGE_VERSION="#MODULE_VERSION#"
+
+# the static_assert() macro was introduced in Linux v5.1
+BUILD_EXCLUSIVE_KERNEL_MIN="5.1"
+
MAKE[0]="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build RTPENGINE_VERSION=\"${PACKAGE_VERSION}\""
CLEAN="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build clean"
AUTOINSTALL=yes
--
2.39.5
-------------- next part --------------
>From d997be78caf0ce54ff35b6e078cf361b81fa05e7 Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <anbe at debian.org>
Date: Mon, 31 Mar 2025 11:26:28 +0200
Subject: [PATCH 2/3] dkms.prerm: do not act on daemon or module in a container
environment
in a container
- the daemon is not started by rtpengine-kernel-dkms.postinst
- do not attempt to unload a module from the host kernel
---
debian/rtpengine-kernel-dkms.postinst | 2 +-
debian/rtpengine-kernel-dkms.prerm | 18 +++++++++++++++---
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/debian/rtpengine-kernel-dkms.postinst b/debian/rtpengine-kernel-dkms.postinst
index 8c2a4a6..3ef0291 100644
--- a/debian/rtpengine-kernel-dkms.postinst
+++ b/debian/rtpengine-kernel-dkms.postinst
@@ -11,7 +11,7 @@ fi
#DEBHELPER#
if [ "$VIRT" = "yes" ]; then
- echo "Container environment detected. Skip dkms"
+ echo "Container environment detected. Skip daemon"
else
if [ "$1" = 'configure' ] ; then
# try to start the daemon
diff --git a/debian/rtpengine-kernel-dkms.prerm b/debian/rtpengine-kernel-dkms.prerm
index d8b87cc..ea85072 100644
--- a/debian/rtpengine-kernel-dkms.prerm
+++ b/debian/rtpengine-kernel-dkms.prerm
@@ -2,9 +2,21 @@
set -e
-# make sure it's not running
-service rtpengine-daemon stop || true
-rmmod "xt_RTPENGINE" 2>/dev/null || true
+if [ -x "$(command -v ngcp-virt-identify)" ]; then
+ if ngcp-virt-identify --type container; then
+ VIRT="yes"
+ fi
+fi
+
+if [ "$VIRT" = "yes" ]; then
+ echo "Container environment detected. Skip daemon"
+else
+ # make sure it's not running
+ if [ -x /etc/init.d/rtpengine-daemon ] ; then
+ invoke-rc.d rtpengine-daemon stop || true
+ fi
+ rmmod "xt_RTPENGINE" 2>/dev/null || true
+fi
#DEBHELPER#
--
2.39.5
-------------- next part --------------
>From ebdd6d84d49150d01ac911d21b3e33c9dd3e6c3b Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <anbe at debian.org>
Date: Mon, 31 Mar 2025 11:57:56 +0200
Subject: [PATCH 3/3] fix building twice in a row
clean the generated file lib/codeclib.strhash.c
---
debian/clean | 1 +
1 file changed, 1 insertion(+)
diff --git a/debian/clean b/debian/clean
index 934cc47..1bebea6 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,2 +1,3 @@
debian/README.html.gz
debian/README.md.gz
+lib/codeclib.strhash.c
--
2.39.5
More information about the Pkg-voip-maintainers
mailing list