summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-15 07:57:25 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-25 15:01:21 +0100
commitbc6a09c36e08d0b1893097e2628459bddcb182e3 (patch)
treec4b137ce7d2d0196f1538a9d44398b958726c147
parente90f7a24fe2c7e2bfa6bbe34d342d53e5134cc2d (diff)
downloadpoky-bc6a09c36e08d0b1893097e2628459bddcb182e3.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) (From OE-Core rev: 68f56a4967d3121940669ca9116e759081b0b73b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/wic/engine.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index c1270456f5..7e6519ea4c 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -244,15 +244,17 @@ class Disk:
244 self._psector_size = None 244 self._psector_size = None
245 self._ptable_format = None 245 self._ptable_format = None
246 246
247 # find parted
247 # read paths from $PATH environment variable 248 # read paths from $PATH environment variable
248 # if it fails, use hardcoded paths 249 # if it fails, use hardcoded paths
250 pathlist = "/bin:/usr/bin:/usr/sbin:/sbin/"
249 try: 251 try:
250 self.paths = os.environ['PATH'] 252 self.paths = os.environ['PATH'] + ":" + pathlist
251 except KeyError: 253 except KeyError:
252 self.paths = "/bin:/usr/bin:/usr/sbin:/sbin/" 254 self.paths = pathlist
253 255
254 if native_sysroot: 256 if native_sysroot:
255 for path in self.paths.split(':'): 257 for path in pathlist.split(':'):
256 self.paths = "%s%s:%s" % (native_sysroot, path, self.paths) 258 self.paths = "%s%s:%s" % (native_sysroot, path, self.paths)
257 259
258 self.parted = find_executable("parted", self.paths) 260 self.parted = find_executable("parted", self.paths)