lkml.org 
[lkml]   [2020]   [Mar]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.5 39/66] s390: make 'install' not depend on vmlinux
    Date
    From: Masahiro Yamada <masahiroy@kernel.org>

    [ Upstream commit 94e90f727f7424d827256023cace829cad6896f4 ]

    For the same reason as commit 19514fc665ff ("arm, kbuild: make "make
    install" not depend on vmlinux"), the install targets should never
    trigger the rebuild of the kernel.

    The variable, CONFIGURE, is not set by anyone. Remove it as well.

    Link: https://lkml.kernel.org/r/20200216144829.27023-1-masahiroy@kernel.org
    Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
    Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/s390/Makefile | 2 +-
    arch/s390/boot/Makefile | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/s390/Makefile b/arch/s390/Makefile
    index e0e3a465bbfd6..8dfa2cf1f05c7 100644
    --- a/arch/s390/Makefile
    +++ b/arch/s390/Makefile
    @@ -146,7 +146,7 @@ all: bzImage
    #KBUILD_IMAGE is necessary for packaging targets like rpm-pkg, deb-pkg...
    KBUILD_IMAGE := $(boot)/bzImage

    -install: vmlinux
    +install:
    $(Q)$(MAKE) $(build)=$(boot) $@

    bzImage: vmlinux
    diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile
    index e2c47d3a1c891..0ff9261c915e3 100644
    --- a/arch/s390/boot/Makefile
    +++ b/arch/s390/boot/Makefile
    @@ -70,7 +70,7 @@ $(obj)/compressed/vmlinux: $(obj)/startup.a FORCE
    $(obj)/startup.a: $(OBJECTS) FORCE
    $(call if_changed,ar)

    -install: $(CONFIGURE) $(obj)/bzImage
    +install:
    sh -x $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/bzImage \
    System.map "$(INSTALL_PATH)"

    --
    2.20.1
    \
     
     \ /
      Last update: 2020-03-03 03:47    [W:4.144 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site