summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>2015-06-16 16:18:27 +0530
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-23 11:47:14 +0100
commit8b1bc367be6ecaf4bc9c59c3abe6483878546110 (patch)
tree836e7a4b117169933e3edaf8739f40100c3f3daa
parent3739d36068ad4e07afbf4ebfa48a98a8e3c23075 (diff)
downloadpoky-8b1bc367be6ecaf4bc9c59c3abe6483878546110.tar.gz
runqemu: fix MACHINE being detected as qemuarm for qemuarm64 kernel image
Basically, runqemu script autodetects MACHINE type based on the kernel image name; if MACHINE name is not specified. Since 'qemuarm' string is common in both qemuarm amnd qemuarm64 kernel image names, the MACHINE type is considered as 'qemuarm' even when qemuarm64 kernel image name is given in command line. (From OE-Core rev: 388b243668a5c28fb69b760ce9be5adbc85352d8) Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/runqemu4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 84ece4d7e4..09c507dc7a 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -232,13 +232,13 @@ fi
232 232
233if [ -z "$MACHINE" ]; then 233if [ -z "$MACHINE" ]; then
234 if [ "x$FSTYPE" = "xvmdk" ]; then 234 if [ "x$FSTYPE" = "xvmdk" ]; then
235 MACHINE=`basename $VM | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'` 235 MACHINE=`basename $VM | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
236 if [ -z "$MACHINE" ]; then 236 if [ -z "$MACHINE" ]; then
237 error "Unable to set MACHINE from vmdk filename [$VM]" 237 error "Unable to set MACHINE from vmdk filename [$VM]"
238 fi 238 fi
239 echo "Set MACHINE to [$MACHINE] based on vmdk [$VM]" 239 echo "Set MACHINE to [$MACHINE] based on vmdk [$VM]"
240 else 240 else
241 MACHINE=`basename $KERNEL | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'` 241 MACHINE=`basename $KERNEL | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
242 if [ -z "$MACHINE" ]; then 242 if [ -z "$MACHINE" ]; then
243 error "Unable to set MACHINE from kernel filename [$KERNEL]" 243 error "Unable to set MACHINE from kernel filename [$KERNEL]"
244 fi 244 fi