summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorWilliam Bourque <wbourque@gmail.com>2019-02-11 15:00:48 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-25 22:27:40 +0000
commitb55c0d0a173b2495d11c273203f0ee3a0cae1cb1 (patch)
tree1b293166de61018c6165638dba2ebc51e09dd85c /scripts
parent11e09611df3dcd4968ea7d84cf2929ac33ebdf26 (diff)
downloadpoky-b55c0d0a173b2495d11c273203f0ee3a0cae1cb1.tar.gz
wic/engine.py: Load paths from PATH environment variable
Load self.paths from environment variable and if it fails, fall back to hardcoded list. This is required for users that would need to load different e2fsprogs binaries if their system's ones are not recent enought (From OE-Core rev: a88bcbae850a2e6d182291d3f8e167aabdbe4842) (From OE-Core rev: 319ee1bb146b91f78d7a141def2b1cf92cf88887) Signed-off-by: William Bourque <wbourque@gmail.com> 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>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/engine.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index 97f5e848cc..880e464036 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -244,8 +244,13 @@ 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 self.paths = "/bin:/usr/bin:/usr/sbin:/sbin/" 248 # if it fails, use hardcoded paths
249 try:
250 self.paths = os.environ['PATH']
251 except KeyError:
252 self.paths = "/bin:/usr/bin:/usr/sbin:/sbin/"
253
249 if native_sysroot: 254 if native_sysroot:
250 for path in self.paths.split(':'): 255 for path in self.paths.split(':'):
251 self.paths = "%s%s:%s" % (native_sysroot, path, self.paths) 256 self.paths = "%s%s:%s" % (native_sysroot, path, self.paths)