diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-07 16:29:52 +0100 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2020-09-14 04:26:37 -1000 |
| commit | 3be3740d0239f2eb198ccd2b75597cdccbdd1efc (patch) | |
| tree | becb92eded9115151c4da8afe6dd9cd5783bbdf7 | |
| parent | cdbc9bf63b3e1354800032d0dd530949bafb7032 (diff) | |
| download | openembedded-core-contrib-3be3740d0239f2eb198ccd2b75597cdccbdd1efc.tar.gz | |
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>
(cherry picked from commit fcd0a9683af1a9155eabbd9056e3b46d4a931b2e)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/signing.py | 4 |
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 202d54994b..a28c7eb19a 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) |