Merge ~agherzan/ubuntu/+source/backport-iwlwifi-dkms:ag/fix-kvm-builds into ubuntu/+source/backport-iwlwifi-dkms:ubuntu/devel

[Andrei Gherzan]

[Dimitri John Ledkov (xnox)]

Hi,

this is a debian package, and follows the normal ubuntu packaging guidelines. In the kernel team, there are automatic scripts that parse commits and generate appropriate debian/changelog automatically and are able to generate a summary for debian/changelog file, and convert buglinks to LP: #NNNNN form such that they end up in the .changes file and automatically close bug report in launchpad.

I would expect here for you to either provide a manual changelog entry (i.e. dch -i; type useful text with LP: #NNNN) and include it in your commit.

Or such that i can do that with the help of `gbp dch` command (git build package, generate debian packaging changelog entry). That does produce a useful changelog entry but without a bug number:

$ gbp dch --ignore-branch
gbp:info: Changelog last touched at '75ff6531785d9787cec0e4b1ee26f871c1dd4d0d'
gbp:info: Continuing from commit '75ff6531785d9787cec0e4b1ee26f871c1dd4d0d'

$ git diff
diff --git a/debian/changelog b/debian/changelog
index 8ed3d5af17..cf0d5ff836 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+backport-iwlwifi-dkms (9904-0ubuntu3.3) UNRELEASED; urgency=medium
+
+ [ Andrei Gherzan ]
+ * backport-iwlwifi-dkms.dkms.in: Avoid building when kernel config deps are not satisfied
+
+ -- Dimitri John Ledkov <email address hidden> Mon, 13 Feb 2023 14:35:38 +0000
+
 backport-iwlwifi-dkms (9904-0ubuntu3.2) lunar; urgency=medium

   * Support linux 6.1 (LP: #2003808):

As you see that didn't generate LP: #NNNN.

If your changelog entry instead of buglink had "LP: #NNN" it would have working:

$ git log -1
commit 0adf140000eb16d5a4f4b46f5543a036204e4c8a (HEAD -> ag/fix-kvm-builds)
Author: Andrei Gherzan <email address hidden>
Date: Mon Feb 13 13:56:46 2023 +0000

    backport-iwlwifi-dkms.dkms.in: Avoid building when kernel config deps are not satisfied

    Instruct dkms to avoid building when the kernel configuration
    dependencies for the targeted kernel are not in place. This initial
    change defines BUILD_EXCLUSIVE_CONFIG based on the dependencies
    definition of CONFIG_IWLWIFI. This needs to be kept in sync as the
    Kconfig files evolve.

    LP: #2007151

    Signed-off-by: Andrei Gherzan <email address hidden>

then gbp-dch gives me:

$ dpkg-parsechangelog
Source: backport-iwlwifi-dkms
Version: 9904-0ubuntu3.3
Distribution: UNRELEASED
Urgency: medium
Maintainer: Dimitri John Ledkov <email address hidden>
Timestamp: 1676299016
Date: Mon, 13 Feb 2023 14:36:56 +0000
Launchpad-Bugs-Fixed: 2007151
Changes:
 backport-iwlwifi-dkms (9904-0ubuntu3.3) UNRELEASED; urgency=medium
 .
   [ Andrei Gherzan ]
   * backport-iwlwifi-dkms.dkms.in: Avoid building when kernel config deps are not satisfied
     (LP: #2007151)

The generated Launchpad-Bugs-Fixed is the crucial bit here, as that ends up in .changes file and is processed by launchpad.

In the future, for the non-kernel team maintained packages please either provide changelog entries with LP:# or use LP: #NNN form in the git changelog.

Also maybe we should teach git-buildpackage about parsing BugLink: <launchpaddy url>.

review: Approve (minor packaging comment)

[Andrei Gherzan (agherzan)]

That was very useful. Thanks, Dimitri. I have fixed the LP reference in `git log`.

[Dimitri John Ledkov (xnox)]

This is done, no idea how to set this to merged.

diff --git a/debian/backport-iwlwifi-dkms.dkms.in b/debian/backport-iwlwifi-dkms.dkms.in
index 600531a..2087ed9 100644
--- a/debian/backport-iwlwifi-dkms.dkms.in
+++ b/debian/backport-iwlwifi-dkms.dkms.in
@@ -1,3 +1,8 @@
+# Building these modules have configuration requirements for the targeted
+# kernel. Keep these in sync as the Kconfig files change.
+# https://bugs.launchpad.net/bugs/2007151
+BUILD_EXCLUSIVE_CONFIG="CONFIG_PCI CONFIG_HAS_IOMEM CONFIG_CFG80211"
+
 PACKAGE_NAME="@DKMS_PACKAGE_NAME@"
 PACKAGE_VERSION="#MODULE_VERSION#"
 AUTOINSTALL="yes"