ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2023-04-23 08:22:25 -07:00
parent 5ad250f1fe 9cedc5e89a
commit 8296ac9256
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/Makefile.package
View File

@@ -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 $@
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, $^)) \
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)

2
scripts/package/mkdebian
View File

@@ -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