[OE-core] [PATCH v2][fido 1/4] runqemu: fix MACHINE being detected as qemuarm for qemuarm64 kernel image

[Jagadeesh Krishnanjanappa]

On Tue, Jun 23, 2015 at 4:36 PM, Burton, Ross <ross.burton at intel.com> wrote:

> These were literally just merged into master.
>
> Thanks.


> Ross
>
> On 23 June 2015 at 11:57, Jagadeesh Krishnanjanappa <
> jkrishnanjanappa at mvista.com> wrote:
>
>> ping
>>
>> Regards,
>> Jagadeesh
>>
>> On Tue, Jun 16, 2015 at 4:18 PM, Jagadeesh Krishnanjanappa <
>> jkrishnanjanappa at mvista.com> wrote:
>>
>>> 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.
>>>
>>> Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa at mvista.com>
>>> ---
>>>  scripts/runqemu | 4 ++--
>>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/scripts/runqemu b/scripts/runqemu
>>> index 84ece4d..09c507d 100755
>>> --- a/scripts/runqemu
>>> +++ b/scripts/runqemu
>>> @@ -232,13 +232,13 @@ fi
>>>
>>>  if [ -z "$MACHINE" ]; then
>>>      if [ "x$FSTYPE" = "xvmdk" ]; then
>>> -        MACHINE=`basename $VM | sed -n
>>> 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
>>> +        MACHINE=`basename $VM | sed -n
>>> 's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
>>>          if [ -z "$MACHINE" ]; then
>>>              error "Unable to set MACHINE from vmdk filename [$VM]"
>>>          fi
>>>          echo "Set MACHINE to [$MACHINE] based on vmdk [$VM]"
>>>      else
>>> -        MACHINE=`basename $KERNEL | sed -n
>>> 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
>>> +        MACHINE=`basename $KERNEL | sed -n
>>> 's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
>>>          if [ -z "$MACHINE" ]; then
>>>              error "Unable to set MACHINE from kernel filename [$KERNEL]"
>>>          fi
>>> --
>>> 1.9.1
>>>
>>>
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>
>>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20150624/3ba7c4e4/attachment-0002.html>