UBUNTU: SAUCE: Fix module signing exclusion in package builds

BugLink: http://bugs.launchpad.net/bugs/1690908
The current module signing exclusion implementation suffers from
two problems. First, it looks for the signed-inclusion file
relative to the path where make is executed and thus doesn't work
if the source and build directories are different. Second, the
signed-inclusion file lists only the module name, but the strings
searched for in the file include the path (and the path to the
module install location at that).

Fix these problems by updating scripts/Makefile.modinst to look
for signed-inclusion relative to the path of the source tree and
to use only the module name when matching against the contents of
that file.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst
index 1de17f21f4e04e4b55838e452e46e502b5f0a30e..e21f0694159530b3760658c75036cc5eec719c2b 100644 (file)
--- a/scripts/Makefile.modinst
+++ b/scripts/Makefile.modinst
@@ -24,8 +24,8 @@ 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) ; \
+       [ -f $(srctree)/drivers/staging/signature-inclusion ] && \
+       (! egrep -x "$(notdir $@)" $(srctree)/drivers/staging/signature-inclusion) ; \
        then echo Not signing "$(2)/$(notdir $@)"; \
        else $(mod_sign_cmd) $(2)/$(notdir $@) $(patsubst %,|| true,$(KBUILD_EXTMOD)) && \
                $(mod_compress_cmd) $(2)/$(notdir $@); fi