diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-10 13:02:07 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-10 23:20:34 +0000 |
commit | f930e2cadb9ee69759720b6c49aeeb6dd43a7edd (patch) | |
tree | 04a42ed33a941197b6a6b6f65784d48dcc301064 /meta | |
parent | a67e91b1ba3687b6ebb0c96b2a7a490ec458ecc8 (diff) | |
download | poky-f930e2cadb9ee69759720b6c49aeeb6dd43a7edd.tar.gz |
oeqa/selftest: Ensure buildtools in environment variables isn't replaced
This avoids the seeing broken replacements like:
oe-selftest-centos/build/build-st-926tools/sysroots/x86_64-pokysdk-linux/etc/ssl/certs/ca-certificates.crt
which understandably break builds.
(From OE-Core rev: 04ee0e8b95cd8ed890374e0007f976684206b630)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oeqa/selftest/context.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 409698d57c..48ec5d419c 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py | |||
@@ -46,7 +46,7 @@ class OESelftestTestContext(OETestContext): | |||
46 | oe.path.copytree(selftestdir, newselftestdir) | 46 | oe.path.copytree(selftestdir, newselftestdir) |
47 | 47 | ||
48 | for e in os.environ: | 48 | for e in os.environ: |
49 | if builddir in os.environ[e]: | 49 | if builddir + "/" in os.environ[e] or os.environ[e].endswith(builddir): |
50 | os.environ[e] = os.environ[e].replace(builddir, newbuilddir) | 50 | os.environ[e] = os.environ[e].replace(builddir, newbuilddir) |
51 | 51 | ||
52 | subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) | 52 | subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) |