Commit 8296ac92 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'kbuild-fixes-v6.3-4' of...

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
parents 5ad250f1 9cedc5e8
...@@ -49,7 +49,7 @@ git-config-tar.zst = -c tar.tar.zst.command="$(ZSTD)" ...@@ -49,7 +49,7 @@ git-config-tar.zst = -c tar.tar.zst.command="$(ZSTD)"
quiet_cmd_archive = ARCHIVE $@ quiet_cmd_archive = ARCHIVE $@
cmd_archive = git -C $(srctree) $(git-config-tar$(suffix $@)) archive \ cmd_archive = git -C $(srctree) $(git-config-tar$(suffix $@)) archive \
--output=$$(realpath $@) --prefix=$(basename $@)/ $(archive-args) --output=$$(realpath $@) $(archive-args)
# Linux source tarball # Linux source tarball
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
...@@ -57,7 +57,7 @@ quiet_cmd_archive = ARCHIVE $@ ...@@ -57,7 +57,7 @@ quiet_cmd_archive = ARCHIVE $@
linux-tarballs := $(addprefix linux, .tar.gz) linux-tarballs := $(addprefix linux, .tar.gz)
targets += $(linux-tarballs) targets += $(linux-tarballs)
$(linux-tarballs): archive-args = $$(cat $<) $(linux-tarballs): archive-args = --prefix=linux/ $$(cat $<)
$(linux-tarballs): .tmp_HEAD FORCE $(linux-tarballs): .tmp_HEAD FORCE
$(call if_changed,archive) $(call if_changed,archive)
...@@ -189,7 +189,7 @@ perf-archive-args = --add-file=$$(realpath $(word 2, $^)) \ ...@@ -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) perf-tarballs := $(addprefix perf-$(KERNELVERSION), .tar .tar.gz .tar.bz2 .tar.xz .tar.zst)
targets += $(perf-tarballs) 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 $(perf-tarballs): tools/perf/MANIFEST .tmp_perf/HEAD .tmp_perf/PERF-VERSION-FILE FORCE
$(call if_changed,archive) $(call if_changed,archive)
......
...@@ -190,7 +190,7 @@ EOF ...@@ -190,7 +190,7 @@ EOF
# Generate copyright file # Generate copyright file
cat <<EOF > debian/copyright 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: The sources may be found at most Linux archive sites, including:
https://www.kernel.org/pub/linux/kernel https://www.kernel.org/pub/linux/kernel
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment