From: Richard Purdie Date: Sat, 7 Mar 2020 18:03:40 +0000 (+0000) Subject: reproducibile_build: Fix SDE file generation when unpack reruns X-Git-Tag: 2020-04-dunfell~222 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=5d579fc2fe71637fc6e071aa66542befa39ac8bb;p=openembedded-core.git reproducibile_build: Fix SDE file generation when unpack reruns Currently, if an existing TMPDIR is rebuilt, do_fetch/do_unpack can rerun but SDE would remain unchanged. This leads to different results compared to a fresh build. An example change which triggered this is: http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=cb4e69e6346a9fbeebf83a5d5397cacbd41d48b5 Instead, delete any existing SDE and recalculate if we're reunning. Also rename and drop the do_ prefix since these are for tasks, not functions. Signed-off-by: Richard Purdie --- diff --git a/meta/classes/reproducible_build.bbclass b/meta/classes/reproducible_build.bbclass index 750eb950f2..8da40f656a 100644 --- a/meta/classes/reproducible_build.bbclass +++ b/meta/classes/reproducible_build.bbclass @@ -150,11 +150,12 @@ def fixed_source_date_epoch(): bb.debug(1, "No tarball or git repo found to determine SOURCE_DATE_EPOCH") return 0 -python do_create_source_date_epoch_stamp() { +python create_source_date_epoch_stamp() { epochfile = d.getVar('SDE_FILE') + # If it exists we need to regenerate as the sources may have changed if os.path.isfile(epochfile): - bb.debug(1, "Reusing SOURCE_DATE_EPOCH from: %s" % epochfile) - return + bb.debug(1, "Deleting existing SOURCE_DATE_EPOCH from: %s" % epochfile) + os.remove(epochfile) sourcedir = d.getVar('S') source_date_epoch = ( @@ -197,5 +198,5 @@ BB_HASHBASE_WHITELIST += "SOURCE_DATE_EPOCH" python () { if d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1': - d.appendVarFlag("do_unpack", "postfuncs", " do_create_source_date_epoch_stamp") + d.appendVarFlag("do_unpack", "postfuncs", " create_source_date_epoch_stamp") }