[bionic][PATCH v2] UBUNTU: [Packaging] Fix missing watchdog for Raspberry Pi

[Kees Cook]

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 at ubuntu.com>
---
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
-- 
2.7.4


-- 
Kees Cook
Pixel Security