Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <tencent_76F930F42F060E84C8BFA5440D0A35A17209@qq.com>
In-Reply-To: <tencent_76F930F42F060E84C8BFA5440D0A35A17209@qq.com>
From:   Masahiro Yamada <masahiroy@kernel.org>
Date:   Thu, 20 Apr 2023 00:44:30 +0900
Message-ID: <CAK7LNAQys34ptXW+-OPnR22pDVvHZf0JEKy5-=ufFdOu0jBU-Q@mail.gmail.com>
Subject: Re: [PATCH] kbuild: rpm-pkg: fix rpm-pkg build error
To:     29581992@qq.com
Cc:     nathan@kernel.org, ndesaulniers@google.com, nicolas@fjasle.eu,
        linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
        sunjw10@lenovo.com
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Wed, Apr 19, 2023 at 12:18=E2=80=AFPM <29581992@qq.com> wrote:
>
> From: Jiwei Sun <sunjw10@lenovo.com>
>
> The following error will trigger when building rpm-pkg
> $ make rpm-pkg
>   SYNC    include/config/auto.conf.cmd
>   HOSTLD  scripts/kconfig/conf
>   UPD     include/config/kernel.release
>   UPD     .tmp_HEAD
>   ARCHIVE linux.tar.gz
> sh ./scripts/package/mkspec >./kernel.spec
> rpmbuild  --target x86_64-linux -bs kernel.spec \
> --define=3D'_smp_mflags %{nil}' --define=3D'_sourcedir rpmbuild/SOURCES' =
--define=3D'_srcrpmdir .'
> Building target platforms: x86_64-linux
> Building for target x86_64-linux
> Wrote: ./kernel-6.3.0_rc7-47.src.rpm
> rpmbuild  --target x86_64-linux -rb kernel-6.3.0_rc7-47.src.rpm \
> --define=3D'_smp_mflags %{nil}'
> Installing kernel-6.3.0_rc7-47.src.rpm
> Building target platforms: x86_64-linux
> Building for target x86_64-linux
> Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.QtGSXP
> + umask 022
> + cd /mnt/datapart/rpmbuild/BUILD
> + cd /mnt/datapart/rpmbuild/BUILD
> + rm -rf linux
> + /usr/bin/gzip -dc /mnt/datapart/rpmbuild/SOURCES/linux.tar.gz
> + /usr/bin/tar -xof -
> + STATUS=3D0
> + '[' 0 -ne 0 ']'
> + cd linux
> /var/tmp/rpm-tmp.QtGSXP: line 40: cd: linux: No such file or directory
> error: Bad exit status from /var/tmp/rpm-tmp.QtGSXP (%prep)
>
> There is linux.tar, not linux, and the linux.tar.gz is create by the foll=
owing
>  quiet_cmd_archive =3D ARCHIVE $@
>        cmd_archive =3D git -C $(srctree) $(git-config-tar$(suffix $@)) ar=
chive \
>                      --output=3D$$(realpath $@) --prefix=3D$(basename $@)=
/ $(archive-args)
> Here the $@ is linux.tar.gz, and $(basename $@) will be linux.tar,
> The above fact is the cause, so use $(basename $(basename $@)) to get the=
 right directory name.
>
> Signed-off-by: Jiwei Sun <sunjw10@lenovo.com>
> ---
>  scripts/Makefile.package | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/Makefile.package b/scripts/Makefile.package
> index 4d90691505b1..3718ecdf9edf 100644
> --- a/scripts/Makefile.package
> +++ b/scripts/Makefile.package
> @@ -49,7 +49,7 @@ git-config-tar.zst =3D -c tar.tar.zst.command=3D"$(ZSTD=
)"
>
>  quiet_cmd_archive =3D ARCHIVE $@
>        cmd_archive =3D git -C $(srctree) $(git-config-tar$(suffix $@)) ar=
chive \
> -                    --output=3D$$(realpath $@) --prefix=3D$(basename $@)=
/ $(archive-args)
> +                    --output=3D$$(realpath $@) --prefix=3D$(basename $(b=
asename $@))/ $(archive-args)


Thanks for the report and patch, but
this would introduce another regression for
'make perf-tar-src-pkg'.

If you run it on the mainline
the file name will be "perf-6.3.0-rc7.tar"

The inner $(basename ...) will strip ".tar",
then the outer $(basename ...) will strip ".0-rc7".

The resulting prefix will become "perf-6.3/"
while the expected prefix is "pref-6.3.0-rc7/".


>
>  # Linux source tarball
>  # ----------------------------------------------------------------------=
-----
> --
> 2.27.0
>


--=20
Best Regards
Masahiro Yamada