From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 7 Sep 2020 15:29:52 +0000 (+0100)
Subject: selftest/signing: Ensure build path relocation is safe
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=a2dcea702ea9111c1f02487f912a21aef5ff3160;p=openembedded-core.git

selftest/signing: Ensure build path relocation is safe

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>
---

diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py
index 5c4e01b2c3..87d3ae6baf 100644
--- a/meta/lib/oeqa/selftest/cases/signing.py
+++ b/meta/lib/oeqa/selftest/cases/signing.py
@@ -44,8 +44,8 @@ class Signing(OESelftestTestCase):
         origenv = os.environ.copy()
 
         for e in os.environ:
-            if builddir in os.environ[e]:
-                os.environ[e] = os.environ[e].replace(builddir, newbuilddir)
+            if builddir + "/" in os.environ[e]:
+                os.environ[e] = os.environ[e].replace(builddir + "/", newbuilddir + "/")
 
         os.chdir(newbuilddir)
         try: