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

[mirror_ubuntu-zesty-kernel.git] / debian / rules.d / 2-binary-arch.mk

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 7869cc9e481e6ed71e5679740124e3bf7b38e7f9..61b2d1b1c8bf6e0793390d8a3cc74845286c9b5c 100644 (file)
--- a/debian/rules.d/2-binary-arch.mk
+++ b/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 \