From 058af2b16fb8029266d312121433c61d41a55ca9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 7 Sep 2020 16:29:52 +0100 Subject: 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. (From OE-Core rev: be07d93a4f59d4563f2d064be1997b39f05e9f0e) (From OE-Core rev: 7a46226288179df565b7c21c3316672d2e2a1ac0) Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/signing.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 4fa99acbc9..8d585430be 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -40,7 +40,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) -- cgit v1.2.3-54-g00ecf