UBUNTU: [Debian] Don't attempt to sign files if CONFIG_MODULE_SIG=n

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 1657376daf7419c9d25450540b933670b0955b7e..4f1c7ce4bb73229550e1d1eb424965c74d4ba238 100644 (file)
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -288,10 +288,12 @@ ifneq ($(skipdbg),true)
                        $(CROSS_COMPILE)objcopy \
                                --add-gnu-debuglink=$(dbgpkgdir)/usr/lib/debug/$$module \
                                $(pkgdir)/$$module; \
-                       $(builddir)/build-$*/scripts/sign-file $(MODHASHALGO) \
-                               $(MODSECKEY) \
-                               $(MODPUBKEY) \
-                               $(pkgdir)/$$module; \
+                       if grep -q CONFIG_MODULE_SIG=y $(builddir)/build-$*/.config; then \
+                               $(builddir)/build-$*/scripts/sign-file $(MODHASHALGO) \
+                                       $(MODSECKEY) \
+                                       $(MODPUBKEY) \
+                                       $(pkgdir)/$$module; \
+                       fi; \
                fi; \
        done
        rm -f $(dbgpkgdir)/usr/lib/debug/lib/modules/$(abi_release)-$*/build

diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst
index 0f7b7cb181222850ba93465d6a130424cdd6457b..39588e08eb0ebb3a5bd656175d25f1739fb44f59 100644 (file)
--- a/scripts/Makefile.modinst
+++ b/scripts/Makefile.modinst
@@ -23,6 +23,7 @@ quiet_cmd_modules_install = INSTALL $@
     cp $@ $(2) ; \
     $(mod_strip_cmd) $(2)/$(notdir $@) ; \
     if (echo "$(2)/$(notdir $@)" | egrep -q "\/drivers\/staging\/") && \
+       [ -f $(CURDIR)/drivers/staging/signature-inclusion ] && \
        (! egrep -x "$(2)/$(notdir $@)" $(CURDIR)/drivers/staging/signature-inclusion) ; \
        then echo Not signing "$(2)/$(notdir $@)"; \
        else $(mod_sign_cmd) $(2)/$(notdir $@) $(patsubst %,|| true,$(KBUILD_EXTMOD)) && \