diff options
author | Ross Burton <ross.burton@arm.com> | 2022-08-25 14:37:50 +0100 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2022-08-31 04:16:07 -1000 |
commit | f8e0512503410ca5137fcf114fbffb52aa98be07 (patch) | |
tree | 2174598b0a3bda7f5752a4f4d6e35cee8b147418 /scripts | |
parent | ebdc76b3c29fd4915bee39026f780172fdf8fa1a (diff) | |
download | openembedded-core-contrib-f8e0512503410ca5137fcf114fbffb52aa98be07.tar.gz |
wic: add target tools to PATH when executing native commands
We might want to run a cross tool, such as objcopy, in wic. These are
in a TARGET_SYS/ subdirectory under /usr/bin, so add that directory to
the search path too.
(From OE-Core rev: c523549141e5c31edc75281f581d97867b7d251d)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/lib/wic/misc.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/lib/wic/misc.py b/scripts/lib/wic/misc.py index 3e11822996..a8aab6c524 100644 --- a/scripts/lib/wic/misc.py +++ b/scripts/lib/wic/misc.py @@ -140,11 +140,12 @@ def exec_native_cmd(cmd_and_args, native_sysroot, pseudo=""): cmd_and_args = pseudo + cmd_and_args hosttools_dir = get_bitbake_var("HOSTTOOLS_DIR") + target_sys = get_bitbake_var("TARGET_SYS") - native_paths = "%s/sbin:%s/usr/sbin:%s/usr/bin:%s/bin:%s" % \ + native_paths = "%s/sbin:%s/usr/sbin:%s/usr/bin:%s/usr/bin/%s:%s/bin:%s" % \ (native_sysroot, native_sysroot, - native_sysroot, native_sysroot, - hosttools_dir) + native_sysroot, native_sysroot, target_sys, + native_sysroot, hosttools_dir) native_cmd_and_args = "export PATH=%s:$PATH;%s" % \ (native_paths, cmd_and_args) |