summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/utils
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-02-21 11:37:17 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-04 23:18:17 +0000
commit6d5dd6e560fa95c4237b788f25d4bd20f5927160 (patch)
tree88178cd7b609555ace1376a31ea93d87fe76725d /scripts/lib/wic/utils
parentc4b96817e5869e5381ec2e6a62bfdaf066559525 (diff)
downloadpoky-6d5dd6e560fa95c4237b788f25d4bd20f5927160.tar.gz
wic: use 2 sysroots to find native executable
Currently there is no way to specify a dependency on native tools for wic without modifying wic-tools recipe. Obvious way to make it more flexible is to use image sysroot and wic-tools together to find an executable. Modified run_native_cmd to use image and wic-tools sysroots to find native executable. [YOCTO #11017] (From OE-Core rev: 06f976cb7c593ab14ee221365d9afbaf9de94a91) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/utils')
-rw-r--r--scripts/lib/wic/utils/misc.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/lib/wic/utils/misc.py b/scripts/lib/wic/utils/misc.py
index 4b822f0eee..3bab2f1ea2 100644
--- a/scripts/lib/wic/utils/misc.py
+++ b/scripts/lib/wic/utils/misc.py
@@ -105,9 +105,13 @@ def exec_native_cmd(cmd_and_args, native_sysroot, catch=3, pseudo=""):
105 105
106 if pseudo: 106 if pseudo:
107 cmd_and_args = pseudo + cmd_and_args 107 cmd_and_args = pseudo + cmd_and_args
108
109 wtools_sysroot = get_bitbake_var("RECIPE_SYSROOT_NATIVE", "wic-tools")
110
108 native_paths = \ 111 native_paths = \
109 "%s/sbin:%s/usr/sbin:%s/usr/bin" % \ 112 "%s/sbin:%s/usr/sbin:%s/usr/bin:%s/sbin:%s/usr/sbin:%s/usr/bin" % \
110 (native_sysroot, native_sysroot, native_sysroot) 113 (wtools_sysroot, wtools_sysroot, wtools_sysroot,
114 native_sysroot, native_sysroot, native_sysroot)
111 native_cmd_and_args = "export PATH=%s:$PATH;%s" % \ 115 native_cmd_and_args = "export PATH=%s:$PATH;%s" % \
112 (native_paths, cmd_and_args) 116 (native_paths, cmd_and_args)
113 logger.debug("exec_native_cmd: %s", cmd_and_args) 117 logger.debug("exec_native_cmd: %s", cmd_and_args)