Skip to content

Commit 8296ac9

Browse files
committed
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
2 parents 5ad250f + 9cedc5e commit 8296ac9

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

scripts/Makefile.package

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ git-config-tar.zst = -c tar.tar.zst.command="$(ZSTD)"
4949

5050
quiet_cmd_archive = ARCHIVE $@
5151
cmd_archive = git -C $(srctree) $(git-config-tar$(suffix $@)) archive \
52-
--output=$$(realpath $@) --prefix=$(basename $@)/ $(archive-args)
52+
--output=$$(realpath $@) $(archive-args)
5353

5454
# Linux source tarball
5555
# ---------------------------------------------------------------------------
5656

5757
linux-tarballs := $(addprefix linux, .tar.gz)
5858

5959
targets += $(linux-tarballs)
60-
$(linux-tarballs): archive-args = $$(cat $<)
60+
$(linux-tarballs): archive-args = --prefix=linux/ $$(cat $<)
6161
$(linux-tarballs): .tmp_HEAD FORCE
6262
$(call if_changed,archive)
6363

@@ -189,7 +189,7 @@ perf-archive-args = --add-file=$$(realpath $(word 2, $^)) \
189189
perf-tarballs := $(addprefix perf-$(KERNELVERSION), .tar .tar.gz .tar.bz2 .tar.xz .tar.zst)
190190

191191
targets += $(perf-tarballs)
192-
$(perf-tarballs): archive-args = $(perf-archive-args)
192+
$(perf-tarballs): archive-args = --prefix=perf-$(KERNELVERSION)/ $(perf-archive-args)
193193
$(perf-tarballs): tools/perf/MANIFEST .tmp_perf/HEAD .tmp_perf/PERF-VERSION-FILE FORCE
194194
$(call if_changed,archive)
195195

scripts/package/mkdebian

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ EOF
190190

191191
# Generate copyright file
192192
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.
194194
195195
The sources may be found at most Linux archive sites, including:
196196
https://www.kernel.org/pub/linux/kernel

0 commit comments

Comments
 (0)