summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-07 16:29:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-10 13:21:45 +0100
commitdb8ceed8f2eca92a4cffe8295481d8041281fdd0 (patch)
tree98ad7191652e7be548f5d14718af98d25e0922e1
parent8523e55cc70ef5972da63a666aabacfe2a258e8f (diff)
downloadopenembedded-core-zeus.tar.gz
openembedded-core-zeus.tar.bz2
openembedded-core-zeus.zip
selftest/signing: Ensure build path relocation is safezeus-nextzeus
Similarly to 04ee0e8b95cd8ed890374e0007f976684206b630, ensure only full build paths are replaced in the environment to avoid breaking buildtools. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/selftest/cases/signing.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py
index 5c4e01b2c3..5b8f9bbd38 100644
--- a/meta/lib/oeqa/selftest/cases/signing.py
+++ b/meta/lib/oeqa/selftest/cases/signing.py
@@ -44,7 +44,9 @@ class Signing(OESelftestTestCase):
origenv = os.environ.copy()
for e in os.environ:
- if builddir in os.environ[e]:
+ if builddir + "/" in os.environ[e]:
+ os.environ[e] = os.environ[e].replace(builddir + "/", newbuilddir + "/")
+ if os.environ[e].endswith(builddir):
os.environ[e] = os.environ[e].replace(builddir, newbuilddir)
os.chdir(newbuilddir)