Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72b09c63 authored by Alistair Delva's avatar Alistair Delva
Browse files

Revert "kheaders: make headers archive reproducible" 



This reverts commit 86cdd2fd.

Reason: Broke "make allmodconfig" on Android build machines

$ tar: unrecognized option '--sort=name'
Try 'tar --help' or 'tar --usage' for more information.

Signed-off-by: default avatarAlistair Delva <adelva@google.com>
Change-Id: I3d406988f23201e5ab824ca7aed215ccc9d43279
parent bb6a56a4

Documentation/kbuild/reproducible-builds.rst

+4 −9
Original line number Diff line number Diff line
@@ -16,21 +16,16 @@ the kernel may be unreproducible, and how to avoid them. 
Timestamps

----------



The kernel embeds timestamps in three places:

The kernel embeds a timestamp in two places:



* The version string exposed by ``uname()`` and included in

  ``/proc/version``



* File timestamps in the embedded initramfs



* If enabled via ``CONFIG_IKHEADERS``, file timestamps of kernel

  headers embedded in the kernel or respective module,

  exposed via ``/sys/kernel/kheaders.tar.xz``



By default the timestamp is the current time and in the case of

``kheaders`` the various files' modification times. This must

be overridden using the `KBUILD_BUILD_TIMESTAMP`_ variable.

If you are building from a git commit, you could use its commit date.

By default the timestamp is the current time.  This must be overridden

using the `KBUILD_BUILD_TIMESTAMP`_ variable.  If you are building

from a git commit, you could use its commit date.



The kernel does *not* use the ``__DATE__`` and ``__TIME__`` macros,

and enables warnings if they are used.  If you incorporate external

kernel/gen_kheaders.sh

+1 −4
Original line number Diff line number Diff line
@@ -71,10 +71,7 @@ done | cpio --quiet -pd $cpio_dir >/dev/null 2>&1 
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

tar "${KBUILD_BUILD_TIMESTAMP:+--mtime=$KBUILD_BUILD_TIMESTAMP}" \

    --owner=0 --group=0 --sort=name --numeric-owner \

    -Jcf $tarfile -C $cpio_dir/ . > /dev/null

tar -Jcf $tarfile -C $cpio_dir/ . > /dev/null



echo "$src_files_md5" >  kernel/kheaders.md5

echo "$obj_files_md5" >> kernel/kheaders.md5