diff options
Diffstat (limited to 'scripts/lib/wic/misc.py')
-rw-r--r-- | scripts/lib/wic/misc.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/scripts/lib/wic/misc.py b/scripts/lib/wic/misc.py index 57c042c503..1a7c140fa6 100644 --- a/scripts/lib/wic/misc.py +++ b/scripts/lib/wic/misc.py | |||
@@ -16,16 +16,16 @@ import logging | |||
16 | import os | 16 | import os |
17 | import re | 17 | import re |
18 | import subprocess | 18 | import subprocess |
19 | import shutil | ||
19 | 20 | ||
20 | from collections import defaultdict | 21 | from collections import defaultdict |
21 | from distutils import spawn | ||
22 | 22 | ||
23 | from wic import WicError | 23 | from wic import WicError |
24 | 24 | ||
25 | logger = logging.getLogger('wic') | 25 | logger = logging.getLogger('wic') |
26 | 26 | ||
27 | # executable -> recipe pairs for exec_native_cmd | 27 | # executable -> recipe pairs for exec_native_cmd |
28 | NATIVE_RECIPES = {"bmaptool": "bmap-tools", | 28 | NATIVE_RECIPES = {"bmaptool": "bmaptool", |
29 | "dumpe2fs": "e2fsprogs", | 29 | "dumpe2fs": "e2fsprogs", |
30 | "grub-mkimage": "grub-efi", | 30 | "grub-mkimage": "grub-efi", |
31 | "isohybrid": "syslinux", | 31 | "isohybrid": "syslinux", |
@@ -36,6 +36,7 @@ NATIVE_RECIPES = {"bmaptool": "bmap-tools", | |||
36 | "mkdosfs": "dosfstools", | 36 | "mkdosfs": "dosfstools", |
37 | "mkisofs": "cdrtools", | 37 | "mkisofs": "cdrtools", |
38 | "mkfs.btrfs": "btrfs-tools", | 38 | "mkfs.btrfs": "btrfs-tools", |
39 | "mkfs.erofs": "erofs-utils", | ||
39 | "mkfs.ext2": "e2fsprogs", | 40 | "mkfs.ext2": "e2fsprogs", |
40 | "mkfs.ext3": "e2fsprogs", | 41 | "mkfs.ext3": "e2fsprogs", |
41 | "mkfs.ext4": "e2fsprogs", | 42 | "mkfs.ext4": "e2fsprogs", |
@@ -122,7 +123,7 @@ def find_executable(cmd, paths): | |||
122 | if provided and "%s-native" % recipe in provided: | 123 | if provided and "%s-native" % recipe in provided: |
123 | return True | 124 | return True |
124 | 125 | ||
125 | return spawn.find_executable(cmd, paths) | 126 | return shutil.which(cmd, path=paths) |
126 | 127 | ||
127 | def exec_native_cmd(cmd_and_args, native_sysroot, pseudo=""): | 128 | def exec_native_cmd(cmd_and_args, native_sysroot, pseudo=""): |
128 | """ | 129 | """ |
@@ -140,11 +141,12 @@ def exec_native_cmd(cmd_and_args, native_sysroot, pseudo=""): | |||
140 | cmd_and_args = pseudo + cmd_and_args | 141 | cmd_and_args = pseudo + cmd_and_args |
141 | 142 | ||
142 | hosttools_dir = get_bitbake_var("HOSTTOOLS_DIR") | 143 | hosttools_dir = get_bitbake_var("HOSTTOOLS_DIR") |
144 | target_sys = get_bitbake_var("TARGET_SYS") | ||
143 | 145 | ||
144 | native_paths = "%s/sbin:%s/usr/sbin:%s/usr/bin:%s/bin:%s" % \ | 146 | native_paths = "%s/sbin:%s/usr/sbin:%s/usr/bin:%s/usr/bin/%s:%s/bin:%s" % \ |
145 | (native_sysroot, native_sysroot, | 147 | (native_sysroot, native_sysroot, |
146 | native_sysroot, native_sysroot, | 148 | native_sysroot, native_sysroot, target_sys, |
147 | hosttools_dir) | 149 | native_sysroot, hosttools_dir) |
148 | 150 | ||
149 | native_cmd_and_args = "export PATH=%s:$PATH;%s" % \ | 151 | native_cmd_and_args = "export PATH=%s:$PATH;%s" % \ |
150 | (native_paths, cmd_and_args) | 152 | (native_paths, cmd_and_args) |