diff mbox series

[bionic/master-next,1/3] UBUNTU: [Packaging] wireguard -- add support for building signed .ko

Message ID 20200619104242.285201-2-apw@canonical.com
State New
Headers show
Series [bionic/master-next,1/3] UBUNTU: [Packaging] wireguard -- add support for building signed .ko | expand

Commit Message

Andy Whitcroft June 19, 2020, 10:42 a.m. UTC 
Add support for building, signing, and shipping the wireguard.ko from
the wireguard-dkms package.  Drop this into the linux-modules package.

BugLink: https://bugs.launchpad.net/bugs/1861284
Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 debian/dkms-versions            | 1 +
 debian/rules                    | 2 ++
 debian/rules.d/2-binary-arch.mk | 2 ++
 3 files changed, 5 insertions(+)
diff mbox series

Patch

diff --git a/debian/dkms-versions b/debian/dkms-versions
index e04ed8315cf3..c2c9bda637eb 100644
--- a/debian/dkms-versions
+++ b/debian/dkms-versions
@@ -3,3 +3,4 @@  zfs-linux 0.7.5-1ubuntu16.9
 nvidia-graphics-drivers-390 390.132-0ubuntu0.18.04.1
 nvidia-graphics-drivers-435 435.21-0ubuntu0.18.04.2
 nvidia-graphics-drivers-440 440.59-0ubuntu0.18.04.1
+wireguard-linux-compat 0
diff --git a/debian/rules b/debian/rules
index bfc23aa45270..433f96f4325b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,6 +45,7 @@  ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
 	disable_d_i=true
 	do_zfs=false
 	do_dkms_nvidia=false
+	do_dkms_wireguard=false
 endif
 
 # Are any of the kernel signing options enabled.
@@ -110,6 +111,7 @@  dkms_spl_linux_version=$(shell gawk '/^spl-linux / { print $$2; }' debian/dkms-v
 dkms_nvidia_390_version=$(shell gawk '/^nvidia-graphics-drivers-390/ { print $$2; }' debian/dkms-versions)
 dkms_nvidia_435_version=$(shell gawk '/^nvidia-graphics-drivers-435/ { print $$2; }' debian/dkms-versions)
 dkms_nvidia_440_version=$(shell gawk '/^nvidia-graphics-drivers-440/ { print $$2; }' debian/dkms-versions)
+dkms_wireguard_version=$(shell gawk '/^wireguard-linux-compat / { print $$2; }' debian/dkms-versions)
 
 # Debian Build System targets
 binary: binary-indep binary-arch
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 0e2b48d4ce5b..62af6bf55f11 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -401,6 +401,8 @@  endif
 	$(if $(filter true,$(enable_zfs)),$(call build_dkms, $(mods_pkg_name)-$*, $(pkgdir)/lib/modules/$(abi_release)-$*/kernel, spl, pool/universe/s/spl-linux/spl-dkms_$(dkms_spl_linux_version)_all.deb))
 	$(if $(filter true,$(enable_zfs)),$(call build_dkms, $(mods_pkg_name)-$*, $(pkgdir)/lib/modules/$(abi_release)-$*/kernel, zfs, pool/universe/z/zfs-linux/zfs-dkms_$(dkms_zfs_linux_version)_all.deb))
 
+	$(if $(filter true,$(do_dkms_wireguard)),$(call build_dkms, $(mods_pkg_name)-$*, $(pkgdir)/lib/modules/$(abi_release)-$*/kernel, wireguard, pool/universe/w/wireguard-linux-compat/wireguard-dkms_$(dkms_wireguard_version)_all.deb))
+
 ifeq ($(do_dkms_nvidia),true)
 	$(call build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, nvidia-390, pool/restricted/n/nvidia-graphics-drivers-390/nvidia-kernel-source-390_$(dkms_nvidia_390_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-390/nvidia-dkms-390_$(dkms_nvidia_390_version)_$(arch).deb)
 	$(call build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, nvidia-435, pool/restricted/n/nvidia-graphics-drivers-435/nvidia-kernel-source-435_$(dkms_nvidia_435_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-435/nvidia-dkms-435_$(dkms_nvidia_435_version)_$(arch).deb)