diff options
| author | James Morris | 2015-08-14 04:08:39 +0200 |
|---|---|---|
| committer | James Morris | 2015-08-14 04:08:39 +0200 |
| commit | e4fc02f24c223ee8d668bf2d39bb8a2dbd61b40e (patch) | |
| tree | 8ad26407ec8b8898f6ff5f396ff628919a56c624 /Makefile | |
| parent | MAINTAINERS: The keyrings mailing list has moved (diff) | |
| parent | sign-file: Fix warning about BIO_reset() return value (diff) | |
| download | kernel-qcow2-linux-e4fc02f24c223ee8d668bf2d39bb8a2dbd61b40e.tar.gz kernel-qcow2-linux-e4fc02f24c223ee8d668bf2d39bb8a2dbd61b40e.tar.xz kernel-qcow2-linux-e4fc02f24c223ee8d668bf2d39bb8a2dbd61b40e.zip | |
Merge tag 'modsign-pkcs7-20150812-3' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -870,10 +870,10 @@ INITRD_COMPRESS-$(CONFIG_RD_LZ4) := lz4 # export INITRD_COMPRESS := $(INITRD_COMPRESS-y) ifdef CONFIG_MODULE_SIG_ALL -MODSECKEY = ./signing_key.priv +MODSECKEY = $(CONFIG_MODULE_SIG_KEY) MODPUBKEY = ./signing_key.x509 export MODPUBKEY -mod_sign_cmd = perl $(srctree)/scripts/sign-file $(CONFIG_MODULE_SIG_HASH) $(MODSECKEY) $(MODPUBKEY) +mod_sign_cmd = scripts/sign-file $(CONFIG_MODULE_SIG_HASH) $(MODSECKEY) $(MODPUBKEY) else mod_sign_cmd = true endif @@ -1173,8 +1173,8 @@ MRPROPER_DIRS += include/config usr/include include/generated \ arch/*/include/generated .tmp_objdiff MRPROPER_FILES += .config .config.old .version .old_version \ Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \ - signing_key.priv signing_key.x509 x509.genkey \ - extra_certificates signing_key.x509.keyid \ + signing_key.pem signing_key.priv signing_key.x509 \ + x509.genkey extra_certificates signing_key.x509.keyid \ signing_key.x509.signer vmlinux-gdb.py # clean - Delete most, but leave enough to build external modules |