UBUNTU: [Debian] module blacklists -- add support for manual blacklists

Signed-off-by: Andy Whitcroft <apw@canonical.com>

debian/rules.d/2-binary-arch.mk

@@ -125,8 +125,16 @@ endif
 	#  - blacklist all watchdog drivers (LP:1432837)
 	#
 	install -d $(pkgdir)/lib/modprobe.d
-	echo "# Autogenerated blacklist for $(src_pkg_name) $(abi_release)-$* $(arch)" \
+	echo "# Kernel supplied blacklist for $(src_pkg_name) $(abi_release)-$* $(arch)" \
 		>$(pkgdir)/lib/modprobe.d/blacklist_$(src_pkg_name)_$(abi_release)-$*.conf
+	for conf in $(arch)-$* $(arch) common.conf; do \
+		if [ -f $(DEBIAN)/modprobe.d/$$conf ]; then \
+			echo "# modprobe.d/$$conf"; \
+			cat $(DEBIAN)/modprobe.d/$$conf; \
+		fi; \
+	done >>$(pkgdir)/lib/modprobe.d/blacklist_$(src_pkg_name)_$(abi_release)-$*.conf
+	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/ | \
 		sed -e 's/^/blacklist /' -e 's/.ko$$//' | \
 		sort -u \