summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2012-11-06 11:46:59 +1030
committerRusty Russell <rusty@rustcorp.com.au>2012-11-06 11:52:24 +1030
commitf6a79af8f3701b5a0df431a76adee212616154dc (patch)
tree838b0abadd2a8fa9d030a0aac44b60889e624862 /scripts
parent59ef28b1f14899b10d6b2682c7057ca00a9a3f47 (diff)
downloadlinux-stable-f6a79af8f3701b5a0df431a76adee212616154dc.tar.gz
linux-stable-f6a79af8f3701b5a0df431a76adee212616154dc.tar.bz2
linux-stable-f6a79af8f3701b5a0df431a76adee212616154dc.zip
modules: don't break modules_install on external modules with no key.
The script still spits out an error ("Can't read private key") but we don't break modules_install. Reported-by: Bruno Wolff III <bruno@wolff.to> Original-patch-by: Josh Boyer <jwboyer@redhat.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.modinst3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst
index dda4b2b61927..ecbb44797e28 100644
--- a/scripts/Makefile.modinst
+++ b/scripts/Makefile.modinst
@@ -16,8 +16,9 @@ PHONY += $(modules)
__modinst: $(modules)
@:
+# Don't stop modules_install if we can't sign external modules.
quiet_cmd_modules_install = INSTALL $@
- cmd_modules_install = mkdir -p $(2); cp $@ $(2) ; $(mod_strip_cmd) $(2)/$(notdir $@) ; $(mod_sign_cmd) $(2)/$(notdir $@)
+ cmd_modules_install = mkdir -p $(2); cp $@ $(2) ; $(mod_strip_cmd) $(2)/$(notdir $@) ; $(mod_sign_cmd) $(2)/$(notdir $@) $(patsubst %,|| true,$(KBUILD_EXTMOD))
# Modules built outside the kernel source tree go into extra by default
INSTALL_MOD_DIR ?= extra