From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6517147827419742208 X-Received: by 10.80.134.135 with SMTP id r7mr11864584eda.1.1517391723503; Wed, 31 Jan 2018 01:42:03 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.80.170.50 with SMTP id o47ls2782367edc.3.gmail; Wed, 31 Jan 2018 01:42:03 -0800 (PST) X-Google-Smtp-Source: AH8x226oGTe8vkg08YbPluDshkBDKs5FXrucFpLy9twVojyO6wnGEM495M1c3GlHmJV1UkxICMnk X-Received: by 10.80.146.139 with SMTP id k11mr11909985eda.4.1517391723082; Wed, 31 Jan 2018 01:42:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517391723; cv=none; d=google.com; s=arc-20160816; b=KMF48jRJp51QpFmv/ohcNdigDInScjtYJJOkqWbknzV9+Joth49dDurWjMS8DsvQJX kzLdPtj6fi8s4YFfa3eGZ9hwdKcgAT+JB5pRXV7MmGt18tB8w7/fy1HhoN4pXMjTrMKb nCfHRaqlpmUYT2Qg9vBqRMn4O13g2wDc15jOoDJTHglmdyHKcnPle4k1o7IhyHpYa0ZP jrV6p1+2qjMotaBO3laBjsBPKwQYx8d9jAxfY0vawimttIQIIzECOo37k/7E598g4EO4 88aTqAAUrSCoRWvKe9H7BZzly3Gr2pSq2rOClQLYoHrwSwlJxMG+85gISgP0rycDtIR2 /IAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=0ubuh1PiqYw5+OEa3BvexgrGd/nkicFlthgu2cI4Jmc=; b=wHwi0+UAnA6K53YVSphcgcXiC0M/PxdEvJuaklln6S4W1TtyIwuIyvO8Ep0NePY0Ut HTWk0nVBQQc0zPk7W4E181zQvHNju7jAI6P41gzM2qSW6tw8NvWH2YeHA3HoefbAruwt PpyR7SIXsSj6bx7Q4ZFjGyj+XxSb7z2hm1kXz0HlET2JfDE61QRjOEOg4aUX+qnjOuV6 WmDsZdsgwuu7C/T5jwqcSYEnc/yeqQ21GE6U68iRzYibT7V6AL8bFKJi9uL84BKEgPZ9 AqDAbTTLCFUl2GBa5jwP1L8a/IJv2WPbDIzsr/tYRpRzm3QbhOlx3/T8qAdfZv7ydKeH yyhw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id m19si1701476edd.4.2018.01.31.01.42.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Jan 2018 01:42:03 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w0V9g2xL029651 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 31 Jan 2018 10:42:02 +0100 Received: from md1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40] (may be forged)) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id w0V9g1aa008484; Wed, 31 Jan 2018 10:42:02 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH 6/9] Revert "wic: Work around mcopy error" Date: Wed, 31 Jan 2018 10:41:57 +0100 Message-Id: X-Mailer: git-send-email 2.13.6 In-Reply-To: References: In-Reply-To: References: X-TUID: jSmOA1KysYIJ This reverts commit b1511ec6f7bbbb3b872274cdb7320c7d6b868e2c. --- 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.13.6