diff options
author | Joshua Watt <JPEWhacker@gmail.com> | 2021-06-01 21:36:48 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-29 14:28:34 +0100 |
commit | cf167fa2735c85314dc394c94d0afd1686f6107d (patch) | |
tree | 317e80d3212e1b218c7bcde9809411d4f11847e2 /meta | |
parent | 0e6f0e2c6776afde1e9a2f3e3474e4d24dd24f65 (diff) | |
download | poky-cf167fa2735c85314dc394c94d0afd1686f6107d.tar.gz |
classes/reproducible_build: Use atomic rename for SDE file
If an existing source date epoch file was found during do_unpack, it was
deleted and a new one would be written in its place. This causes a race
with check-before-use code in get_source_date_epoch_value. Resolve the
problem by making do_unpack write the new source date epoch to a
temporary file, then do an atomic rename to ensure it's always present,
and change the check-before-use code to use a EAFP exception instead of
checking for file existence.
[YOCTO #14384]
(From OE-Core rev: b98d37da1554f524bd5b16287731d7b34945e92d)
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 0b5e3b33187bf78a2d62cc886463e4b27d6bd228)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/reproducible_build.bbclass | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/meta/classes/reproducible_build.bbclass b/meta/classes/reproducible_build.bbclass index 43cf9dc894..62655c2a5b 100644 --- a/meta/classes/reproducible_build.bbclass +++ b/meta/classes/reproducible_build.bbclass | |||
@@ -77,17 +77,16 @@ python create_source_date_epoch_stamp() { | |||
77 | import oe.reproducible | 77 | import oe.reproducible |
78 | 78 | ||
79 | epochfile = d.getVar('SDE_FILE') | 79 | epochfile = d.getVar('SDE_FILE') |
80 | # If it exists we need to regenerate as the sources may have changed | 80 | tmp_file = "%s.new" % epochfile |
81 | if os.path.isfile(epochfile): | ||
82 | bb.debug(1, "Deleting existing SOURCE_DATE_EPOCH from: %s" % epochfile) | ||
83 | os.remove(epochfile) | ||
84 | 81 | ||
85 | source_date_epoch = oe.reproducible.get_source_date_epoch(d, d.getVar('S')) | 82 | source_date_epoch = oe.reproducible.get_source_date_epoch(d, d.getVar('S')) |
86 | 83 | ||
87 | bb.debug(1, "SOURCE_DATE_EPOCH: %d" % source_date_epoch) | 84 | bb.debug(1, "SOURCE_DATE_EPOCH: %d" % source_date_epoch) |
88 | bb.utils.mkdirhier(d.getVar('SDE_DIR')) | 85 | bb.utils.mkdirhier(d.getVar('SDE_DIR')) |
89 | with open(epochfile, 'w') as f: | 86 | with open(tmp_file, 'w') as f: |
90 | f.write(str(source_date_epoch)) | 87 | f.write(str(source_date_epoch)) |
88 | |||
89 | os.rename(tmp_file, epochfile) | ||
91 | } | 90 | } |
92 | 91 | ||
93 | def get_source_date_epoch_value(d): | 92 | def get_source_date_epoch_value(d): |
@@ -100,7 +99,7 @@ def get_source_date_epoch_value(d): | |||
100 | bb.debug(1, "Epoch file changed from %s to %s" % (efile, epochfile)) | 99 | bb.debug(1, "Epoch file changed from %s to %s" % (efile, epochfile)) |
101 | 100 | ||
102 | source_date_epoch = int(d.getVar('SOURCE_DATE_EPOCH_FALLBACK')) | 101 | source_date_epoch = int(d.getVar('SOURCE_DATE_EPOCH_FALLBACK')) |
103 | if os.path.isfile(epochfile): | 102 | try: |
104 | with open(epochfile, 'r') as f: | 103 | with open(epochfile, 'r') as f: |
105 | s = f.read() | 104 | s = f.read() |
106 | try: | 105 | try: |
@@ -113,7 +112,7 @@ def get_source_date_epoch_value(d): | |||
113 | bb.warn("SOURCE_DATE_EPOCH value '%s' is invalid. Reverting to SOURCE_DATE_EPOCH_FALLBACK" % s) | 112 | bb.warn("SOURCE_DATE_EPOCH value '%s' is invalid. Reverting to SOURCE_DATE_EPOCH_FALLBACK" % s) |
114 | source_date_epoch = int(d.getVar('SOURCE_DATE_EPOCH_FALLBACK')) | 113 | source_date_epoch = int(d.getVar('SOURCE_DATE_EPOCH_FALLBACK')) |
115 | bb.debug(1, "SOURCE_DATE_EPOCH: %d" % source_date_epoch) | 114 | bb.debug(1, "SOURCE_DATE_EPOCH: %d" % source_date_epoch) |
116 | else: | 115 | except FileNotFoundError: |
117 | bb.debug(1, "Cannot find %s. SOURCE_DATE_EPOCH will default to %d" % (epochfile, source_date_epoch)) | 116 | bb.debug(1, "Cannot find %s. SOURCE_DATE_EPOCH will default to %d" % (epochfile, source_date_epoch)) |
118 | 117 | ||
119 | d.setVar('__CACHED_SOURCE_DATE_EPOCH', (str(source_date_epoch), epochfile)) | 118 | d.setVar('__CACHED_SOURCE_DATE_EPOCH', (str(source_date_epoch), epochfile)) |