diff mbox series

[bionic/master-next,3/3] UBUNTU: [Packaging]: ignore wireguard modules when wireguard is disabled

Message ID 20200619104242.285201-4-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
From: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

When the build of wireguard modules is disabled, its modules should be
ignored, just like when zfs is disabled.

Ignore: yes
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
 debian/rules                    | 4 ++++
 debian/wireguard-modules.ignore | 1 +
 2 files changed, 5 insertions(+)
 create mode 100644 debian/wireguard-modules.ignore
diff mbox series


diff --git a/debian/rules b/debian/rules
index 433f96f4325b..b517f41a5beb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -95,6 +95,10 @@  ifeq ($(do_zfs),false)
 	do_zfs_disable:=$(shell cat $(DROOT)/zfs-modules.ignore >>$(prev_abidir)/../modules.ignore)
+ifeq ($(do_dkms_wireguard),false)
+	do_wireguard_disable:=$(shell cat $(DROOT)/wireguard-modules.ignore >>$(prev_abidir)/../modules.ignore)
 # Either tools package needs the common source preparation
 do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools)))
diff --git a/debian/wireguard-modules.ignore b/debian/wireguard-modules.ignore
new file mode 100644
index 000000000000..a82c63a2033f
--- /dev/null
+++ b/debian/wireguard-modules.ignore
@@ -0,0 +1 @@