diff options
author | Matt Madison <matt@madison.systems> | 2020-09-07 06:21:15 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-08 16:43:40 +0100 |
commit | dbe75a790d7dbe70f2492005ffc083054ba7b8db (patch) | |
tree | 11277e7dcfbfceea1b7b28d5f3bfed34e23a7ade | |
parent | c25309ecde4e7ff81fb74a74fe06991dcdbbbfc8 (diff) | |
download | poky-dbe75a790d7dbe70f2492005ffc083054ba7b8db.tar.gz |
image.bbclass: fix REPRODUCIBLE_TIMESTAMP_ROOTFS reference
Commit 97b439469a45a089431ca9c31893288c855045f4 added a fallback
mechanism for getting the rootfs timestamp. However, it uses curly
braces around the variable name, which causes bitbake resolve the
variable reference, rather than the shell, so the git timestamp
never gets used. Fix the reference to restore the intent of
making it a fallback for when there is no git timestamp to
retrieve.
(From OE-Core rev: fbcf2c1c255b0c61a795c032cf7b67f5db41baa8)
Signed-off-by: Matt Madison <matt@madison.systems>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/image.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 3b5600e550..730c843c18 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -651,7 +651,7 @@ reproducible_final_image_task () { | |||
651 | if [ "${BUILD_REPRODUCIBLE_BINARIES}" = "1" ]; then | 651 | if [ "${BUILD_REPRODUCIBLE_BINARIES}" = "1" ]; then |
652 | if [ "$REPRODUCIBLE_TIMESTAMP_ROOTFS" = "" ]; then | 652 | if [ "$REPRODUCIBLE_TIMESTAMP_ROOTFS" = "" ]; then |
653 | REPRODUCIBLE_TIMESTAMP_ROOTFS=`git -C "${COREBASE}" log -1 --pretty=%ct 2>/dev/null` || true | 653 | REPRODUCIBLE_TIMESTAMP_ROOTFS=`git -C "${COREBASE}" log -1 --pretty=%ct 2>/dev/null` || true |
654 | if [ "${REPRODUCIBLE_TIMESTAMP_ROOTFS}" = "" ]; then | 654 | if [ "$REPRODUCIBLE_TIMESTAMP_ROOTFS" = "" ]; then |
655 | REPRODUCIBLE_TIMESTAMP_ROOTFS=`stat -c%Y ${@bb.utils.which(d.getVar("BBPATH"), "conf/bitbake.conf")}` | 655 | REPRODUCIBLE_TIMESTAMP_ROOTFS=`stat -c%Y ${@bb.utils.which(d.getVar("BBPATH"), "conf/bitbake.conf")}` |
656 | fi | 656 | fi |
657 | fi | 657 | fi |