summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Bourque <wbourque@gmail.com>2019-02-11 15:00:48 -0500
committerArmin Kuster <akuster808@gmail.com>2019-04-07 15:09:46 +0530
commitc8331fa157b83a3ed77f77a6e884c7fbc4f1d91b (patch)
treea45c6980d2c5a07ff86ce312757b1e27af341fea
parentb9ccf44edccd31264890fa790d6120fc9e2c0238 (diff)
downloadopenembedded-core-contrib-c8331fa157b83a3ed77f77a6e884c7fbc4f1d91b.tar.gz
openembedded-core-contrib-c8331fa157b83a3ed77f77a6e884c7fbc4f1d91b.tar.bz2
openembedded-core-contrib-c8331fa157b83a3ed77f77a6e884c7fbc4f1d91b.zip
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) 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>
-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 951bf30717..c1270456f5 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -244,8 +244,13 @@ class Disk:
self._psector_size = None
self._ptable_format = None
- # find parted
- self.paths = "/bin:/usr/bin:/usr/sbin:/sbin/"
+ # read paths from $PATH environment variable
+ # if it fails, use hardcoded paths
+ try:
+ self.paths = os.environ['PATH']
+ except KeyError:
+ self.paths = "/bin:/usr/bin:/usr/sbin:/sbin/"
+
if native_sysroot:
for path in self.paths.split(':'):
self.paths = "%s%s:%s" % (native_sysroot, path, self.paths)