From e960c027b443a69aeedd2ac6a5e125473c85ab2c Mon Sep 17 00:00:00 2001 From: Seth Forshee Date: Fri, 12 May 2017 15:29:18 -0500 Subject: [PATCH] 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 --- scripts/Makefile.modinst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst index 7bd16fa93758..c50c575e73b4 100644 --- a/scripts/Makefile.modinst +++ b/scripts/Makefile.modinst @@ -21,8 +21,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 -- 2.39.5