From patchwork Fri Jun 19 10:42:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1312786 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49pFkj6TPMz9sT6; Fri, 19 Jun 2020 20:42:53 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jmETx-0008Ad-Ua; Fri, 19 Jun 2020 10:42:49 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jmETt-00087V-9R for kernel-team@lists.ubuntu.com; Fri, 19 Jun 2020 10:42:45 +0000 Received: from 1.general.apw.uk.vpn ([10.172.192.78] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jmETs-0003Yt-UR; Fri, 19 Jun 2020 10:42:45 +0000 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [bionic/master-next 3/3] UBUNTU: [Packaging]: ignore wireguard modules when wireguard is disabled Date: Fri, 19 Jun 2020 11:42:40 +0100 Message-Id: <20200619104242.285201-4-apw@canonical.com> X-Mailer: git-send-email 2.27.0.rc0 In-Reply-To: <20200619104242.285201-1-apw@canonical.com> References: <20200619104242.285201-1-apw@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andy Whitcroft Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Kleber Sacilotto de Souza 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 Signed-off-by: Andy Whitcroft --- debian/rules | 4 ++++ debian/wireguard-modules.ignore | 1 + 2 files changed, 5 insertions(+) create mode 100644 debian/wireguard-modules.ignore 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) endif +ifeq ($(do_dkms_wireguard),false) + do_wireguard_disable:=$(shell cat $(DROOT)/wireguard-modules.ignore >>$(prev_abidir)/../modules.ignore) +endif + # 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 @@ +wireguard