Control: reopen -1
Control: tags -1 patch
The upstream commit 5889b900916c ("Reduce and improve output when
installing/uninstalling."), which was released in 3.1.0, changes DKMS to
back up original modules which are overridden by dkms modules in Debian
and Ubuntu. This means that the output from `dkms status` changes for
such modules. This leads to autopkgtest failures, because the
dkms-autokpkgtest script uses the following to test whether modules are
correctly installed (l. 170):
if ! echo "$dkmsstatus" | grep -q "installed$"; then
but now such modules are reported as follows (using src:tp-smapi as an
example):
root@host:~# dkms status tp_smapi
tp_smapi/0.44, 6.12.6-amd64, x86_64: installed (original_module exists)
tp_smapi/0.44, 6.12.6-cloud-amd64, x86_64: installed
tp_smapi/0.44, 6.12.6-rt-amd64, x86_64: installed (original_module
exists)
which leads autopkgtest to fail:
[...]
I: Testing if tp_smapi modules are correctly installed.
tp_smapi/0.44, 6.12.6-amd64, x86_64: installed (original_module exists)
E: not installed
[...]
I: Testing if tp_smapi modules are correctly installed.
tp_smapi/0.44, 6.12.6-cloud-amd64, x86_64: installed
[...]
I: Testing if tp_smapi modules are correctly installed.
tp_smapi/0.44, 6.12.6-rt-amd64, x86_64: installed (original_module
exists)
E: not installed
[...]
I: Summary:
I: FAIL tp_smapi/0.44 6.12.6-amd64
I: PASS tp_smapi/0.44 6.12.6-cloud-amd64
I: FAIL tp_smapi/0.44 6.12.6-rt-amd64
Patch attached. Will NMU if there are no objections.
J.
From bfe71e8d8cfac104c2c927264bddd26e00ed7fc6 Mon Sep 17 00:00:00 2001
From: Jeremy Sowden <aza...@debian.org>
Date: Mon, 30 Dec 2024 14:02:30 +0000
Subject: [PATCH] d/s/dkms-autopkgtest: fix testing of packages that override
original modules
The upstream commit 5889b900916c ("Reduce and improve output when
installing/uninstalling."), which was released in 3.1.0, changes DKMS to back up
original modules which are overridden by dkms modules in Debian and Ubuntu.
This means that the output from `dkms status` changes for such modules. This
leads to autopkgtest failures, because dkms-autokpkgtest script uses the
following to test whether modules are correctly installed (l. 170):
if ! echo "$dkmsstatus" | grep -q "installed$"; then
but now such modules are reported as follows (using src:tp-smapi as an example):
root@host:~# dkms status tp_smapi
tp_smapi/0.44, 6.12.6-amd64, x86_64: installed (original_module exists)
tp_smapi/0.44, 6.12.6-cloud-amd64, x86_64: installed
tp_smapi/0.44, 6.12.6-rt-amd64, x86_64: installed (original_module exists)
which leads autopkgtest to fail:
[...]
I: Testing if tp_smapi modules are correctly installed.
tp_smapi/0.44, 6.12.6-amd64, x86_64: installed (original_module exists)
E: not installed
[...]
I: Testing if tp_smapi modules are correctly installed.
tp_smapi/0.44, 6.12.6-cloud-amd64, x86_64: installed
[...]
I: Testing if tp_smapi modules are correctly installed.
tp_smapi/0.44, 6.12.6-rt-amd64, x86_64: installed (original_module exists)
E: not installed
[...]
I: Summary:
I: FAIL tp_smapi/0.44 6.12.6-amd64
I: PASS tp_smapi/0.44 6.12.6-cloud-amd64
I: FAIL tp_smapi/0.44 6.12.6-rt-amd64
Signed-off-by: Jeremy Sowden <aza...@debian.org>
---
debian/scripts/dkms-autopkgtest | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/scripts/dkms-autopkgtest b/debian/scripts/dkms-autopkgtest
index 7444368a5314..c7871eade52e 100755
--- a/debian/scripts/dkms-autopkgtest
+++ b/debian/scripts/dkms-autopkgtest
@@ -167,7 +167,7 @@ run_pkg() {
continue
fi
- if ! echo "$dkmsstatus" | grep -q "installed$"; then
+ if ! echo "$dkmsstatus" | grep -Eq "installed( \(original_module exists\))?$"; then
echo "E: not installed" >&2
summary="${summary}I: FAIL $dkms_pkg/$dkms_ver $kver${crlf}"
result=1
--
2.45.2
signature.asc
Description: PGP signature
