Commit 51d149ac authored by Seth Forshee's avatar Seth Forshee Committed by Kleber Sacilotto de Souza

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: default avatarSeth Forshee <seth.forshee@canonical.com>
Acked-by: default avatarThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Acked-by: default avatarStefan Bader <stefan.bader@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent d7066ac4
......@@ -23,7 +23,7 @@ quiet_cmd_modules_install = INSTALL $@
cp $@ $(2) ; \
$(mod_strip_cmd) $(2)/$(notdir $@) ; \
if (echo "$(2)/$(notdir $@)" | egrep -q "\/drivers\/staging\/") && \
(! egrep -x "$(2)/$(notdir $@)" $(CURDIR)/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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment