summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2019-08-27 14:33:45 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-30 17:10:28 +0100
commit8282ec4bd084b95b5ed21236e7029981a8cc254e (patch)
treee10b3c96f8dc9858c931bcb7d83a078834a0b50f
parent4e1ea3e9c9d6680c008b362f8e767c206bd0290d (diff)
downloadpoky-8282ec4bd084b95b5ed21236e7029981a8cc254e.tar.gz
oeqa: reproducible: Cleanup reproducible build
Cleans up the output from the reproducible build before building to ensure consistent results. Note that the output put is purposely left after around after the build so that non-reproducible packages can be diffed. (From OE-Core rev: f67bb34c8e7950779920b696f8502dbaed9eded5) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/selftest/cases/reproducible.py13
1 files changed, 10 insertions, 3 deletions
diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py
index 6dc83d2847..74d94fb20d 100644
--- a/meta/lib/oeqa/selftest/cases/reproducible.py
+++ b/meta/lib/oeqa/selftest/cases/reproducible.py
@@ -132,16 +132,23 @@ class ReproducibleTests(OESelftestTestCase):
132 bitbake("diffutils-native -c addto_recipe_sysroot") 132 bitbake("diffutils-native -c addto_recipe_sysroot")
133 diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffutils-native") 133 diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffutils-native")
134 134
135 reproducible_tmp = os.path.join(self.topdir, 'reproducible', 'tmp')
136 if os.path.exists(reproducible_tmp):
137 bb.utils.remove(reproducible_tmp)
138
135 # Perform another build. This build should *not* share sstate or pull 139 # Perform another build. This build should *not* share sstate or pull
136 # from any mirrors, but sharing a DL_DIR is fine 140 # from any mirrors, but sharing a DL_DIR is fine
137 self.write_config(textwrap.dedent('''\ 141 self.write_config((textwrap.dedent('''\
138 TMPDIR = "${TOPDIR}/reproducible/tmp" 142 TMPDIR = "%s"
139 SSTATE_DIR = "${TMPDIR}/sstate" 143 SSTATE_DIR = "${TMPDIR}/sstate"
140 SSTATE_MIRROR = "" 144 SSTATE_MIRROR = ""
141 ''') + common_config) 145 ''') % reproducible_tmp) + common_config)
142 vars_test = get_bb_vars(capture_vars) 146 vars_test = get_bb_vars(capture_vars)
143 bitbake(' '.join(self.images)) 147 bitbake(' '.join(self.images))
144 148
149 # NOTE: The temp directory from the reproducible build is purposely
150 # kept after the build so it can be diffed for debugging.
151
145 for c in self.package_classes: 152 for c in self.package_classes:
146 package_class = 'package_' + c 153 package_class = 'package_' + c
147 154