Commit 2972666a authored by Masahiro Yamada's avatar Masahiro Yamada

kconfig: replace $(UNAME_RELEASE) with function call

Now that 'shell' function is supported, this can be self-contained in
Kconfig.
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarUlf Magnusson <ulfalizer@gmail.com>
parent 2fd5b09c
...@@ -284,8 +284,7 @@ include scripts/Kbuild.include ...@@ -284,8 +284,7 @@ include scripts/Kbuild.include
# Read KERNELRELEASE from include/config/kernel.release (if it exists) # Read KERNELRELEASE from include/config/kernel.release (if it exists)
KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION) KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
UNAME_RELEASE := $(shell uname --release) export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION UNAME_RELEASE
# SUBARCH tells the usermode build what the underlying arch is. That is set # SUBARCH tells the usermode build what the underlying arch is. That is set
# first, and if a usermode build is happening, the "ARCH=um" on the command # first, and if a usermode build is happening, the "ARCH=um" on the command
......
...@@ -2,9 +2,9 @@ config DEFCONFIG_LIST ...@@ -2,9 +2,9 @@ config DEFCONFIG_LIST
string string
depends on !UML depends on !UML
option defconfig_list option defconfig_list
default "/lib/modules/$(UNAME_RELEASE)/.config" default "/lib/modules/$(shell,uname --release)/.config"
default "/etc/kernel-config" default "/etc/kernel-config"
default "/boot/config-$(UNAME_RELEASE)" default "/boot/config-$(shell,uname --release)"
default ARCH_DEFCONFIG default ARCH_DEFCONFIG
default "arch/$(ARCH)/defconfig" default "arch/$(ARCH)/defconfig"
......
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