[oe-commits] [openembedded-core] 09/24: oeqa: reproducible: Cleanup reproducible build
git at git.openembedded.org
git at git.openembedded.org
Thu Aug 29 13:21:54 UTC 2019
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit ba1eaf7e87f205f32d0c9c63a5d91618b74e2004
Author: Joshua Watt <jpewhacker at gmail.com>
AuthorDate: Tue Aug 27 14:33:45 2019 -0500
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.
Signed-off-by: Joshua Watt <JPEWhacker at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/lib/oeqa/selftest/cases/reproducible.py | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py
index 6dc83d2..74d94fb 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
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list