mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 05:09:24 +00:00
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. (From OE-Core rev: 5d579fc2fe71637fc6e071aa66542befa39ac8bb) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -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")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user