diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-14 12:58:40 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-16 17:41:59 +0100 |
commit | 20f6477b6323c723f856c5c29358a04029af7493 (patch) | |
tree | f214bc3be31392aa459787a01fc7d87607b9a4c6 /meta/classes/image.bbclass | |
parent | 0dc5920862dd692905347104927f7cf0b7d61376 (diff) | |
download | poky-20f6477b6323c723f856c5c29358a04029af7493.tar.gz |
reproducible: Drop BUILD_REPRODUCIBLE_BINARIES variable
We want things to be reproduicble and the variable doesn't really change
much any more. Drop the remaining uses and make those code paths always
active.
(From OE-Core rev: d15fb02c7ee7da50e322d74bc6a545234e20c7f3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r-- | meta/classes/image.bbclass | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index c2f3232027..2fa69a40d1 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -651,17 +651,15 @@ ROOTFS_PREPROCESS_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge' | |||
651 | POPULATE_SDK_PRE_TARGET_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'create_merged_usr_symlinks_sdk; ', '',d)}" | 651 | POPULATE_SDK_PRE_TARGET_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'create_merged_usr_symlinks_sdk; ', '',d)}" |
652 | 652 | ||
653 | reproducible_final_image_task () { | 653 | reproducible_final_image_task () { |
654 | if [ "${BUILD_REPRODUCIBLE_BINARIES}" = "1" ]; then | 654 | if [ "$REPRODUCIBLE_TIMESTAMP_ROOTFS" = "" ]; then |
655 | REPRODUCIBLE_TIMESTAMP_ROOTFS=`git -C "${COREBASE}" log -1 --pretty=%ct 2>/dev/null` || true | ||
655 | if [ "$REPRODUCIBLE_TIMESTAMP_ROOTFS" = "" ]; then | 656 | if [ "$REPRODUCIBLE_TIMESTAMP_ROOTFS" = "" ]; then |
656 | REPRODUCIBLE_TIMESTAMP_ROOTFS=`git -C "${COREBASE}" log -1 --pretty=%ct 2>/dev/null` || true | 657 | REPRODUCIBLE_TIMESTAMP_ROOTFS=`stat -c%Y ${@bb.utils.which(d.getVar("BBPATH"), "conf/bitbake.conf")}` |
657 | if [ "$REPRODUCIBLE_TIMESTAMP_ROOTFS" = "" ]; then | ||
658 | REPRODUCIBLE_TIMESTAMP_ROOTFS=`stat -c%Y ${@bb.utils.which(d.getVar("BBPATH"), "conf/bitbake.conf")}` | ||
659 | fi | ||
660 | fi | 658 | fi |
661 | # Set mtime of all files to a reproducible value | ||
662 | bbnote "reproducible_final_image_task: mtime set to $REPRODUCIBLE_TIMESTAMP_ROOTFS" | ||
663 | find ${IMAGE_ROOTFS} -print0 | xargs -0 touch -h --date=@$REPRODUCIBLE_TIMESTAMP_ROOTFS | ||
664 | fi | 659 | fi |
660 | # Set mtime of all files to a reproducible value | ||
661 | bbnote "reproducible_final_image_task: mtime set to $REPRODUCIBLE_TIMESTAMP_ROOTFS" | ||
662 | find ${IMAGE_ROOTFS} -print0 | xargs -0 touch -h --date=@$REPRODUCIBLE_TIMESTAMP_ROOTFS | ||
665 | } | 663 | } |
666 | 664 | ||
667 | systemd_preset_all () { | 665 | systemd_preset_all () { |