summaryrefslogtreecommitdiff
path: root/kernel/gen_kheaders.sh
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2023-05-21 22:23:35 +0900
committerMasahiro Yamada <masahiroy@kernel.org>2023-05-28 16:20:21 +0900
commit49c386ebbb43394ff4773ce24f726f6afc4c30c8 (patch)
treef953cff118215835e0eac5ec5e2d60d4fb92b56b /kernel/gen_kheaders.sh
parentb230235b386589d8f0d631b1c77a95ca79bb0732 (diff)
downloadlwn-49c386ebbb43394ff4773ce24f726f6afc4c30c8.tar.gz
lwn-49c386ebbb43394ff4773ce24f726f6afc4c30c8.zip
Revert "kheaders: substituting --sort in archive creation"
This reverts commit 700dea5a0bea9f64eba89fae7cb2540326fdfdc1. The reason for that commit was --sort=ORDER introduced in tar 1.28 (2014). More than 3 years have passed since then. Requiring GNU tar 1.28 should be fine now because we require GCC 5.1 (2015). Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
Diffstat (limited to 'kernel/gen_kheaders.sh')
-rwxr-xr-xkernel/gen_kheaders.sh9
1 files changed, 3 insertions, 6 deletions
diff --git a/kernel/gen_kheaders.sh b/kernel/gen_kheaders.sh
index 1ef9a87511f5..6d443ea22bb7 100755
--- a/kernel/gen_kheaders.sh
+++ b/kernel/gen_kheaders.sh
@@ -83,12 +83,9 @@ find $cpio_dir -type f -print0 |
xargs -0 -P8 -n1 perl -pi -e 'BEGIN {undef $/;}; s/\/\*((?!SPDX).)*?\*\///smg;'
# Create archive and try to normalize metadata for reproducibility.
-# 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}" \
- --owner=0 --group=0 --numeric-owner --no-recursion \
- -I $XZ -cf $tarfile -C $cpio_dir/ -T - > /dev/null
+tar "${KBUILD_BUILD_TIMESTAMP:+--mtime=$KBUILD_BUILD_TIMESTAMP}" \
+ --owner=0 --group=0 --sort=name --numeric-owner \
+ -I $XZ -cf $tarfile -C $cpio_dir/ . > /dev/null
echo $headers_md5 > kernel/kheaders.md5
echo "$this_file_md5" >> kernel/kheaders.md5