2023-04-19 00:54:17

by Yifan Hong

Subject: [PATCH] kheaders: Follow symlinks to source files.

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.

Signed-off-by: Yifan Hong <[email protected]>
---
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..183d9a44aa39 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 -h \
-I $XZ -cf $tarfile -C $cpio_dir/ -T - > /dev/null

echo $headers_md5 > kernel/kheaders.md5
--
2.40.0.634.g4ca3ef3211-goog

2023-04-19 08:21:50

by Matthias Maennich

Subject: Re: [PATCH] kheaders: Follow symlinks to source files.

On Wed, Apr 19, 2023 at 12:29:36AM +0000, Android Kernel Team wrote:
>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.
>
>Signed-off-by: Yifan Hong <[email protected]>
>---
> 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..183d9a44aa39 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 -h \

I would have a preference for the long form --dereference as it is more
descriptive.

With that, feel free to add

Reviewed-by: Matthias Maennich <[email protected]>

Cheers,
Matthias


> -I $XZ -cf $tarfile -C $cpio_dir/ -T - > /dev/null
>
> echo $headers_md5 > kernel/kheaders.md5
>--
>2.40.0.634.g4ca3ef3211-goog
>
>--
>To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
>