[PATCH v2 03/17] Revert "wic: Work around mcopy error"

[Henning Schild <henning.schild@siemens.com>]

This reverts commit b1511ec6f7bbbb3b872274cdb7320c7d6b868e2c.

Again a workaround for a tool-problem that debian has. Again it can be
fixed outside wic. The environment variable MTOOLS_SKIP_CHECK=1 will be
reintroduced by a later patch for all of wic.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 scripts/lib/wic/partition.py                         | 5 ++---
 scripts/lib/wic/plugins/source/bootimg-efi.py        | 5 ++---
 scripts/lib/wic/plugins/source/bootimg-pcbios.py     | 5 ++---
 scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 5 ++---
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 26be958..34130d8 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -301,9 +301,8 @@ class Partition():
                                                        rootfs, rootfs_size)
         exec_cmd(dosfs_cmd)
 
-        mcopy_cmd = "env MTOOLS_SKIP_CHECK=1 mcopy -i %s -s %s/* ::/" % \
-                    (rootfs, rootfs_dir)
-        exec_cmd(mcopy_cmd, True)
+        mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (rootfs, rootfs_dir)
+        exec_native_cmd(mcopy_cmd, native_sysroot)
 
         chmod_cmd = "chmod 644 %s" % rootfs
         exec_cmd(chmod_cmd)
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index f631e3f..823a536 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -240,9 +240,8 @@ class BootimgEFIPlugin(SourcePlugin):
         dosfs_cmd = "mkdosfs -n efi -C %s %d" % (bootimg, blocks)
         exec_cmd(dosfs_cmd)
 
-        mcopy_cmd = "env MTOOLS_SKIP_CHECK=1 mcopy -i %s -s %s/* ::/" % \
-                    (bootimg, hdddir)
-        exec_cmd(mcopy_cmd, True)
+        mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir)
+        exec_cmd(mcopy_cmd)
 
         chmod_cmd = "chmod 644 %s" % bootimg
         exec_cmd(chmod_cmd)
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index 61c3837..b029c2f 100644
--- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
@@ -188,9 +188,8 @@ class BootimgPcbiosPlugin(SourcePlugin):
         dosfs_cmd = "mkdosfs -n boot -S 512 -C %s %d" % (bootimg, blocks)
         exec_cmd(dosfs_cmd)
 
-        mcopy_cmd = "env MTOOLS_SKIP_CHECK=1 mcopy -i %s -s %s/* ::/" % \
-                    (bootimg, hdddir)
-        exec_cmd(mcopy_cmd, True)
+        mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir)
+        exec_cmd(mcopy_cmd)
 
         syslinux_cmd = "syslinux %s" % bootimg
         exec_cmd(syslinux_cmd)
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
index 68d2402..dcb6434 100644
--- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
+++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
@@ -402,10 +402,9 @@ class IsoImagePlugin(SourcePlugin):
             mmd_cmd = "mmd -i %s ::/EFI" % bootimg
             exec_cmd(mmd_cmd)
 
-            mcopy_cmd = "env MTOOLS_SKIP_CHECK=1 " \
-                        "mcopy -i %s -s %s/EFI/* ::/EFI/" \
+            mcopy_cmd = "mcopy -i %s -s %s/EFI/* ::/EFI/" \
                         % (bootimg, isodir)
-            exec_cmd(mcopy_cmd, True)
+            exec_cmd(mcopy_cmd)
 
             chmod_cmd = "chmod 644 %s" % bootimg
             exec_cmd(chmod_cmd)
-- 
2.16.1