| Message ID | 20201020112347.62254-1-juergh@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [SRU,G/meta-raspi] UBUNTU: [Packaging] Add missing provides for wireguard | expand |
On Tue, Oct 20, 2020 at 01:23:47PM +0200, Juerg Haefliger wrote: > BugLink: https://bugs.launchpad.net/bugs/1900683 > > Also, since wireguard is now part of the kernel, the modules package is a > build dependency so that the version can be extracted from the module. > > Signed-off-by: Juerg Haefliger <juergh@canonical.com> Looks good to me. Thanks. Acked-by: Andrea Righi <andrea.righi@canonical.com> > --- > debian/control.common | 1 + > debian/control.d/raspi | 2 +- > debian/control.d/raspi-nolpae | 1 + > debian/rules | 2 +- > 4 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/debian/control.common b/debian/control.common > index c93fe13f5242..f386aa9f135a 100644 > --- a/debian/control.common > +++ b/debian/control.common > @@ -7,4 +7,5 @@ Build-Depends: dpkg (>= 1.13.19), debhelper (>= 9), gawk, > Build-Depends-Arch: > @KERNEL_SOURCE@-headers-@KERNEL_ABI_VERSION@, > linux-headers-@KERNEL_ABI_VERSION@-raspi, > + linux-modules-@KERNEL_ABI_VERSION@-raspi, > Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux-meta-raspi/+git/@SERIES@ > diff --git a/debian/control.d/raspi b/debian/control.d/raspi > index f7f78210b45b..7796da6ec2d0 100644 > --- a/debian/control.d/raspi > +++ b/debian/control.d/raspi > @@ -9,7 +9,7 @@ Description: Raspberry Pi Linux kernel headers > Package: linux-image-raspi${variant:suffix} > Architecture: armhf arm64 > Section: kernel > -Provides: ${dkms:zfs-modules} > +Provides: ${dkms:zfs-modules} ${dkms:wireguard-linux-compat-modules} > Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-raspi, linux-firmware > Description: Raspberry Pi Linux kernel image > This package will always depend on the latest Raspberry Pi Linux > diff --git a/debian/control.d/raspi-nolpae b/debian/control.d/raspi-nolpae > index d494dd1f3963..cc4f3227e9b4 100644 > --- a/debian/control.d/raspi-nolpae > +++ b/debian/control.d/raspi-nolpae > @@ -9,6 +9,7 @@ Description: No-LPAE Raspberry Pi Linux kernel headers > Package: linux-image-raspi-nolpae${variant:suffix} > Architecture: armhf > Section: kernel > +Provides: ${dkms:wireguard-linux-compat-modules} > Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-raspi-nolpae, linux-firmware > Description: No-LPAE Raspberry Pi Linux kernel image > This package will always depend on the latest no-LPAE Raspberry Pi Linux > diff --git a/debian/rules b/debian/rules > index 45369c0c4b9a..cd71bc87fce4 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -41,7 +41,7 @@ clean: debian/control > # Versions of dkms packages. > dkms_zfs_linux_version=$(shell gawk '/^zfs-linux/ { print $$2; }' debian/dkms-versions) > dkms_virtualbox_version=$(shell gawk '/^virtualbox/ { print $$2; }' debian/dkms-versions) > -dkms_wireguard_version=$(shell gawk '/^wireguard-linux-compat/ { print $$2; }' debian/dkms-versions) > +dkms_wireguard_version=$(shell /sbin/modinfo -F version /lib/modules/$(KERNEL_ABI_VERSION)-raspi/kernel/drivers/net/wireguard/wireguard.ko) > > debian/control: tp_key=test:provides\(-full\|-image\|-headers\|-modules-extra\) > debian/control: $(control_files) > -- > 2.25.1 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
On 20.10.20 13:23, Juerg Haefliger wrote: > BugLink: https://bugs.launchpad.net/bugs/1900683 > > Also, since wireguard is now part of the kernel, the modules package is a > build dependency so that the version can be extracted from the module. > > Signed-off-by: Juerg Haefliger <juergh@canonical.com> > --- Hm, I am wondering whether this is not something (the version of the module) that could be obtained via the smaller buildinfo file. Or if not already present, whether that might be a suitable addition... -Stefan > debian/control.common | 1 + > debian/control.d/raspi | 2 +- > debian/control.d/raspi-nolpae | 1 + > debian/rules | 2 +- > 4 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/debian/control.common b/debian/control.common > index c93fe13f5242..f386aa9f135a 100644 > --- a/debian/control.common > +++ b/debian/control.common > @@ -7,4 +7,5 @@ Build-Depends: dpkg (>= 1.13.19), debhelper (>= 9), gawk, > Build-Depends-Arch: > @KERNEL_SOURCE@-headers-@KERNEL_ABI_VERSION@, > linux-headers-@KERNEL_ABI_VERSION@-raspi, > + linux-modules-@KERNEL_ABI_VERSION@-raspi, > Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux-meta-raspi/+git/@SERIES@ > diff --git a/debian/control.d/raspi b/debian/control.d/raspi > index f7f78210b45b..7796da6ec2d0 100644 > --- a/debian/control.d/raspi > +++ b/debian/control.d/raspi > @@ -9,7 +9,7 @@ Description: Raspberry Pi Linux kernel headers > Package: linux-image-raspi${variant:suffix} > Architecture: armhf arm64 > Section: kernel > -Provides: ${dkms:zfs-modules} > +Provides: ${dkms:zfs-modules} ${dkms:wireguard-linux-compat-modules} > Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-raspi, linux-firmware > Description: Raspberry Pi Linux kernel image > This package will always depend on the latest Raspberry Pi Linux > diff --git a/debian/control.d/raspi-nolpae b/debian/control.d/raspi-nolpae > index d494dd1f3963..cc4f3227e9b4 100644 > --- a/debian/control.d/raspi-nolpae > +++ b/debian/control.d/raspi-nolpae > @@ -9,6 +9,7 @@ Description: No-LPAE Raspberry Pi Linux kernel headers > Package: linux-image-raspi-nolpae${variant:suffix} > Architecture: armhf > Section: kernel > +Provides: ${dkms:wireguard-linux-compat-modules} > Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-raspi-nolpae, linux-firmware > Description: No-LPAE Raspberry Pi Linux kernel image > This package will always depend on the latest no-LPAE Raspberry Pi Linux > diff --git a/debian/rules b/debian/rules > index 45369c0c4b9a..cd71bc87fce4 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -41,7 +41,7 @@ clean: debian/control > # Versions of dkms packages. > dkms_zfs_linux_version=$(shell gawk '/^zfs-linux/ { print $$2; }' debian/dkms-versions) > dkms_virtualbox_version=$(shell gawk '/^virtualbox/ { print $$2; }' debian/dkms-versions) > -dkms_wireguard_version=$(shell gawk '/^wireguard-linux-compat/ { print $$2; }' debian/dkms-versions) > +dkms_wireguard_version=$(shell /sbin/modinfo -F version /lib/modules/$(KERNEL_ABI_VERSION)-raspi/kernel/drivers/net/wireguard/wireguard.ko) > > debian/control: tp_key=test:provides\(-full\|-image\|-headers\|-modules-extra\) > debian/control: $(control_files) >
On Wed, 21 Oct 2020 09:37:49 +0200 Stefan Bader <stefan.bader@canonical.com> wrote: > On 20.10.20 13:23, Juerg Haefliger wrote: > > BugLink: https://bugs.launchpad.net/bugs/1900683 > > > > Also, since wireguard is now part of the kernel, the modules package is a > > build dependency so that the version can be extracted from the module. > > > > Signed-off-by: Juerg Haefliger <juergh@canonical.com> > > --- > > Hm, I am wondering whether this is not something (the version of the module) > that could be obtained via the smaller buildinfo file. Or if not already > present, whether that might be a suitable addition... Good idea. That info is currently not in buildinfo but I'll look into adding it. In the meantime, can we get the patch at hand into G raspi? The current solution matches the other derivatives. ...Juerg > -Stefan > > > debian/control.common | 1 + > > debian/control.d/raspi | 2 +- > > debian/control.d/raspi-nolpae | 1 + > > debian/rules | 2 +- > > 4 files changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/debian/control.common b/debian/control.common > > index c93fe13f5242..f386aa9f135a 100644 > > --- a/debian/control.common > > +++ b/debian/control.common > > @@ -7,4 +7,5 @@ Build-Depends: dpkg (>= 1.13.19), debhelper (>= 9), gawk, > > Build-Depends-Arch: > > @KERNEL_SOURCE@-headers-@KERNEL_ABI_VERSION@, > > linux-headers-@KERNEL_ABI_VERSION@-raspi, > > + linux-modules-@KERNEL_ABI_VERSION@-raspi, > > Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux-meta-raspi/+git/@SERIES@ > > diff --git a/debian/control.d/raspi b/debian/control.d/raspi > > index f7f78210b45b..7796da6ec2d0 100644 > > --- a/debian/control.d/raspi > > +++ b/debian/control.d/raspi > > @@ -9,7 +9,7 @@ Description: Raspberry Pi Linux kernel headers > > Package: linux-image-raspi${variant:suffix} > > Architecture: armhf arm64 > > Section: kernel > > -Provides: ${dkms:zfs-modules} > > +Provides: ${dkms:zfs-modules} ${dkms:wireguard-linux-compat-modules} > > Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-raspi, linux-firmware > > Description: Raspberry Pi Linux kernel image > > This package will always depend on the latest Raspberry Pi Linux > > diff --git a/debian/control.d/raspi-nolpae b/debian/control.d/raspi-nolpae > > index d494dd1f3963..cc4f3227e9b4 100644 > > --- a/debian/control.d/raspi-nolpae > > +++ b/debian/control.d/raspi-nolpae > > @@ -9,6 +9,7 @@ Description: No-LPAE Raspberry Pi Linux kernel headers > > Package: linux-image-raspi-nolpae${variant:suffix} > > Architecture: armhf > > Section: kernel > > +Provides: ${dkms:wireguard-linux-compat-modules} > > Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-raspi-nolpae, linux-firmware > > Description: No-LPAE Raspberry Pi Linux kernel image > > This package will always depend on the latest no-LPAE Raspberry Pi Linux > > diff --git a/debian/rules b/debian/rules > > index 45369c0c4b9a..cd71bc87fce4 100755 > > --- a/debian/rules > > +++ b/debian/rules > > @@ -41,7 +41,7 @@ clean: debian/control > > # Versions of dkms packages. > > dkms_zfs_linux_version=$(shell gawk '/^zfs-linux/ { print $$2; }' debian/dkms-versions) > > dkms_virtualbox_version=$(shell gawk '/^virtualbox/ { print $$2; }' debian/dkms-versions) > > -dkms_wireguard_version=$(shell gawk '/^wireguard-linux-compat/ { print $$2; }' debian/dkms-versions) > > +dkms_wireguard_version=$(shell /sbin/modinfo -F version /lib/modules/$(KERNEL_ABI_VERSION)-raspi/kernel/drivers/net/wireguard/wireguard.ko) > > > > debian/control: tp_key=test:provides\(-full\|-image\|-headers\|-modules-extra\) > > debian/control: $(control_files) > > > >
On 20.10.20 13:23, Juerg Haefliger wrote: > BugLink: https://bugs.launchpad.net/bugs/1900683 > > Also, since wireguard is now part of the kernel, the modules package is a > build dependency so that the version can be extracted from the module. > > Signed-off-by: Juerg Haefliger <juergh@canonical.com> As Juerg mentioned, this matches what's done for the other kernels in Groovy, so this is the best solution for now. Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> > --- > debian/control.common | 1 + > debian/control.d/raspi | 2 +- > debian/control.d/raspi-nolpae | 1 + > debian/rules | 2 +- > 4 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/debian/control.common b/debian/control.common > index c93fe13f5242..f386aa9f135a 100644 > --- a/debian/control.common > +++ b/debian/control.common > @@ -7,4 +7,5 @@ Build-Depends: dpkg (>= 1.13.19), debhelper (>= 9), gawk, > Build-Depends-Arch: > @KERNEL_SOURCE@-headers-@KERNEL_ABI_VERSION@, > linux-headers-@KERNEL_ABI_VERSION@-raspi, > + linux-modules-@KERNEL_ABI_VERSION@-raspi, > Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux-meta-raspi/+git/@SERIES@ > diff --git a/debian/control.d/raspi b/debian/control.d/raspi > index f7f78210b45b..7796da6ec2d0 100644 > --- a/debian/control.d/raspi > +++ b/debian/control.d/raspi > @@ -9,7 +9,7 @@ Description: Raspberry Pi Linux kernel headers > Package: linux-image-raspi${variant:suffix} > Architecture: armhf arm64 > Section: kernel > -Provides: ${dkms:zfs-modules} > +Provides: ${dkms:zfs-modules} ${dkms:wireguard-linux-compat-modules} > Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-raspi, linux-firmware > Description: Raspberry Pi Linux kernel image > This package will always depend on the latest Raspberry Pi Linux > diff --git a/debian/control.d/raspi-nolpae b/debian/control.d/raspi-nolpae > index d494dd1f3963..cc4f3227e9b4 100644 > --- a/debian/control.d/raspi-nolpae > +++ b/debian/control.d/raspi-nolpae > @@ -9,6 +9,7 @@ Description: No-LPAE Raspberry Pi Linux kernel headers > Package: linux-image-raspi-nolpae${variant:suffix} > Architecture: armhf > Section: kernel > +Provides: ${dkms:wireguard-linux-compat-modules} > Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-raspi-nolpae, linux-firmware > Description: No-LPAE Raspberry Pi Linux kernel image > This package will always depend on the latest no-LPAE Raspberry Pi Linux > diff --git a/debian/rules b/debian/rules > index 45369c0c4b9a..cd71bc87fce4 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -41,7 +41,7 @@ clean: debian/control > # Versions of dkms packages. > dkms_zfs_linux_version=$(shell gawk '/^zfs-linux/ { print $$2; }' debian/dkms-versions) > dkms_virtualbox_version=$(shell gawk '/^virtualbox/ { print $$2; }' debian/dkms-versions) > -dkms_wireguard_version=$(shell gawk '/^wireguard-linux-compat/ { print $$2; }' debian/dkms-versions) > +dkms_wireguard_version=$(shell /sbin/modinfo -F version /lib/modules/$(KERNEL_ABI_VERSION)-raspi/kernel/drivers/net/wireguard/wireguard.ko) > > debian/control: tp_key=test:provides\(-full\|-image\|-headers\|-modules-extra\) > debian/control: $(control_files) >
On 20.10.20 13:23, Juerg Haefliger wrote: > BugLink: https://bugs.launchpad.net/bugs/1900683 > > Also, since wireguard is now part of the kernel, the modules package is a > build dependency so that the version can be extracted from the module. > > Signed-off-by: Juerg Haefliger <juergh@canonical.com> > --- Applied to groovy/linux-meta-raspi. Thanks. -Stefan > debian/control.common | 1 + > debian/control.d/raspi | 2 +- > debian/control.d/raspi-nolpae | 1 + > debian/rules | 2 +- > 4 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/debian/control.common b/debian/control.common > index c93fe13f5242..f386aa9f135a 100644 > --- a/debian/control.common > +++ b/debian/control.common > @@ -7,4 +7,5 @@ Build-Depends: dpkg (>= 1.13.19), debhelper (>= 9), gawk, > Build-Depends-Arch: > @KERNEL_SOURCE@-headers-@KERNEL_ABI_VERSION@, > linux-headers-@KERNEL_ABI_VERSION@-raspi, > + linux-modules-@KERNEL_ABI_VERSION@-raspi, > Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux-meta-raspi/+git/@SERIES@ > diff --git a/debian/control.d/raspi b/debian/control.d/raspi > index f7f78210b45b..7796da6ec2d0 100644 > --- a/debian/control.d/raspi > +++ b/debian/control.d/raspi > @@ -9,7 +9,7 @@ Description: Raspberry Pi Linux kernel headers > Package: linux-image-raspi${variant:suffix} > Architecture: armhf arm64 > Section: kernel > -Provides: ${dkms:zfs-modules} > +Provides: ${dkms:zfs-modules} ${dkms:wireguard-linux-compat-modules} > Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-raspi, linux-firmware > Description: Raspberry Pi Linux kernel image > This package will always depend on the latest Raspberry Pi Linux > diff --git a/debian/control.d/raspi-nolpae b/debian/control.d/raspi-nolpae > index d494dd1f3963..cc4f3227e9b4 100644 > --- a/debian/control.d/raspi-nolpae > +++ b/debian/control.d/raspi-nolpae > @@ -9,6 +9,7 @@ Description: No-LPAE Raspberry Pi Linux kernel headers > Package: linux-image-raspi-nolpae${variant:suffix} > Architecture: armhf > Section: kernel > +Provides: ${dkms:wireguard-linux-compat-modules} > Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-raspi-nolpae, linux-firmware > Description: No-LPAE Raspberry Pi Linux kernel image > This package will always depend on the latest no-LPAE Raspberry Pi Linux > diff --git a/debian/rules b/debian/rules > index 45369c0c4b9a..cd71bc87fce4 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -41,7 +41,7 @@ clean: debian/control > # Versions of dkms packages. > dkms_zfs_linux_version=$(shell gawk '/^zfs-linux/ { print $$2; }' debian/dkms-versions) > dkms_virtualbox_version=$(shell gawk '/^virtualbox/ { print $$2; }' debian/dkms-versions) > -dkms_wireguard_version=$(shell gawk '/^wireguard-linux-compat/ { print $$2; }' debian/dkms-versions) > +dkms_wireguard_version=$(shell /sbin/modinfo -F version /lib/modules/$(KERNEL_ABI_VERSION)-raspi/kernel/drivers/net/wireguard/wireguard.ko) > > debian/control: tp_key=test:provides\(-full\|-image\|-headers\|-modules-extra\) > debian/control: $(control_files) >
diff --git a/debian/control.common b/debian/control.common index c93fe13f5242..f386aa9f135a 100644 --- a/debian/control.common +++ b/debian/control.common @@ -7,4 +7,5 @@ Build-Depends: dpkg (>= 1.13.19), debhelper (>= 9), gawk, Build-Depends-Arch: @KERNEL_SOURCE@-headers-@KERNEL_ABI_VERSION@, linux-headers-@KERNEL_ABI_VERSION@-raspi, + linux-modules-@KERNEL_ABI_VERSION@-raspi, Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux-meta-raspi/+git/@SERIES@ diff --git a/debian/control.d/raspi b/debian/control.d/raspi index f7f78210b45b..7796da6ec2d0 100644 --- a/debian/control.d/raspi +++ b/debian/control.d/raspi @@ -9,7 +9,7 @@ Description: Raspberry Pi Linux kernel headers Package: linux-image-raspi${variant:suffix} Architecture: armhf arm64 Section: kernel -Provides: ${dkms:zfs-modules} +Provides: ${dkms:zfs-modules} ${dkms:wireguard-linux-compat-modules} Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-raspi, linux-firmware Description: Raspberry Pi Linux kernel image This package will always depend on the latest Raspberry Pi Linux diff --git a/debian/control.d/raspi-nolpae b/debian/control.d/raspi-nolpae index d494dd1f3963..cc4f3227e9b4 100644 --- a/debian/control.d/raspi-nolpae +++ b/debian/control.d/raspi-nolpae @@ -9,6 +9,7 @@ Description: No-LPAE Raspberry Pi Linux kernel headers Package: linux-image-raspi-nolpae${variant:suffix} Architecture: armhf Section: kernel +Provides: ${dkms:wireguard-linux-compat-modules} Depends: ${misc:Depends}, linux-image-${kernel-abi-version}-raspi-nolpae, linux-firmware Description: No-LPAE Raspberry Pi Linux kernel image This package will always depend on the latest no-LPAE Raspberry Pi Linux diff --git a/debian/rules b/debian/rules index 45369c0c4b9a..cd71bc87fce4 100755 --- a/debian/rules +++ b/debian/rules @@ -41,7 +41,7 @@ clean: debian/control # Versions of dkms packages. dkms_zfs_linux_version=$(shell gawk '/^zfs-linux/ { print $$2; }' debian/dkms-versions) dkms_virtualbox_version=$(shell gawk '/^virtualbox/ { print $$2; }' debian/dkms-versions) -dkms_wireguard_version=$(shell gawk '/^wireguard-linux-compat/ { print $$2; }' debian/dkms-versions) +dkms_wireguard_version=$(shell /sbin/modinfo -F version /lib/modules/$(KERNEL_ABI_VERSION)-raspi/kernel/drivers/net/wireguard/wireguard.ko) debian/control: tp_key=test:provides\(-full\|-image\|-headers\|-modules-extra\) debian/control: $(control_files)
BugLink: https://bugs.launchpad.net/bugs/1900683 Also, since wireguard is now part of the kernel, the modules package is a build dependency so that the version can be extracted from the module. Signed-off-by: Juerg Haefliger <juergh@canonical.com> --- debian/control.common | 1 + debian/control.d/raspi | 2 +- debian/control.d/raspi-nolpae | 1 + debian/rules | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-)