[Unstable:meta][PATCH] UBUNTU: [Packaging] Hard-code wireguard module version

Juerg Haefliger juerg.haefliger at canonical.com
Fri Oct 27 07:52:02 UTC 2023


The wireguard module is now part of the kernel and its version is
bogus and likely to never change so hard-code it and drop the relevant
build dependencies.

Signed-off-by: Juerg Haefliger <juerg.haefliger at canonical.com>
---
 debian/control.common | 3 +--
 debian/rules          | 6 +-----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/debian/control.common b/debian/control.common
index 26236cbe8955..8be96bf2478b 100644
--- a/debian/control.common
+++ b/debian/control.common
@@ -3,9 +3,8 @@ Section: devel
 Priority: optional
 Maintainer: Ubuntu Kernel Team <kernel-team at lists.ubuntu.com>
 Standards-Version: 3.9.8
-Build-Depends: dpkg (>= 1.13.19), debhelper (>= 9), gawk, kmod
+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@-generic,
- linux-modules- at KERNEL_ABI_VERSION@-generic,
 Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux-meta/+git/@SERIES@
diff --git a/debian/rules b/debian/rules
index 77d52afa9265..5386255b6a21 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,11 +70,7 @@ $(foreach _line,$(shell gawk '{ OFS = "!"; $$1 = $$1; print }' debian/dkms-versi
   ) \
 )
 dkms_virtualbox_version=$(KERNEL_ABI_VERSION)
-ifeq ($(wildcard /lib/modules/$(KERNEL_ABI_VERSION)-generic/kernel/drivers/net/wireguard/wireguard.ko.zst),)
-	dkms_wireguard_version := $(shell /sbin/modinfo -F version /lib/modules/$(KERNEL_ABI_VERSION)-generic/kernel/drivers/net/wireguard/wireguard.ko)
-else
-	dkms_wireguard_version := $(shell /sbin/modinfo -F version /lib/modules/$(KERNEL_ABI_VERSION)-generic/kernel/drivers/net/wireguard/wireguard.ko.zst)
-endif
+dkms_wireguard_version := 1.0.0
 
 debian/control.d/dkms-%: module = $(patsubst debian/control.d/dkms-%,%,$@)
 debian/control.d/dkms-%: module_archs = $(dkms_$(patsubst debian/control.d/dkms-%,%,$@)_archs)
-- 
2.39.2




More information about the kernel-team mailing list