Merge tag 'kbuild-fixes-v6.3-4' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild fixes from Masahiro Yamada:

- Fix the prefix in the kernel source tarball

- Fix a typo in the copyright file in Debian package

* tag 'kbuild-fixes-v6.3-4' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
kbuild: use proper prefix for tarballs to fix rpm-pkg build error
kbuild: deb-pkg: Fix a spell typo in mkdebian script

Changed files
+4 -4
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
+1 -1
scripts/package/mkdebian
··· 190 190 191 191 # Generate copyright file 192 192 cat <<EOF > debian/copyright 193 - This is a packacked upstream version of the Linux kernel. 193 + This is a packaged upstream version of the Linux kernel. 194 194 195 195 The sources may be found at most Linux archive sites, including: 196 196 https://www.kernel.org/pub/linux/kernel