[SRU][G/meta-raspi][PATCH] UBUNTU: [Packaging] Add missing provides for wireguard

[Juerg Haefliger]

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 at 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 at -headers-@KERNEL_ABI_VERSION@,
  linux-headers- at KERNEL_ABI_VERSION@-raspi,
+ linux-modules- at 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