diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-11-24 15:22:49 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-01 21:32:02 +0000 |
commit | 67af6d640203433116a9c1e39fd46da02005130f (patch) | |
tree | 660ce52ea39c797457a1e267dda5419842ae7a39 /scripts/lib/wic/kickstart/custom_commands | |
parent | 8ffba255a84de4e4ade13ae0d3c66c3a585284e9 (diff) | |
download | poky-67af6d640203433116a9c1e39fd46da02005130f.tar.gz |
wic: exec_native_cmd: implement support for pseudo
Wic runs some tools through pseudo, which makes exec_native_cmd
to fail and throw cryptic error message when tool is not baked:
For example:
Error: exec_cmd: 'export
PSEUDO_PREFIX=/media/ssd/poky-build/tmp/sysroots/x86_64-linux/usr;export
PSEUDO_LOCALSTATEDIR=/media/ssd/poky-build/tmp/work/qemux86-poky-linux/
...
PSEUDO_PASSWD=/media/ssd/poky-build/tmp/work/qemux86-poky-linux/ ...
PSEUDO_NOSYMLINKEXP=1;/media/ssd/poky-build/tmp/sysroots/ ...
mkfs.ext4 -F -i 8192 /var/tmp/wic/build/rootfs_platform.7.ext4 -L
platform -d
/media/ssd/poky-build/tmp/work/qemux86-poky-linux/core-image-minimal/...
returned '1' instead of 0
Made exec_native_cmd aware of pseudo and properly report
errors when command is not found.
(From OE-Core rev: 04bab58809c63c9114feb0aadc9b6115be10fcc4)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/kickstart/custom_commands')
-rw-r--r-- | scripts/lib/wic/kickstart/custom_commands/partition.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py b/scripts/lib/wic/kickstart/custom_commands/partition.py index eee25a493d..babc006945 100644 --- a/scripts/lib/wic/kickstart/custom_commands/partition.py +++ b/scripts/lib/wic/kickstart/custom_commands/partition.py | |||
@@ -297,7 +297,7 @@ class Wic_PartData(FC4_PartData): | |||
297 | 297 | ||
298 | mkfs_cmd = "mkfs.%s -F %s %s %s -d %s" % \ | 298 | mkfs_cmd = "mkfs.%s -F %s %s %s -d %s" % \ |
299 | (self.fstype, extra_imagecmd, rootfs, label_str, rootfs_dir) | 299 | (self.fstype, extra_imagecmd, rootfs, label_str, rootfs_dir) |
300 | exec_native_cmd(pseudo + mkfs_cmd, native_sysroot) | 300 | exec_native_cmd(mkfs_cmd, native_sysroot, pseudo=pseudo) |
301 | 301 | ||
302 | def prepare_rootfs_btrfs(self, rootfs, oe_builddir, rootfs_dir, | 302 | def prepare_rootfs_btrfs(self, rootfs, oe_builddir, rootfs_dir, |
303 | native_sysroot, pseudo): | 303 | native_sysroot, pseudo): |
@@ -330,7 +330,7 @@ class Wic_PartData(FC4_PartData): | |||
330 | 330 | ||
331 | mkfs_cmd = "mkfs.%s -b %d -r %s %s %s" % \ | 331 | mkfs_cmd = "mkfs.%s -b %d -r %s %s %s" % \ |
332 | (self.fstype, rootfs_size * 1024, rootfs_dir, label_str, rootfs) | 332 | (self.fstype, rootfs_size * 1024, rootfs_dir, label_str, rootfs) |
333 | exec_native_cmd(pseudo + mkfs_cmd, native_sysroot) | 333 | exec_native_cmd(mkfs_cmd, native_sysroot, pseudo=pseudo) |
334 | 334 | ||
335 | def prepare_rootfs_vfat(self, rootfs, oe_builddir, rootfs_dir, | 335 | def prepare_rootfs_vfat(self, rootfs, oe_builddir, rootfs_dir, |
336 | native_sysroot, pseudo): | 336 | native_sysroot, pseudo): |
@@ -378,7 +378,7 @@ class Wic_PartData(FC4_PartData): | |||
378 | """ | 378 | """ |
379 | squashfs_cmd = "mksquashfs %s %s -noappend" % \ | 379 | squashfs_cmd = "mksquashfs %s %s -noappend" % \ |
380 | (rootfs_dir, rootfs) | 380 | (rootfs_dir, rootfs) |
381 | exec_native_cmd(pseudo + squashfs_cmd, native_sysroot) | 381 | exec_native_cmd(squashfs_cmd, native_sysroot, pseudo=pseudo) |
382 | 382 | ||
383 | def prepare_empty_partition_ext(self, rootfs, oe_builddir, | 383 | def prepare_empty_partition_ext(self, rootfs, oe_builddir, |
384 | native_sysroot): | 384 | native_sysroot): |