On Fri, Jul 20, 2018 at 5:33 AM Alex Kiernan <[email protected]> wrote: > > 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 <[email protected]> > --- > > Changes in v2: > - Revert to original behaviour and use ${COREBASE} as per Richard Purdie's > advice > > meta/classes/image.bbclass | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > index adc50c9..48961b6 100644 > --- a/meta/classes/image.bbclass > +++ b/meta/classes/image.bbclass > @@ -651,7 +651,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" > -- > 2.7.4 >
Ping? -- Alex Kiernan -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
