From 81ce9a4343877daf4f346c2add992da04c1d1a9f Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Thu, 18 May 2023 23:17:56 +0000 Subject: [PATCH] Revert "Revert "FROMLIST: kheaders: Follow symlinks to source files."" This reverts commit 3ee567fc882cb55bd71fbecd67adb7910babca01. Reason for revert: relanding change When the kernel is built inside a sandbox container, a forest of symlinks to the source files may be created in the container. In this case, the generated kheaders.tar.xz should follow these symlinks to access the source files, instead of packing the symlinks themselves. After this change, kheaders_data.tar.xz increases from 132K to 6.7M for Bazel builds on android-mainline. Bug: 283225390 Bug: 276339429 Link: https://lore.kernel.org/lkml/20230420010029.2702543-1-elsk@google.com/ Signed-off-by: Yifan Hong Change-Id: I8fe7c02ce9a7dd355cc96df53be23dcb870e3c57 --- kernel/gen_kheaders.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/gen_kheaders.sh b/kernel/gen_kheaders.sh index 1ef9a87511f5..70a75a9a7535 100755 --- a/kernel/gen_kheaders.sh +++ b/kernel/gen_kheaders.sh @@ -87,7 +87,7 @@ find $cpio_dir -type f -print0 | # 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 \ + --owner=0 --group=0 --numeric-owner --no-recursion --dereference \ -I $XZ -cf $tarfile -C $cpio_dir/ -T - > /dev/null echo $headers_md5 > kernel/kheaders.md5