diff options
author | Paul Barker <pbarker@konsulko.com> | 2021-01-11 10:32:44 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-03 14:13:54 +0000 |
commit | 9cc3117aef8622b3c26d4fb5599f229d73204d2a (patch) | |
tree | 246fb7e4c732da154be93adb4f17c5eb761b7420 | |
parent | 7655375e15cdf31c2017efb9de8543f35cb1cbff (diff) | |
download | poky-9cc3117aef8622b3c26d4fb5599f229d73204d2a.tar.gz |
wic: Allow exec_native_cmd to run HOSTTOOLS
This allows programs from HOSTTOOLS (e.g. 'install', 'rm', 'mv', etc) to
be more easily executed by wic. Without this change only programs from
an actual *-native recipe built by bitbake can be executed by wic.
(From OE-Core rev: 7acb39f02b8160600d1508da114e98dd1c3e76ed)
Signed-off-by: Paul Barker <pbarker@konsulko.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 8eb186acdecfbb3151c9a0ab148358e3fe5cce39)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/image_types_wic.bbclass | 2 | ||||
-rw-r--r-- | scripts/lib/wic/misc.py | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index f27f29c663..640603f5fa 100644 --- a/meta/classes/image_types_wic.bbclass +++ b/meta/classes/image_types_wic.bbclass | |||
@@ -3,7 +3,7 @@ | |||
3 | WICVARS ?= "\ | 3 | WICVARS ?= "\ |
4 | BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME IMAGE_BOOT_FILES \ | 4 | BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME IMAGE_BOOT_FILES \ |
5 | IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \ | 5 | IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \ |
6 | ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS \ | 6 | ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS HOSTTOOLS_DIR \ |
7 | KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE INITRAMFS_LINK_NAME APPEND \ | 7 | KERNEL_IMAGETYPE MACHINE INITRAMFS_IMAGE INITRAMFS_IMAGE_BUNDLE INITRAMFS_LINK_NAME APPEND \ |
8 | ASSUME_PROVIDED PSEUDO_IGNORE_PATHS" | 8 | ASSUME_PROVIDED PSEUDO_IGNORE_PATHS" |
9 | 9 | ||
diff --git a/scripts/lib/wic/misc.py b/scripts/lib/wic/misc.py index fe4abe8115..e4b5a0d519 100644 --- a/scripts/lib/wic/misc.py +++ b/scripts/lib/wic/misc.py | |||
@@ -128,9 +128,12 @@ def exec_native_cmd(cmd_and_args, native_sysroot, pseudo=""): | |||
128 | if pseudo: | 128 | if pseudo: |
129 | cmd_and_args = pseudo + cmd_and_args | 129 | cmd_and_args = pseudo + cmd_and_args |
130 | 130 | ||
131 | native_paths = "%s/sbin:%s/usr/sbin:%s/usr/bin:%s/bin" % \ | 131 | hosttools_dir = get_bitbake_var("HOSTTOOLS_DIR") |
132 | |||
133 | native_paths = "%s/sbin:%s/usr/sbin:%s/usr/bin:%s/bin:%s" % \ | ||
132 | (native_sysroot, native_sysroot, | 134 | (native_sysroot, native_sysroot, |
133 | native_sysroot, native_sysroot) | 135 | native_sysroot, native_sysroot, |
136 | hosttools_dir) | ||
134 | 137 | ||
135 | native_cmd_and_args = "export PATH=%s:$PATH;%s" % \ | 138 | native_cmd_and_args = "export PATH=%s:$PATH;%s" % \ |
136 | (native_paths, cmd_and_args) | 139 | (native_paths, cmd_and_args) |