From patchwork Tue Mar 17 14:19:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 450993 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 784B114017B; Wed, 18 Mar 2015 01:19:59 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1YXsLa-0007F6-Eu; Tue, 17 Mar 2015 14:19:54 +0000 Received: from mail-wg0-f52.google.com ([74.125.82.52]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1YXsLR-0007Cg-HG for kernel-team@lists.ubuntu.com; Tue, 17 Mar 2015 14:19:45 +0000 Received: by wgdm6 with SMTP id m6so9777632wgd.2 for ; Tue, 17 Mar 2015 07:19:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lhJngho7gHM8qk8UaSvUYv3erBhoZ6AoCXMrHnK+m3w=; b=k/ZrP1MPvAYzQ822kywucRBbyUTanUJAM5IPk/727d8uS1azLnc9ChQoarKoUSOtxi ZFJ6ecg4Q+Txoojd9f3Buva02LlQZnsrsk08VO6dSwb3I20FesE4mNs1vRgzafC8qnna K71zTU3fb6ieUSG/1tnZNY08Kh7SMIVxv8CPedwcaTazH8ZnQAATyEWU1D/qpbdJGZwY qx6QFGlRclR4z40zRuZSLqYWBtSWQIEfz3iUiZr6LRCd4f1H3RkSYBDfaNG4PmRThQNP Q/zKtHM8yGII3nzM+tcqZ1Y8vPUzyxD619R8sWJy580ksfbu1w/oBGnsSTuWDOCwD/+a NFaw== X-Gm-Message-State: ALoCoQmRo4m9muZIRLKEovX8Ad0XlWID453f3LjTZjuPEqYSV/AVfNntFa04P6k4eBpLGTaByr5d X-Received: by 10.180.103.40 with SMTP id ft8mr178843319wib.68.1426601985379; Tue, 17 Mar 2015 07:19:45 -0700 (PDT) Received: from localhost ([2001:470:6973:2:69b3:90af:8421:9377]) by mx.google.com with ESMTPSA id j9sm20157258wjy.18.2015.03.17.07.19.44 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 17 Mar 2015 07:19:44 -0700 (PDT) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [trusty/utopic 1/1] UBUNTU: [Packaging] generate live watchdog blacklists Date: Tue, 17 Mar 2015 14:19:38 +0000 Message-Id: <1426601978-31201-3-git-send-email-apw@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1426601978-31201-1-git-send-email-apw@canonical.com> References: <1426601978-31201-1-git-send-email-apw@canonical.com> Cc: Andy Whitcroft X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/1432837 Signed-off-by: Andy Whitcroft --- debian/rules.d/2-binary-arch.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 223186f..0e2656e 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -121,6 +121,18 @@ endif INSTALL_MOD_STRIP=1 INSTALL_MOD_PATH=$(pkgdir)/ \ INSTALL_FW_PATH=$(pkgdir)/lib/firmware/$(abi_release)-$* + # + # Build module blacklists: + # - blacklist all watchdog drivers (LP:1432837) + # + install -d $(pkgdir)/lib/modprobe.d + echo "# Autogenerated blacklist for $(src_pkg_name) $(abi_release)-$* $(arch)" \ + >$(pkgdir)/lib/modprobe.d/blacklist_$(src_pkg_name)_$(abi_release)-$*.conf + ls -1 $(pkgdir)/lib/modules/$(abi_release)-$*/kernel/drivers/watchdog/ | \ + sed -e 's/^/blacklist /' -e 's/.ko$$//' | \ + sort -u \ + >>$(pkgdir)/lib/modprobe.d/blacklist_$(src_pkg_name)_$(abi_release)-$*.conf + ifeq ($(do_extras_package),true) # # Remove all modules not in the inclusion list.