diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-23 17:22:25 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-23 17:22:25 +0200 |
| commit | 8296ac9256aa1e9305033720de77ee5419a80f6f (patch) | |
| tree | 74222d12f68fee77e103d11a4a2550018bb1adf8 | |
| parent | Merge tag 'irq_urgent_for_v6.3' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | kbuild: use proper prefix for tarballs to fix rpm-pkg build error (diff) | |
| download | linux-8296ac9256aa1e9305033720de77ee5419a80f6f.tar.xz linux-8296ac9256aa1e9305033720de77ee5419a80f6f.zip | |
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
| -rw-r--r-- | scripts/Makefile.package | 6 | ||||
| -rwxr-xr-x | scripts/package/mkdebian | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/Makefile.package b/scripts/Makefile.package index 4d90691505b1..4000ad04c122 100644 --- a/scripts/Makefile.package +++ b/scripts/Makefile.package @@ -49,7 +49,7 @@ git-config-tar.zst = -c tar.tar.zst.command="$(ZSTD)" quiet_cmd_archive = ARCHIVE $@ cmd_archive = git -C $(srctree) $(git-config-tar$(suffix $@)) archive \ - --output=$$(realpath $@) --prefix=$(basename $@)/ $(archive-args) + --output=$$(realpath $@) $(archive-args) # Linux source tarball # --------------------------------------------------------------------------- @@ -57,7 +57,7 @@ quiet_cmd_archive = ARCHIVE $@ linux-tarballs := $(addprefix linux, .tar.gz) targets += $(linux-tarballs) -$(linux-tarballs): archive-args = $$(cat $<) +$(linux-tarballs): archive-args = --prefix=linux/ $$(cat $<) $(linux-tarballs): .tmp_HEAD FORCE $(call if_changed,archive) @@ -189,7 +189,7 @@ perf-archive-args = --add-file=$$(realpath $(word 2, $^)) \ perf-tarballs := $(addprefix perf-$(KERNELVERSION), .tar .tar.gz .tar.bz2 .tar.xz .tar.zst) targets += $(perf-tarballs) -$(perf-tarballs): archive-args = $(perf-archive-args) +$(perf-tarballs): archive-args = --prefix=perf-$(KERNELVERSION)/ $(perf-archive-args) $(perf-tarballs): tools/perf/MANIFEST .tmp_perf/HEAD .tmp_perf/PERF-VERSION-FILE FORCE $(call if_changed,archive) diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index a4c2c2276223..74b83c9ae0a8 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -190,7 +190,7 @@ EOF # Generate copyright file cat <<EOF > debian/copyright -This is a packacked upstream version of the Linux kernel. +This is a packaged upstream version of the Linux kernel. The sources may be found at most Linux archive sites, including: https://www.kernel.org/pub/linux/kernel |