lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 649/862] kbuild: rpm-pkg: fix breakage when V=1 is used
    Date
    From: Janis Schoetterl-Glausch <scgl@linux.ibm.com>

    [ Upstream commit 2e07005f4813a9ff6e895787e0c2d1fea859b033 ]

    Doing make V=1 binrpm-pkg results in:

    Executing(%install): /bin/sh -e /var/tmp/rpm-tmp.EgV6qJ
    + umask 022
    + cd .
    + /bin/rm -rf /home/scgl/rpmbuild/BUILDROOT/kernel-6.0.0_rc5+-1.s390x
    + /bin/mkdir -p /home/scgl/rpmbuild/BUILDROOT
    + /bin/mkdir /home/scgl/rpmbuild/BUILDROOT/kernel-6.0.0_rc5+-1.s390x
    + mkdir -p /home/scgl/rpmbuild/BUILDROOT/kernel-6.0.0_rc5+-1.s390x/boot
    + make -f ./Makefile image_name
    + cp test -e include/generated/autoconf.h -a -e include/config/auto.conf || ( \ echo >&2; \ echo >&2 " ERROR: Kernel configuration is invalid."; \ echo >&2 " include/generated/autoconf.h or include/config/auto.conf are missing.";\ echo >&2 " Run 'make oldconfig && make prepare' on kernel src to fix it."; \ echo >&2 ; \ /bin/false) arch/s390/boot/bzImage /home/scgl/rpmbuild/BUILDROOT/kernel-6.0.0_rc5+-1.s390x/boot/vmlinuz-6.0.0-rc5+
    cp: invalid option -- 'e'
    Try 'cp --help' for more information.
    error: Bad exit status from /var/tmp/rpm-tmp.EgV6qJ (%install)

    Because the make call to get the image name is verbose and prints
    additional information.

    Fixes: 993bdde94547 ("kbuild: add image_name to no-sync-config-targets")
    Signed-off-by: Janis Schoetterl-Glausch <scgl@linux.ibm.com>
    Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    scripts/package/mkspec | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/scripts/package/mkspec b/scripts/package/mkspec
    index 8fa7c5b8a1a1..c920c1b18e7a 100755
    --- a/scripts/package/mkspec
    +++ b/scripts/package/mkspec
    @@ -88,10 +88,10 @@ $S
    mkdir -p %{buildroot}/boot
    %ifarch ia64
    mkdir -p %{buildroot}/boot/efi
    - cp \$($MAKE image_name) %{buildroot}/boot/efi/vmlinuz-$KERNELRELEASE
    + cp \$($MAKE -s image_name) %{buildroot}/boot/efi/vmlinuz-$KERNELRELEASE
    ln -s efi/vmlinuz-$KERNELRELEASE %{buildroot}/boot/
    %else
    - cp \$($MAKE image_name) %{buildroot}/boot/vmlinuz-$KERNELRELEASE
    + cp \$($MAKE -s image_name) %{buildroot}/boot/vmlinuz-$KERNELRELEASE
    %endif
    $M $MAKE %{?_smp_mflags} INSTALL_MOD_PATH=%{buildroot} modules_install
    $MAKE %{?_smp_mflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 13:14    [W:3.838 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site