From: Kees Cook <kees@ubuntu.com>
Date: Thu, 26 Apr 2018 15:51:00 +0000 (+0200)
Subject: UBUNTU: [Packaging] Fix missing watchdog for Raspberry Pi
X-Git-Tag: Ubuntu-4.15.0-23.25~119
X-Git-Url: https://git.proxmox.com/?p=mirror_ubuntu-bionic-kernel.git;a=commitdiff_plain;h=ed131dd31bb8121e43f5e0ee888757f316d4fff5

UBUNTU: [Packaging] Fix missing watchdog for Raspberry Pi

BugLink: http://bugs.launchpad.net/bugs/1766052

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 <kees@ubuntu.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Khalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
---

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 561c5b3eac9b..aaf3d43379ed 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -203,6 +203,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