diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-15 07:57:25 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-25 22:25:07 +0000 |
| commit | 6e2bf8691ffd6004cb40e71a2d1d002b5ed5808f (patch) | |
| tree | 3a4dcfc12bd701bd2301b039087d1e5e2ad9e869 | |
| parent | 319ee1bb146b91f78d7a141def2b1cf92cf88887 (diff) | |
| download | openembedded-core-6e2bf8691ffd6004cb40e71a2d1d002b5ed5808f.tar.gz | |
wic/engine: Fix missing parted autobuilder failures
OE-Core rev: a88bcbae850a2e6d182291d3f8e167aabdbe4842 broke the ability
to find parted as it may be in sbin which is not in PATH for some users
on some distros.
Iterate on the original patch to fix this and also fix the original problem.
(From OE-Core rev: af3803e5189d7814f9dbd238fb6dab200f351e1a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | scripts/lib/wic/engine.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index 880e464036..ea600d2854 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py @@ -244,15 +244,17 @@ class Disk: self._psector_size = None self._ptable_format = None + # find parted # read paths from $PATH environment variable # if it fails, use hardcoded paths + pathlist = "/bin:/usr/bin:/usr/sbin:/sbin/" try: - self.paths = os.environ['PATH'] + self.paths = os.environ['PATH'] + ":" + pathlist except KeyError: - self.paths = "/bin:/usr/bin:/usr/sbin:/sbin/" + self.paths = pathlist if native_sysroot: - for path in self.paths.split(':'): + for path in pathlist.split(':'): self.paths = "%s%s:%s" % (native_sysroot, path, self.paths) self.parted = find_executable("parted", self.paths) |