From: Jonathan Liu <net147@gmail.com>
Date: Thu, 8 Jun 2017 11:07:54 +0000 (+1000)
Subject: image-vm: Avoid use of fold, tac and paste commands for DISK_SIGNATURE
X-Git-Tag: uninative-1.7~577
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=a58e53f55259acd79a98a0f8b8a435d2a5aef36e;p=openembedded-core.git

image-vm: Avoid use of fold, tac and paste commands for DISK_SIGNATURE

These commands are not whitelisted by the HOSTTOOLS variable which
silently prevents the MBR disk signature from being written to the
image.

Reported-by: Michael Davis <michael.davis@essvote.com>
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/classes/image-vm.bbclass b/meta/classes/image-vm.bbclass
index 35c9244e9b..98bd92000e 100644
--- a/meta/classes/image-vm.bbclass
+++ b/meta/classes/image-vm.bbclass
@@ -93,7 +93,7 @@ build_boot_dd() {
 
 	parted $IMAGE print
 
-	awk "BEGIN { printf \"$(echo ${DISK_SIGNATURE} | fold -w 2 | tac | paste -sd '' | sed 's/\(..\)/\\x&/g')\" }" | \
+	awk "BEGIN { printf \"$(echo ${DISK_SIGNATURE} | sed 's/\(..\)\(..\)\(..\)\(..\)/\\x\4\\x\3\\x\2\\x\1/')\" }" | \
 		dd of=$IMAGE bs=1 seek=440 conv=notrunc
 
 	OFFSET=`expr $END2 / 512`