summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorMatt Madison <matt@madison.systems>2020-09-07 13:21:15 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-17 11:51:24 (GMT)
commit15531ddeb06a098db52de770f0fd2ae5e3eb517c (patch)
treee677ef4d91e95d92c72285a51d090ef11a4f4741 /meta/classes
parent54ef7e87508a21d05f02538b41a108925ed6a121 (diff)
downloadpoky-15531ddeb06a098db52de770f0fd2ae5e3eb517c.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: 21d7ab8ce10f6d6a56875244c09dcfebae457b22) Signed-off-by: Matt Madison <matt@madison.systems> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit fbcf2c1c255b0c61a795c032cf7b67f5db41baa8) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/image.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 6620a9e..459d872 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -654,7 +654,7 @@ reproducible_final_image_task () {
654 if [ "${BUILD_REPRODUCIBLE_BINARIES}" = "1" ]; then 654 if [ "${BUILD_REPRODUCIBLE_BINARIES}" = "1" ]; then
655 if [ "$REPRODUCIBLE_TIMESTAMP_ROOTFS" = "" ]; then 655 if [ "$REPRODUCIBLE_TIMESTAMP_ROOTFS" = "" ]; then
656 REPRODUCIBLE_TIMESTAMP_ROOTFS=`git -C "${COREBASE}" log -1 --pretty=%ct 2>/dev/null` || true 656 REPRODUCIBLE_TIMESTAMP_ROOTFS=`git -C "${COREBASE}" log -1 --pretty=%ct 2>/dev/null` || true
657 if [ "${REPRODUCIBLE_TIMESTAMP_ROOTFS}" = "" ]; then 657 if [ "$REPRODUCIBLE_TIMESTAMP_ROOTFS" = "" ]; then
658 REPRODUCIBLE_TIMESTAMP_ROOTFS=`stat -c%Y ${@bb.utils.which(d.getVar("BBPATH"), "conf/bitbake.conf")}` 658 REPRODUCIBLE_TIMESTAMP_ROOTFS=`stat -c%Y ${@bb.utils.which(d.getVar("BBPATH"), "conf/bitbake.conf")}`
659 fi 659 fi
660 fi 660 fi