diff -pruN 3.0.11-1/debian/changelog 3.0.11-1ubuntu7/debian/changelog --- 3.0.11-1/debian/changelog 2023-04-27 16:12:51.000000000 +0000 +++ 3.0.11-1ubuntu7/debian/changelog 2023-05-24 09:11:33.000000000 +0000 @@ -1,3 +1,66 @@ +dkms (3.0.11-1ubuntu7) mantic; urgency=medium + + * Reset test messages correctly. + + -- Dimitri John Ledkov Wed, 24 May 2023 10:11:33 +0100 + +dkms (3.0.11-1ubuntu6) mantic; urgency=medium + + * Fix hardcoded arch in test result expectations. + + -- Dimitri John Ledkov Tue, 23 May 2023 14:18:20 +0100 + +dkms (3.0.11-1ubuntu5) mantic; urgency=medium + + * Attempt #5 to fix autopkgtest on all arches. + + -- Dimitri John Ledkov Tue, 23 May 2023 11:44:45 +0100 + +dkms (3.0.11-1ubuntu4) mantic; urgency=medium + + * Testsuite forces a fake mok key, on arches that do not have + update-secureboot-policy. Thus it should be possible to run the tests + on all arches without specifying no-signing-tool flag. Try this now, + again. + + -- Dimitri John Ledkov Fri, 19 May 2023 12:44:59 +0100 + +dkms (3.0.11-1ubuntu3) mantic; urgency=medium + + * Support running tests on systems with module signing, but without + update-secureboot-policy. + * Limit dkms-test-dkms to prevent badpkg on i386 for dkms-autopkgtest + + -- Dimitri John Ledkov Thu, 18 May 2023 23:42:40 +0100 + +dkms (3.0.11-1ubuntu2) mantic; urgency=medium + + * Fix autopkgtest for ubuntu delta. + + -- Dimitri John Ledkov Thu, 18 May 2023 12:50:01 +0100 + +dkms (3.0.11-1ubuntu1) mantic; urgency=medium + + * Deliberate Ubuntu delta: + - Even if there is no delta with Debian, do not force-sync this + package. This package will be updated by the kernel team as part of + landing new kernels. Neither upstream, nor Debian, use dkms to the + same extend as Ubuntu Kernel Team build processes do, plus Ubuntu has + more dkms packages than Debian. Testing in Debian is insufficient for + successful upload to Ubuntu. Over the previous two cycles, there were + multiple regressions introduced in upstream and Debian revisions that + have significantly impacted Ubuntu development. Introducing more + strict upload process for the DKMS package should hopefully mitigate + this. Previous request from the Kernel to do this, was ignored close + to Lunar release, which caused Lunar to be shipped with a regressed + dkms. + + * Fixup autopkgtest: + - Support systems with secure boot off + - Support systems without update-secureboot-policy + + -- Dimitri John Ledkov Tue, 09 May 2023 10:37:14 +0100 + dkms (3.0.11-1) experimental; urgency=medium * New upstream release. @@ -19,6 +82,13 @@ dkms (3.0.10-9) experimental; urgency=me -- Andreas Beckmann Fri, 31 Mar 2023 14:19:59 +0200 +dkms (3.0.10-8ubuntu1) mantic; urgency=medium + + * Fix a regression that prevents a kernel installation if a BUILD_EXCLUSIVE + skips a DKMS build. LP: #2018226 + + -- Juerg Haefliger Tue, 02 May 2023 16:41:37 +0200 + dkms (3.0.10-8) unstable; urgency=medium * Disable tests broken by fix-builtin-archive-dkms-coinstallation.patch. diff -pruN 3.0.11-1/debian/control 3.0.11-1ubuntu7/debian/control --- 3.0.11-1/debian/control 2023-04-27 16:12:51.000000000 +0000 +++ 3.0.11-1ubuntu7/debian/control 2023-05-18 22:46:17.000000000 +0000 @@ -1,7 +1,8 @@ Source: dkms Section: kernel Priority: optional -Maintainer: Dynamic Kernel Module System Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Dynamic Kernel Module System Team Uploaders: David Paleino , Petter Reinholdtsen , Aron Xu , @@ -57,7 +58,7 @@ Description: debhelper addon for the Dyn dkms kernel module source packages. Package: dkms-test-dkms -Architecture: all +Architecture: amd64 Depends: ${misc:Depends}, Description: trivial dkms test kernel module diff -pruN 3.0.11-1/debian/patches/fix-builtin-archive-dkms-coinstallation.patch 3.0.11-1ubuntu7/debian/patches/fix-builtin-archive-dkms-coinstallation.patch --- 3.0.11-1/debian/patches/fix-builtin-archive-dkms-coinstallation.patch 2023-04-27 16:12:51.000000000 +0000 +++ 3.0.11-1ubuntu7/debian/patches/fix-builtin-archive-dkms-coinstallation.patch 2023-05-18 13:16:02.000000000 +0000 @@ -6,8 +6,10 @@ Author: Dimitri John Ledkov + +Index: dkms-3.0.11/run_test.sh +=================================================================== +--- dkms-3.0.11.orig/run_test.sh ++++ dkms-3.0.11/run_test.sh +@@ -139,6 +139,8 @@ set_signing_message() { + # $3: module file name if not the same as $1 + if (( NO_SIGNING_TOOL == 0 )); then + SIGNING_MESSAGE="Signing module /var/lib/dkms/$1/$2/build/${3:-$1}.ko"$'\n' ++ else ++ SIGNING_MESSAGE="" + fi + } + +@@ -184,9 +186,8 @@ genericize_expected_output() { + sed -i '/^Certificate or key are missing, generating self signed certificate for MOK...$/d' ${output_log} + else + sed -i "/^The kernel is be built without module signing facility, modules won't be signed$/d" ${output_log} ++ sed -i '/^Sign command:/d' ${output_log} + sed -i "/^Binary .* not found, modules won't be signed$/d" ${output_log} +- # Uncomment the following line to run this script with --no-signing-tool on platforms where the sign-file tool exists +- # sed -i '/^Signing module \/var\/lib\/dkms\/dkms_test\/1.0\/build\/dkms_test.ko$/d' ${output_log} + fi + # OpenSSL non-critical errors while signing. Remove them to be more generic + sed -i '/^At main.c:/d' ${output_log} +@@ -403,6 +404,9 @@ EOF + fi + + cp test/framework/temp_key_cert.conf /etc/dkms/framework.conf.d/dkms_test_framework.conf ++save_NO_SIGNING_TOOL=$NO_SIGNING_TOOL ++NO_SIGNING_TOOL=0 ++set_signing_message "dkms_test" "1.0" + + echo 'Building the test module again by force' + run_with_expected_output dkms build -k "${KERNEL_VER}" -m dkms_test -v 1.0 --force << EOF +@@ -679,7 +683,7 @@ echo "Running dkms autoinstall for a ker + run_with_expected_error 11 dkms autoinstall -k "${KERNEL_VER}-noheaders" << EOF + Error! Your kernel headers for kernel ${KERNEL_VER}-noheaders cannot be found at /lib/modules/${KERNEL_VER}-noheaders/build or /lib/modules/${KERNEL_VER}-noheaders/source. + Please install the linux-headers-${KERNEL_VER}-noheaders package or use the --kernelsourcedir option to tell DKMS where it's located. +-dkms autoinstall on ${KERNEL_VER}-noheaders/x86_64 failed for dkms_test(1) ++dkms autoinstall on ${KERNEL_VER}-noheaders/${KERNEL_ARCH} failed for dkms_test(1) + Error! One or more modules failed to install during autoinstall. + Refer to previous errors for more information. + EOF +@@ -701,10 +705,11 @@ run_status_with_expected_output 'dkms_te + EOF + + echo 'Removing temporary files' +-if (( NO_SIGNING_TOOL == 0 )); then +- rm /tmp/dkms_test_private_key /tmp/dkms_test_certificate +-fi ++rm /tmp/dkms_test_private_key /tmp/dkms_test_certificate ++ + rm /etc/dkms/framework.conf.d/dkms_test_framework.conf ++NO_SIGNING_TOOL=$save_NO_SIGNING_TOOL ++set_signing_message "dkms_test" "1.0" + + echo 'Removing /usr/src/dkms_test-1.0' + rm -r /usr/src/dkms_test-1.0 diff -pruN 3.0.11-1/debian/patches/run_test-secureboot-off.patch 3.0.11-1ubuntu7/debian/patches/run_test-secureboot-off.patch --- 3.0.11-1/debian/patches/run_test-secureboot-off.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.0.11-1ubuntu7/debian/patches/run_test-secureboot-off.patch 2023-05-09 09:36:58.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Support systems with secure boot off +Author: Dimitri John Ledkov + + +Index: dkms-3.0.11/run_test.sh +=================================================================== +--- dkms-3.0.11.orig/run_test.sh ++++ dkms-3.0.11/run_test.sh +@@ -176,6 +176,7 @@ genericize_expected_output() { + if (( NO_SIGNING_TOOL == 0 )); then + sed -i '/^EFI variables are not supported on this system/d' ${output_log} + sed -i '/^\/sys\/firmware\/efi\/efivars not found, aborting./d' ${output_log} ++ sed -i '/^Secure Boot not enabled on this system./d' ${output_log} + sed -i '/^Sign command:/d' ${output_log} + sed -i '/^Signing key:/d' ${output_log} + sed -i '/^Public certificate (MOK):/d' ${output_log} diff -pruN 3.0.11-1/debian/patches/series 3.0.11-1ubuntu7/debian/patches/series --- 3.0.11-1/debian/patches/series 2023-04-27 16:12:51.000000000 +0000 +++ 3.0.11-1ubuntu7/debian/patches/series 2023-05-18 22:48:11.000000000 +0000 @@ -1,3 +1,5 @@ messaging.patch fix-builtin-archive-dkms-coinstallation.patch do-not-perform-rpm-queries-on-Debian-Ubuntu-Arch-bas.patch +run_test-secureboot-off.patch +fix-nonefi-autopkgtest.patch diff -pruN 3.0.11-1/debian/tests/run_test_wrapper.sh 3.0.11-1ubuntu7/debian/tests/run_test_wrapper.sh --- 3.0.11-1/debian/tests/run_test_wrapper.sh 2023-04-27 16:12:51.000000000 +0000 +++ 3.0.11-1ubuntu7/debian/tests/run_test_wrapper.sh 2023-05-23 10:44:17.000000000 +0000 @@ -11,4 +11,14 @@ do done export KERNEL_VER -bash ./run_test.sh + +# On Ubuntu, signing is supported on UEFI secureboot amd64 & arm64 +# only for now. +case `dpkg --print-architecture` in + amd64|arm64) + bash ./run_test.sh + ;; + *) + bash ./run_test.sh --no-signing-tool + ;; +esac