From patchwork Thu Apr 26 15:51:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 905168 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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=none (p=none dis=none) header.from=ubuntu.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 40X1kz1FWKz9s06; Fri, 27 Apr 2018 01:51:23 +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 1fBjB1-0008EN-I9; Thu, 26 Apr 2018 15:51:19 +0000 Received: from smtp.outflux.net ([198.145.64.163]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1fBjAz-0008E0-8H for kernel-team@lists.ubuntu.com; Thu, 26 Apr 2018 15:51:17 +0000 Received: from www.outflux.net (serenity.outflux.net [10.2.0.2]) by vinyl.outflux.net (8.15.2/8.15.2/Debian-3) with ESMTPS id w3QFpEmW028146 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Thu, 26 Apr 2018 08:51:14 -0700 Date: Thu, 26 Apr 2018 08:51:14 -0700 From: Kees Cook To: kernel-team@lists.ubuntu.com Subject: [bionic][PATCH v2] UBUNTU: [Packaging] Fix missing watchdog for Raspberry Pi Message-ID: <20180426155114.GA47866@beast> MIME-Version: 1.0 Content-Disposition: inline X-MIMEDefang-Filter: outflux$Revision: 1.316 $ X-HELO: www.outflux.net X-Scanned-By: MIMEDefang 2.78 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" The bcm2835_wdt.ko module is required for Raspberry Pi systems to actually reboot and shutdown. It should not get automatically blacklisted. See https://github.com/raspberrypi/linux/issues/2523 Closes LP: #1766052 Signed-off-by: Kees Cook Acked-by: Seth Forshee Acked-by: Khalid Elmously --- v2: add missing pipe (sforshee) --- debian/rules.d/2-binary-arch.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 72e55fc6815c..f9d1d792019e 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -183,6 +183,7 @@ endif echo "# Autogenerated watchdog blacklist" \ >>$(pkgdir)/lib/modprobe.d/blacklist_$(src_pkg_name)_$(abi_release)-$*.conf ls -1 $(pkgdir)/lib/modules/$(abi_release)-$*/kernel/drivers/watchdog/ | \ + grep -v '^bcm2835_wdt$$' | \ sed -e 's/^/blacklist /' -e 's/.ko$$//' | \ sort -u \ >>$(pkgdir)/lib/modprobe.d/blacklist_$(src_pkg_name)_$(abi_release)-$*.conf