From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6543937367387930624 X-Received: by 10.80.204.5 with SMTP id m5mr5201570edi.12.1523629149259; Fri, 13 Apr 2018 07:19:09 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.80.214.21 with SMTP id x21ls4404582edi.7.gmail; Fri, 13 Apr 2018 07:19:08 -0700 (PDT) X-Google-Smtp-Source: AIpwx49l6L/ehjyv/FCh/s7mUQoX/SLCtlPZV+CJNAUgMtHb7JGsWf3RBd25n1UEtCvfqIU+3ZNR X-Received: by 10.80.245.249 with SMTP id x54mr5200761edm.3.1523629148867; Fri, 13 Apr 2018 07:19:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523629148; cv=none; d=google.com; s=arc-20160816; b=mvrP6ajKYQHay2Mc70zfLPXPZ+TbDo2qEUs4CoZ5T+yQdPU3TzXmiC2Q/gJV85Wk8B qXhlVZoadT9+iMhihLba2p+XwPLsDWr9yKHvtb26sTI1nKx8nF821nfRx1HVfrKNSL4r wFHAioflZWzzcQKVTP25RDaadNQ6GaUBK32As3o+qZi9onISNlTNHh2bDYZpBobcJCoU lTEGpGnKExo45KHtNfKKgfj139qIEzP1LOi0S40kRxSM7zrdjYJ9AVXULXjKgOZyfG5d wkQeGEykZie+BcUnurPFIADja6a+hqozHgnbweeeZqcstSdwzYYx9Ffq2PT6s5U6PKNC bgMg== 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=Qrd94vDlyXTCqRAuP6xIfNDAVUz5LcTFLOS8APzKK1U=; b=dzOOGHyAUuTMueRpEs0/IViM6ZPlXhz+GyECbSzEcUCtnYUqSsh6XdhTmqeO0nKGav hFlxgpfAK+WkEgB++REVjWgyKMNL1YOateG2JRugOgoe7SnGUJYZcC5gYv1+pqAFdReI lA3sR+ctkTSyj5x68NT7ssyi+xarApyFBoPHbIrPWWKilvsFKlRGmgQmRPcsZzGTP3HH AwPQQpwrLlhQMPTg7f4CQO/ZnZsCLjEbnMqMkC7/SgwbH1m6nGze8h0Hxp/EaECMhiBW j0KyKrcoWhY1T1/zG0ZK79ol7r7GB/HheTBUTv8POzqwCFxy8E37D45YHyfpAImZrzs2 w2VQ== 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 e12si50229edi.4.2018.04.13.07.19.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Apr 2018 07:19:08 -0700 (PDT) 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 mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w3DEJ8gE005510 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 Apr 2018 16:19:08 +0200 Received: from md1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40] (may be forged)) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w3DEJ8Vt011006; Fri, 13 Apr 2018 16:19:08 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Cedric Hombourger , Andreas Reichel , Henning Schild Subject: [PATCH v2 03/17] Revert "wic: Work around mcopy error" Date: Fri, 13 Apr 2018 16:18:52 +0200 Message-Id: <0345639bc2abff770fc70e080dbc494b8f802f11.1523628814.git.henning.schild@siemens.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: References: In-Reply-To: References: X-TUID: H+3jzVdJCnbn 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 --- 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