diff options
| author | Alex Kiernan <alex.kiernan@gmail.com> | 2018-07-20 04:33:17 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-15 21:45:10 +0100 |
| commit | 97b439469a45a089431ca9c31893288c855045f4 (patch) | |
| tree | b9ff59b11cc56f7716b4f771dd4a2b49cbd6e797 | |
| parent | 805edbc7dc9ceae00d991f9b4e185bbbe1d3ba45 (diff) | |
| download | openembedded-core-97b439469a45a089431ca9c31893288c855045f4.tar.gz openembedded-core-97b439469a45a089431ca9c31893288c855045f4.tar.bz2 openembedded-core-97b439469a45a089431ca9c31893288c855045f4.zip | |
image: Use ${COREBASE}/meta for timestamp, fallback to bitbake.conf
To handle the case where ${COREBASE} isn't the git directory, avoid
erroring out when the git command fails. If we don't have a timestamp
after this, fall back to the timestamp from conf/bitbake.conf.
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/image.bbclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index c0a2714288..5ae0910aa6 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -650,7 +650,10 @@ POPULATE_SDK_PRE_TARGET_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES', 'usr 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` + REPRODUCIBLE_TIMESTAMP_ROOTFS=`git -C "${COREBASE}" log -1 --pretty=%ct 2>/dev/null` || true + if [ "${REPRODUCIBLE_TIMESTAMP_ROOTFS}" = "" ]; then + REPRODUCIBLE_TIMESTAMP_ROOTFS=`stat -c%Y ${@bb.utils.which(d.getVar("BBPATH"), "conf/bitbake.conf")}` + fi fi # Set mtime of all files to a reproducible value bbnote "reproducible_final_image_task: mtime set to $REPRODUCIBLE_TIMESTAMP_ROOTFS" |