From 8282ec4bd084b95b5ed21236e7029981a8cc254e Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Tue, 27 Aug 2019 14:33:45 -0500 Subject: 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 Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'meta/lib') 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): bitbake("diffutils-native -c addto_recipe_sysroot") diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffutils-native") + reproducible_tmp = os.path.join(self.topdir, 'reproducible', 'tmp') + if os.path.exists(reproducible_tmp): + bb.utils.remove(reproducible_tmp) + # Perform another build. This build should *not* share sstate or pull # from any mirrors, but sharing a DL_DIR is fine - self.write_config(textwrap.dedent('''\ - TMPDIR = "${TOPDIR}/reproducible/tmp" + self.write_config((textwrap.dedent('''\ + TMPDIR = "%s" SSTATE_DIR = "${TMPDIR}/sstate" SSTATE_MIRROR = "" - ''') + common_config) + ''') % reproducible_tmp) + common_config) vars_test = get_bb_vars(capture_vars) bitbake(' '.join(self.images)) + # NOTE: The temp directory from the reproducible build is purposely + # kept after the build so it can be diffed for debugging. + for c in self.package_classes: package_class = 'package_' + c -- cgit 1.2.3-korg