lkml.org 
[lkml]   [2018]   [May]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 09/31] kconfig: replace $(UNAME_RELEASE) with function call
    Date
    Now that 'shell' function is supported, this can be self-contained in
    Kconfig.

    Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
    Reviewed-by: Kees Cook <keescook@chromium.org>
    Reviewed-by: Ulf Magnusson <ulfalizer@gmail.com>
    ---

    Changes in v4: None
    Changes in v3: None
    Changes in v2: None

    Makefile | 3 +--
    init/Kconfig | 4 ++--
    2 files changed, 3 insertions(+), 4 deletions(-)

    diff --git a/Makefile b/Makefile
    index c6278e6..01b2211 100644
    --- a/Makefile
    +++ b/Makefile
    @@ -284,8 +284,7 @@ include scripts/Kbuild.include
    # Read KERNELRELEASE from include/config/kernel.release (if it exists)
    KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
    KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
    -UNAME_RELEASE := $(shell uname --release)
    -export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION UNAME_RELEASE
    +export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION

    # 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
    diff --git a/init/Kconfig b/init/Kconfig
    index 752816b..66f0463 100644
    --- a/init/Kconfig
    +++ b/init/Kconfig
    @@ -2,9 +2,9 @@ config DEFCONFIG_LIST
    string
    depends on !UML
    option defconfig_list
    - default "/lib/modules/$(UNAME_RELEASE)/.config"
    + default "/lib/modules/$(shell, uname --release)/.config"
    default "/etc/kernel-config"
    - default "/boot/config-$(UNAME_RELEASE)"
    + default "/boot/config-$(shell, uname --release)"
    default ARCH_DEFCONFIG
    default "arch/$(ARCH)/defconfig"

    --
    2.7.4
    \
     
     \ /
      Last update: 2018-05-17 08:27    [W:4.192 / U:0.400 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site