-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'kbuild-fixes-v6.3-3' of git://git.kernel.org/pub/scm/linux…
…/kernel/git/masahiroy/linux-kbuild Pull Kbuild fixes from Masahiro Yamada: - Drop debug info from purgatory objects again - Document that kernel.org provides prebuilt LLVM toolchains - Give up handling untracked files for source package builds - Avoid creating corrupted cpio when KBUILD_BUILD_TIMESTAMP is given with a pre-epoch data. - Change panic_show_mem() to a macro to handle variable-length argument - Compress tarballs on-the-fly again * tag 'kbuild-fixes-v6.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: kbuild: do not create intermediate *.tar for tar packages kbuild: do not create intermediate *.tar for source tarballs kbuild: merge cmd_archive_linux and cmd_archive_perf init/initramfs: Fix argument forwarding to panic() in panic_show_mem() initramfs: Check negative timestamp to prevent broken cpio archive kbuild: give up untracked files for source package builds Documentation/llvm: Add a note about prebuilt kernel.org toolchains purgatory: fix disabling debug info
- Loading branch information
Showing
9 changed files
with
138 additions
and
139 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,44 +1,36 @@ | ||
| #!/bin/sh | ||
| # SPDX-License-Identifier: GPL-2.0-only | ||
|
|
||
| diff_patch="${1}" | ||
| untracked_patch="${2}" | ||
| srctree=$(dirname $0)/../.. | ||
| diff_patch=$1 | ||
|
|
||
| rm -f ${diff_patch} ${untracked_patch} | ||
| mkdir -p "$(dirname "${diff_patch}")" | ||
|
|
||
| if ! ${srctree}/scripts/check-git; then | ||
| exit | ||
| fi | ||
|
|
||
| mkdir -p "$(dirname ${diff_patch})" "$(dirname ${untracked_patch})" | ||
| git -C "${srctree:-.}" diff HEAD > "${diff_patch}" | ||
|
|
||
| git -C "${srctree}" diff HEAD > "${diff_patch}" | ||
|
|
||
| if [ ! -s "${diff_patch}" ]; then | ||
| rm -f "${diff_patch}" | ||
| if [ ! -s "${diff_patch}" ] || | ||
| [ -z "$(git -C "${srctree:-.}" ls-files --other --exclude-standard | head -n1)" ]; then | ||
| exit | ||
| fi | ||
|
|
||
| git -C ${srctree} status --porcelain --untracked-files=all | | ||
| while read stat path | ||
| do | ||
| if [ "${stat}" = '??' ]; then | ||
|
|
||
| if ! diff -u /dev/null "${srctree}/${path}" > .tmp_diff && | ||
| ! head -n1 .tmp_diff | grep -q "Binary files"; then | ||
| { | ||
| echo "--- /dev/null" | ||
| echo "+++ linux/$path" | ||
| cat .tmp_diff | tail -n +3 | ||
| } >> ${untracked_patch} | ||
| fi | ||
| fi | ||
| done | ||
|
|
||
| rm -f .tmp_diff | ||
|
|
||
| if [ ! -s "${diff_patch}" ]; then | ||
| rm -f "${diff_patch}" | ||
| exit | ||
| fi | ||
| # The source tarball, which is generated by 'git archive', contains everything | ||
| # you committed in the repository. If you have local diff ('git diff HEAD'), | ||
| # it will go into ${diff_patch}. If untracked files are remaining, the resulting | ||
| # source package may not be correct. | ||
| # | ||
| # Examples: | ||
| # - You modified a source file to add #include "new-header.h" | ||
| # but forgot to add new-header.h | ||
| # - You modified a Makefile to add 'obj-$(CONFIG_FOO) += new-dirver.o' | ||
| # but you forgot to add new-driver.c | ||
| # | ||
| # You need to commit them, or at least stage them by 'git add'. | ||
| # | ||
| # This script does not take care of untracked files because doing so would | ||
| # introduce additional complexity. Instead, print a warning message here if | ||
| # untracked files are found. | ||
| # If all untracked files are just garbage, you can ignore this warning. | ||
| echo >&2 "============================ WARNING ============================" | ||
| echo >&2 "Your working tree has diff from HEAD, and also untracked file(s)." | ||
| echo >&2 "Please make sure you did 'git add' for all new files you need in" | ||
| echo >&2 "the source package." | ||
| echo >&2 "=================================================================" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.