Bug#1033900: pre-approval: dkms/3.0.10-10
Control: tags -1 moreinfo Hi Andreas, On 27-04-2023 18:53, Andreas Beckmann wrote: So unless something else appears that warrants an unblock, let's not do this. ^^^ I've just uploaded a new upstream release 3.0.11-1 with some additional bugfixes to experimental. Most patches are now applied upstream. While you elaborated how you created a nice debdiff, you forgot to tell why a new upstream release is a targeted fix. What is it fixing? (Does this really follow the freeze policy?) Paul OpenPGP_signature Description: OpenPGP digital signature
Bug#1033900: pre-approval: dkms/3.0.10-10
Control: reopen -1 Control: retitle -1 pre-approval: dkms/3.0.11-2 On 20/04/2023 22.07, Paul Gevers wrote: On 03-04-2023 19:19, Andreas Beckmann wrote: I'd like to ask for pre-approval for adding a new binary package to bookworm: dkms-test-dkms. At this stage of the freeze I don't think what's currently in experimental on its own is worth having in bookworm. So unless something else appears that warrants an unblock, let's not do this. If something else appears soon worth an unblock, you can include this in your request. I've just uploaded a new upstream release 3.0.11-1 with some additional bugfixes to experimental. Most patches are now applied upstream. The attached diff is between the versions in testing and experimental, both trees with patches applied (and the patches itself excluded). (as a normal debdiff with removal of the patches that are now included in the upstream release would result in a large unhelpful noisy diff) Most of the remaining changes are in the test infrastructure (these I had previously excluded while cherry-picking bugfixes). .github/workflows/tests.yml | 40 Makefile |4 README.md | 21 debian/changelog | 23 debian/control| 11 debian/dkms-test-dkms.dkms|1 debian/dkms-test-dkms.install |1 debian/patches/series | 13 debian/rules |3 debian/tests/control | 50 dkms.8.in | 138 +- dkms.in | 240 ++-- dkms_autoinstaller|2 dkms_find-provides|2 dkms_framework.conf |2 lsb_release |6 run_test.sh | 801 +++--- test/dkms_build_exclusive_dependencies_test-1.0/Makefile |3 test/dkms_build_exclusive_dependencies_test-1.0/dkms.conf |6 test/dkms_build_exclusive_test-1.0/Makefile |3 test/dkms_build_exclusive_test-1.0/dkms.conf |5 test/dkms_conf_test_defaulted_BUILT_MODULE_NAME/dkms.conf |3 test/dkms_conf_test_invalid/dkms.conf |6 test/dkms_conf_test_zero_modules/dkms.conf|3 test/dkms_dependencies_test-1.0/Makefile |4 test/dkms_dependencies_test-1.0/dkms.conf |1 test/dkms_emptyver_test/dkms.conf |5 test/dkms_failing_test-1.0/Makefile |4 test/dkms_failing_test-1.0/dkms.conf |1 test/dkms_nover_test/dkms.conf|5 test/dkms_nover_update_test/1.0/Makefile |7 test/dkms_nover_update_test/1.0/dkms.conf | 12 test/dkms_nover_update_test/1.0/dkms_nover_update_test.c | 20 test/dkms_nover_update_test/2.0/Makefile |7 test/dkms_nover_update_test/2.0/dkms.conf | 12 test/dkms_nover_update_test/2.0/dkms_nover_update_test.c | 20 test/dkms_nover_update_test/3.0/Makefile |7 test/dkms_nover_update_test/3.0/dkms.conf | 12 test/dkms_nover_update_test/3.0/dkms_nover_update_test.c | 20 test/dkms_test-1.0/dkms.conf |5 40 files changed, 1160 insertions(+), 369 deletions(-) Andreas dkms-3.0.11.diff.xz Description: application/xz
Bug#1033900: pre-approval: dkms/3.0.10-10
Hi, On 12-04-2023 12:00, Andreas Beckmann wrote: On 12/04/2023 10.52, Sebastian Ramacher wrote: +Restrictions: + allow-stderr, + needs-root, + breaks-testbed, With these restrictions, I don't think the tests would run on debci (Paul, please correct me if I am wrong). I hardly see the benefit of granting an exception here for tests that won't be triggered. These restrictions are the ones also used by the autodep8 dkms tests which happily run on the CI infrastructure: The only real existing restriction that ci.d.n doesn't support is isolation-machine. The rest is supported. Paul OpenPGP_signature Description: OpenPGP digital signature
Bug#1033900: pre-approval: dkms/3.0.10-10
On 12/04/2023 10.52, Sebastian Ramacher wrote: +Restrictions: + allow-stderr, + needs-root, + breaks-testbed, With these restrictions, I don't think the tests would run on debci (Paul, please correct me if I am wrong). I hardly see the benefit of granting an exception here for tests that won't be triggered. These restrictions are the ones also used by the autodep8 dkms tests which happily run on the CI infrastructure: Test-Command: /usr/lib/dkms/dkms-autopkgtest Restrictions: needs-root, breaks-testbed, allow-stderr, superficial, Depends: dkms, openssl, linux-doc, Features: test-name=dkms-autopkgtest https://ci.debian.net/data/autopkgtest/unstable/amd64/r/r8168/32642775/log.gz Andreas
Bug#1033900: pre-approval: dkms/3.0.10-10
On 2023-04-03 19:19:54 +0200, Andreas Beckmann wrote:
> 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).
Yes, please file an unblock request for -8 first.
> 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 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 000..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 000..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
Bug#1033900: pre-approval: dkms/3.0.10-10
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 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 000..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 000..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
