From patchwork Mon Mar 2 08:29:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Righi X-Patchwork-Id: 1247515 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 48WCxM1Rj9z9sRY; Mon, 2 Mar 2020 19:29:40 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1j8gSD-0001sA-S8; Mon, 02 Mar 2020 08:29:33 +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 1j8gSC-0001s4-AO for kernel-team@lists.ubuntu.com; Mon, 02 Mar 2020 08:29:32 +0000 Received: from mail-wm1-f70.google.com ([209.85.128.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1j8gSC-0004Eq-2B for kernel-team@lists.ubuntu.com; Mon, 02 Mar 2020 08:29:32 +0000 Received: by mail-wm1-f70.google.com with SMTP id q20so1112095wmg.1 for ; Mon, 02 Mar 2020 00:29:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition; bh=JvTbp9vwxHymLM3eHRfq8oLdkV6fdpf8zsEjpEjXf/A=; b=clYHoPXzex+ERgJrdxBdwgA93/2acecNHTevF0b4FINQ8xg/bazxz7UbK30ylpZrH8 LnJq6t/dCR1ZAXM4vII0t3lzgc8hhENHxB09AwyZ9rOxOHbK3MLsAL2QYWSOLgEmSiPl eKihccKa2oEooTDDrJD1gr2fHWu9f3/R4cRcs8zAmbDLd6+gWJQvkM62T0tXePQYWKSx ABHihphiw/2tLdzo+u3OeaWjSuzeaHDxSciA3Agp0nh+k/qpfHVosY1lRMjmR5Vs6bTE FbVJXQ2mSlyAO0y9v2rOtyZZKlrwp5JGIExIj4zBynh29T1NAqcM5G21SJ4ANjyrKpJV i5Dw== X-Gm-Message-State: APjAAAXggeFPqQeo62IOO0fxa3iXwTqqfDHFw3LRSFdQwO4+7EnYXMZt cYugZJkSGAka12UQ02P2zPFREH7YbBo9ORh+TFu/InULSdIAeJ+BPc/pnmL4NIt5qN+C2MtTirA 2JDnj3/1339Tgb4lFUxAaN2GFyxPOqq0KoTPZgPXlYA== X-Received: by 2002:a5d:6ac1:: with SMTP id u1mr20123376wrw.383.1583137771336; Mon, 02 Mar 2020 00:29:31 -0800 (PST) X-Google-Smtp-Source: APXvYqy/0AICeoIrsXSs20sJRxLXWrQ1IcQL3XRZJg54XFKSOXU5yzGQFAKXYY1tcBaHhF/OZnHT0g== X-Received: by 2002:a5d:6ac1:: with SMTP id u1mr20123353wrw.383.1583137771033; Mon, 02 Mar 2020 00:29:31 -0800 (PST) Received: from localhost (host212-220-dynamic.45-79-r.retail.telecomitalia.it. [79.45.220.212]) by smtp.gmail.com with ESMTPSA id a26sm14992196wmm.18.2020.03.02.00.29.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2020 00:29:30 -0800 (PST) Date: Mon, 2 Mar 2020 09:29:28 +0100 From: Andrea Righi To: kernel-team@lists.ubuntu.com Subject: [F / unstable] [PATCH] UBUNTU: [Packaging] prevent duplicated entries in modules.ignore Message-ID: <20200302082928.GA10224@xps-13> MIME-Version: 1.0 Content-Disposition: inline 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: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" If we always append the list of disabled modules to modules.ignore we may end up having lots of duplicate entries during the kernel cranking process. Prevent this by checking which modules are already present in modules.ignore before appending them. NOTE: it would be better to generate modules.ignore using some information from the builder itself, rather than maintaining all the *.ignore files. But for now, as a first step, let's prevent the duplicate entries at least. Signed-off-by: Andrea Righi --- debian/rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index 8e455c330326..d1ec78abcabb 100755 --- a/debian/rules +++ b/debian/rules @@ -105,15 +105,15 @@ ifneq ($(do_tools),true) endif ifeq ($(do_zfs),false) - do_zfs_disable:=$(shell cat $(DROOT)/zfs-modules.ignore >>$(prev_abidir)/../modules.ignore) + do_zfs_disable:=$(shell for m in $$(cat $(DROOT)/zfs-modules.ignore); do grep -qxF $$m $(prev_abidir)/../modules.ignore 2>/dev/null || echo $$m >> $(prev_abidir)/../modules.ignore; done) endif ifeq ($(do_dkms_vbox),false) - do_vbox_disable:=$(shell cat $(DROOT)/vbox-modules.ignore >>$(prev_abidir)/../modules.ignore) + do_vbox_disable:=$(shell for m in $$(cat $(DROOT)/vbox-modules.ignore); do grep -qxF $$m $(prev_abidir)/../modules.ignore 2>/dev/null || echo $$m >> $(prev_abidir)/../modules.ignore; done) endif ifeq ($(do_dkms_wireguard),false) - do_wireguard_disable:=$(shell cat $(DROOT)/wireguard-modules.ignore >>$(prev_abidir)/../modules.ignore) + do_wireguard_disable:=$(shell for m in $$(cat $(DROOT)/wireguard-modules.ignore); do grep -qxF $$m $(prev_abidir)/../modules.ignore 2>/dev/null || echo $$m >> $(prev_abidir)/../modules.ignore; done) endif # Either tools package needs the common source preparation