From: Matt Madison Date: Mon, 7 Sep 2020 13:21:15 +0000 (-0700) Subject: image.bbclass: fix REPRODUCIBLE_TIMESTAMP_ROOTFS reference X-Git-Tag: 2020-04.3-dunfell~23 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=21d7ab8ce10f6d6a56875244c09dcfebae457b22;p=openembedded-core.git 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. Signed-off-by: Matt Madison Signed-off-by: Richard Purdie (cherry picked from commit fbcf2c1c255b0c61a795c032cf7b67f5db41baa8) Signed-off-by: Steve Sakoman --- diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 6620a9e9c3..459d872b4a 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -654,7 +654,7 @@ reproducible_final_image_task () { if [ "${BUILD_REPRODUCIBLE_BINARIES}" = "1" ]; then if [ "$REPRODUCIBLE_TIMESTAMP_ROOTFS" = "" ]; then REPRODUCIBLE_TIMESTAMP_ROOTFS=`git -C "${COREBASE}" log -1 --pretty=%ct 2>/dev/null` || true - if [ "${REPRODUCIBLE_TIMESTAMP_ROOTFS}" = "" ]; then + if [ "$REPRODUCIBLE_TIMESTAMP_ROOTFS" = "" ]; then REPRODUCIBLE_TIMESTAMP_ROOTFS=`stat -c%Y ${@bb.utils.which(d.getVar("BBPATH"), "conf/bitbake.conf")}` fi fi