projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
crypto: gcm - fix assumption that assoc has one segment
[firefly-linux-kernel-4.4.55.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 2d3c92c774fba36bfb7af7ff2fe8b3b9f6000654..2309b435c07f6cd0bbf92848bc11fbfbcaabed7f 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,8
+1,8
@@
VERSION = 3
PATCHLEVEL = 8
SUBLEVEL = 0
VERSION = 3
PATCHLEVEL = 8
SUBLEVEL = 0
-EXTRAVERSION =
-rc5
-NAME =
Terrified Chipmunk
+EXTRAVERSION =
+NAME =
Unicycling Gorilla
# *DOCUMENTATION*
# To see a list of typical targets execute "make help"
# *DOCUMENTATION*
# To see a list of typical targets execute "make help"
@@
-165,7
+165,8
@@
export srctree objtree VPATH
# then ARCH is assigned, getting whatever value it gets normally, and
# SUBARCH is subsequently ignored.
# then ARCH is assigned, getting whatever value it gets normally, and
# SUBARCH is subsequently ignored.
-SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
+SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
+ -e s/sun4u/sparc64/ \
-e s/arm.*/arm/ -e s/sa110/arm/ \
-e s/s390x/s390/ -e s/parisc64/parisc/ \
-e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
-e s/arm.*/arm/ -e s/sa110/arm/ \
-e s/s390x/s390/ -e s/parisc64/parisc/ \
-e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
@@
-719,11
+720,11
@@
endif # INSTALL_MOD_STRIP
export mod_strip_cmd
export mod_strip_cmd
-if
eq ($(CONFIG_MODULE_SIG),y)
+if
def CONFIG_MODULE_SIG_ALL
MODSECKEY = ./signing_key.priv
MODPUBKEY = ./signing_key.x509
export MODPUBKEY
MODSECKEY = ./signing_key.priv
MODPUBKEY = ./signing_key.x509
export MODPUBKEY
-mod_sign_cmd = perl $(srctree)/scripts/sign-file $(MODSECKEY) $(MODPUBKEY)
+mod_sign_cmd = perl $(srctree)/scripts/sign-file $(
CONFIG_MODULE_SIG_HASH) $(
MODSECKEY) $(MODPUBKEY)
else
mod_sign_cmd = true
endif
else
mod_sign_cmd = true
endif