Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Hi, I'd like to ask for pre-approval for adding a new binary package to bookworm: dkms-test-dkms. This is a trivial dkms module that will only be used for autopkgtests, s.t. we can model some failing scenarios as autopkgtests without relying on some other -dkms packages not in our control. I've added some new autopkgtests using it. The corresponding failures are already fixed by the patches in -8. The new package is available in -9 in experimental. The attached patch shows only the diff between sid and experimental. Should -8 migrate first? Does that need unblocking first and maybe some aging? It comes with a lot of bugfixes, some RC, and an dkms-autopkgtest fix needed by nvidia-cuda-toolkit/nvidia-cuda-samples (the nvidia-fs-dkms package uses a dkms feature not used by any other packages in the archive and thus never before tested with dkms-autopkgtest). For an upload of -10 to sid I'll pick some more bugfixes ... or maybe a new upstream bugfix release that incorporates all the patches we currently carry (including a large extension to the testsuite covering most of the new fixes, the testsuite I've so far stripped from the cherry-picked patches). I'll come back with a full debdiff once -10 is ready (and this pre-approval request was granted). Andreas
diff --git a/debian/changelog b/debian/changelog index 24da0ec..206519e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +dkms (3.0.10-9) experimental; urgency=medium + + * Add dkms-test-dkms package with trivial kernel module for dkms tests. + * New autopkgtest: Install some-dkms after linux-headers. + * New autopkgtest: Install linux-headers after some-dkms. + * New autopkgtest: Install some-dkms after linux-image w/o linux-headers. + * New autopkgtest: Install linux-image after some-dkms w/o linux-headers. + * Upload to experimental. + + -- Andreas Beckmann <a...@debian.org> Fri, 31 Mar 2023 14:19:59 +0200 + dkms (3.0.10-8) unstable; urgency=medium * Disable tests broken by fix-builtin-archive-dkms-coinstallation.patch. diff --git a/debian/control b/debian/control index 73a13db..51455a8 100644 --- a/debian/control +++ b/debian/control @@ -13,6 +13,7 @@ Homepage: https://github.com/dell/dkms Vcs-Git: https://salsa.debian.org/debian/dkms.git Vcs-Browser: https://salsa.debian.org/debian/dkms Rules-Requires-Root: no +Testsuite: autopkgtest-pkg-dkms Package: dkms Architecture: all @@ -54,3 +55,13 @@ Description: debhelper addon for the Dynamic Kernel Module System (DKMS) . This package provides a debhelper add-on 'dkms' that simplifies packaging of dkms kernel module source packages. + +Package: dkms-test-dkms +Architecture: all +Depends: + ${misc:Depends}, +Description: trivial dkms test kernel module + This package provides the dkms source code for the dkms-test kernel module. + . + This package is only intended for ci tests and not expected to be installed + on regular systems diff --git a/debian/dkms-test-dkms.dkms b/debian/dkms-test-dkms.dkms new file mode 100644 index 0000000..f1876da --- /dev/null +++ b/debian/dkms-test-dkms.dkms @@ -0,0 +1 @@ +test/dkms_test-1.0/dkms.conf diff --git a/debian/dkms-test-dkms.install b/debian/dkms-test-dkms.install new file mode 100644 index 0000000..3cad773 --- /dev/null +++ b/debian/dkms-test-dkms.install @@ -0,0 +1 @@ +test/dkms_test-1.0 usr/src/ diff --git a/debian/rules b/debian/rules index 2588aa9..e2ae425 100755 --- a/debian/rules +++ b/debian/rules @@ -21,3 +21,6 @@ override_dh_auto_build: debian/scripts/dh_dkms.1 override_dh_auto_install: $(MAKE) install-debian DESTDIR=$(CURDIR)/debian/dkms + +execute_after_dh_install: + DH_AUTOSCRIPTDIR=debian/scripts debian/scripts/dh_dkms diff --git a/debian/tests/control b/debian/tests/control index 352610d..2e016a3 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -9,3 +9,49 @@ Restrictions: needs-root, breaks-testbed, skip-not-installable, + +# install some-dkms after linux-headers +Test-Command: apt-get install -yf dkms-test-dkms +Features: test-name=install_some-dkms_after_linux-headers +Architecture: amd64 +Depends: + dkms, + linux-headers-generic, +Restrictions: + allow-stderr, + needs-root, + breaks-testbed, + +# install linux-headers after some-dkms +Test-Command: apt-get install -yf linux-headers-generic +Features: test-name=install_linux-headers_after_some-dkms +Architecture: amd64 +Depends: + dkms-test-dkms, +Restrictions: + allow-stderr, + needs-root, + breaks-testbed, + +# install some-dkms after linux-image w/o linux-headers +Test-Command: apt-get install -yf dkms-test-dkms +Features: test-name=install_some-dkms_after_linux-image_without_linux-headers +Architecture: amd64 +Depends: + dkms, + linux-image-generic, +Restrictions: + allow-stderr, + needs-root, + breaks-testbed, + +# install linux-image after some-dkms w/o linux-headers +Test-Command: apt-get install -yf linux-image-generic +Features: test-name=install_linux-image_after_some-dkms_without_linux-headers +Architecture: amd64 +Depends: + dkms-test-dkms, +Restrictions: + allow-stderr, + needs-root, + breaks-testbed,
