diff options
| -rw-r--r-- | 0000_README | 4 | ||||
| -rw-r--r-- | 2930_tar_override.patch | 69 |
2 files changed, 0 insertions, 73 deletions
diff --git a/0000_README b/0000_README index 449aa50f..465332b9 100644 --- a/0000_README +++ b/0000_README @@ -459,10 +459,6 @@ Patch: 2920_sign-file-patch-for-libressl.patch From: https://bugs.gentoo.org/717166 Desc: sign-file: full functionality with modern LibreSSL -Patch: 2930_tar_override.patch -From: https://lore.kernel.org/lkml/20230412082743.350699-1-mgorny@gentoo.org/#t -Desc: kheaders: make it possible to override TAR - Patch: 2940_handle-gcc-14-last-stmt-rename.patch From: https://lore.kernel.org/all/20230811060545.never.564-kees@kernel.org/#Z31scripts:gcc-plugins:gcc-common.h Desc: gcc-plugins: Rename last_stmt() for GCC 14+ diff --git a/2930_tar_override.patch b/2930_tar_override.patch deleted file mode 100644 index aa62aae1..00000000 --- a/2930_tar_override.patch +++ /dev/null @@ -1,69 +0,0 @@ -From: "Michał Górny" <mgorny@gentoo.org> -To: Dmitry Goldin <dgoldin+lkml@protonmail.ch> -Cc: "Masahiro Yamada" <yamada.masahiro@socionext.com>, - linux-kernel@vger.kernel.org, "Michał Górny" <mgorny@gentoo.org>, - "Sam James" <sam@gentoo.org>, - "Masahiro Yamada" <masahiroy@kernel.org> -Subject: [PATCH v2] kheaders: make it possible to override TAR -Date: Wed, 12 Apr 2023 10:27:43 +0200 [thread overview] -Message-ID: <20230412082743.350699-1-mgorny@gentoo.org> (raw) -In-Reply-To: <CAK7LNATfrxu7BK0ZRq+qSjObiz6GpS3U5L=12vDys5_yy=Mdow@mail.gmail.com> - -Commit 86cdd2fdc4e39c388d39c7ba2396d1a9dfd66226 ("kheaders: make headers -archive reproducible") introduced a number of options specific to GNU -tar to the `tar` invocation in `gen_kheaders.sh` script. This causes -the script to fail to work on systems where `tar` is not GNU tar. This -can occur e.g. on recent Gentoo Linux installations that support using -bsdtar from libarchive instead. - -Add a `TAR` make variable to make it possible to override the tar -executable used, e.g. by specifying: - - make TAR=gtar - -Link: https://bugs.gentoo.org/884061 -Reported-by: Sam James <sam@gentoo.org> -Tested-by: Sam James <sam@gentoo.org> -Co-developed-by: Masahiro Yamada <masahiroy@kernel.org> -Signed-off-by: Michał Górny <mgorny@gentoo.org> ---- - Makefile | 3 ++- - kernel/gen_kheaders.sh | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 5aeea3d98..50045059c 100644 ---- a/Makefile -+++ b/Makefile -@@ -520,6 +520,7 @@ LZMA = lzma - LZ4 = lz4c - XZ = xz - ZSTD = zstd -+TAR = tar - - PAHOLE_FLAGS = $(shell PAHOLE=$(PAHOLE) $(srctree)/scripts/pahole-flags.sh) - -@@ -599,7 +600,7 @@ export RUSTC RUSTDOC RUSTFMT RUSTC_OR_CLIPPY_QUIET RUSTC_OR_CLIPPY BINDGEN CARGO - export HOSTRUSTC KBUILD_HOSTRUSTFLAGS - export CPP AR NM STRIP OBJCOPY OBJDUMP READELF PAHOLE RESOLVE_BTFIDS LEX YACC AWK INSTALLKERNEL - export PERL PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX --export KGZIP KBZIP2 KLZOP LZMA LZ4 XZ ZSTD -+export KGZIP KBZIP2 KLZOP LZMA LZ4 XZ ZSTD TAR - export KBUILD_HOSTCXXFLAGS KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS LDFLAGS_MODULE - export KBUILD_USERCFLAGS KBUILD_USERLDFLAGS - -diff --git a/kernel/gen_kheaders.sh b/kernel/gen_kheaders.sh -index 1ef9a8751..82d539648 100755 ---- a/kernel/gen_kheaders.sh -+++ b/kernel/gen_kheaders.sh -@@ -86,7 +86,7 @@ find $cpio_dir -type f -print0 | - # For compatibility with older versions of tar, files are fed to tar - # pre-sorted, as --sort=name might not be available. - find $cpio_dir -printf "./%P\n" | LC_ALL=C sort | \ -- tar "${KBUILD_BUILD_TIMESTAMP:+--mtime=$KBUILD_BUILD_TIMESTAMP}" \ -+ ${TAR:-tar} "${KBUILD_BUILD_TIMESTAMP:+--mtime=$KBUILD_BUILD_TIMESTAMP}" \ - --owner=0 --group=0 --numeric-owner --no-recursion \ - -I $XZ -cf $tarfile -C $cpio_dir/ -T - > /dev/null - --- -2.40.0 |