Skip to contentSkip to conversation

wic: misc.py: Added more mtools binaries

PATCH New Saul Wold 1 participant 2 messages Oct 23, 2017

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

PATCH 1/2 wic: misc.py: Added more mtools binaries

This fixes the issue that if you don't have mtools installed on the host thus causing host contamination, that the correct binaries would be selected from the native sysroot.

[YOCTO #12173]

Signed-off-by Saul Wold <[email protected]>
---
 scripts/lib/wic/misc.py | 3 +++
 1 file changed, 3 insertions(+)
scripts/lib/wic/misc.py +3 -0
index 0792480f869..cc28c95fda5 100644
@@ -43,6 +43,9 @@ NATIVE_RECIPES = {"bmaptool": "bmap-tools",
                   "grub-mkimage": "grub-efi",
                   "isohybrid": "syslinux",
                   "mcopy": "mtools",
+                  "mdel" : "mtools",
+                  "mdeltree" : "mtools",
+                  "mdir" : "mtools",
                   "mkdosfs": "dosfstools",
                   "mkisofs": "cdrtools",
                   "mkfs.btrfs": "btrfs-tools",
Signature · 1 line
2.13.5
author
#1 lore raw

PATCH 2/2 wic: misc.py: Use mmd from mtools instead of syslinux

mtools already provides a suite of msdos utilities, switch to this one also. This could allow for future changes to reduce wic's dependecies.

Signed-off-by Saul Wold <[email protected]>
---
 scripts/lib/wic/misc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/lib/wic/misc.py +1 -1
index cc28c95fda5..ee888b478cc 100644
@@ -55,7 +55,7 @@ NATIVE_RECIPES = {"bmaptool": "bmap-tools",
                   "mkfs.vfat": "dosfstools",
                   "mksquashfs": "squashfs-tools",
                   "mkswap": "util-linux",
-                  "mmd": "syslinux",
+                  "mmd": "mtools",
                   "parted": "parted",
                   "sfdisk": "util-linux",
                   "sgdisk": "gptfdisk",
Signature · 1 line
2.13.5