kbuild: use proper prefix for tarballs to fix rpm-pkg build error

Since commit f8d94c4e403c ("kbuild: do not create intermediate *.tar
for source tarballs"), 'make rpm-pkg' fails because the prefix of the
source tarball is 'linux.tar/' instead of 'linux/'. $(basename $@)
strips only '.gz' from the filename linux.tar.gz.

You need to strip two suffixes from compressed tarballs and one suffix
from uncompressed tarballs (for example 'perf-6.3.0.tar' generated by
'make perf-tar-src-pkg').

One tricky fix might be --prefix=$(firstword $(subst .tar, ,$@))/
but I think it is better to hard-code the prefix.

Fixes: f8d94c4e403c ("kbuild: do not create intermediate *.tar for source tarballs")
Reported-by: Jiwei Sun <sunjw10@lenovo.com>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>

Changed files
+3 -3
scripts
+3 -3
scripts/Makefile.package
··· 49 49 50 50 quiet_cmd_archive = ARCHIVE $@ 51 51 cmd_archive = git -C $(srctree) $(git-config-tar$(suffix $@)) archive \ 52 - --output=$$(realpath $@) --prefix=$(basename $@)/ $(archive-args) 52 + --output=$$(realpath $@) $(archive-args) 53 53 54 54 # Linux source tarball 55 55 # --------------------------------------------------------------------------- ··· 57 57 linux-tarballs := $(addprefix linux, .tar.gz) 58 58 59 59 targets += $(linux-tarballs) 60 - $(linux-tarballs): archive-args = $$(cat $<) 60 + $(linux-tarballs): archive-args = --prefix=linux/ $$(cat $<) 61 61 $(linux-tarballs): .tmp_HEAD FORCE 62 62 $(call if_changed,archive) 63 63 ··· 189 189 perf-tarballs := $(addprefix perf-$(KERNELVERSION), .tar .tar.gz .tar.bz2 .tar.xz .tar.zst) 190 190 191 191 targets += $(perf-tarballs) 192 - $(perf-tarballs): archive-args = $(perf-archive-args) 192 + $(perf-tarballs): archive-args = --prefix=perf-$(KERNELVERSION)/ $(perf-archive-args) 193 193 $(perf-tarballs): tools/perf/MANIFEST .tmp_perf/HEAD .tmp_perf/PERF-VERSION-FILE FORCE 194 194 $(call if_changed,archive) 195 195