[PATCH 0/1] runqemu fix for bug #5617

[PATCH 0/1] runqemu fix for bug #5617

[Scott Garman]

Hi all,

It's been a while since I've submitted a patch, let's see if I can get
this process right the first time. ;)

This is a fix for Yocto bug #5617. Ross Burton wasn't a fan of the image
filename whitelist, and I have to agree - it's not very maintainable. So
when we have to guess the image filename, instead just pick the most
recently modified imgage filename that conforms to our typical naming
conventions, *image*machine.fstype

Scott

The following changes since commit 300760193c6bcfd20f1d4908f912bebd53e86281:

  tcl: fix tclConfig.sh to point to the correct private headers (2013-12-05 16:48:17 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib sgarman/runqemu-imgfn-fix
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgarman/runqemu-imgfn-fix

Scott Garman (1):
  runqemu: remove core-image-* whitelist

 scripts/runqemu | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

-- 
1.8.1.2

[PATCH 1/1] runqemu: remove core-image-* whitelist

[Scott Garman]

Using a whitelist for image names to default to when none are
specified on the command line is no longer desired. Instead,
choose the most recently created image filename that conforms
to typical image naming conventions.

Fixes [YOCTO #5617].

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
 scripts/runqemu | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/scripts/runqemu b/scripts/runqemu
index 619ffb6..9c0a03b 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -399,18 +399,11 @@ findimage() {
 
     # Sort rootfs candidates by modification time - the most
     # recently created one is the one we most likely want to boot.
-    filenames=`ls -t $where/*-image*$machine.$extension 2>/dev/null | xargs`
-    for name in $filenames; do
-        case $name in
-        *core-image-sato* | \
-        *core-image-lsb* | \
-        *core-image-basic* | \
-        *core-image-minimal* )
-            ROOTFS=$name
-            return
-            ;;
-        esac
-    done
+    filename=`ls -t1 $where/*-image*$machine.$extension 2>/dev/null | head -n1`
+    if [ "x$filename" != "x" ]; then
+        ROOTFS=$filename
+        return
+    fi
 
     echo "Couldn't find a $machine rootfs image in $where."
     exit 1
-- 
1.8.1.2

Re: [PATCH 0/1] runqemu fix for bug #5617

[Scott Garman]

Ping reminder on this patch.

Scott

On 12/05/2013 01:57 PM, Scott Garman wrote:
> Hi all,
>
> It's been a while since I've submitted a patch, let's see if I can get
> this process right the first time. ;)
>
> This is a fix for Yocto bug #5617. Ross Burton wasn't a fan of the image
> filename whitelist, and I have to agree - it's not very maintainable. So
> when we have to guess the image filename, instead just pick the most
> recently modified imgage filename that conforms to our typical naming
> conventions, *image*machine.fstype
>
> Scott
>
> The following changes since commit 300760193c6bcfd20f1d4908f912bebd53e86281:
>
>    tcl: fix tclConfig.sh to point to the correct private headers (2013-12-05 16:48:17 +0000)
>
> are available in the git repository at:
>
>    git://git.openembedded.org/openembedded-core-contrib sgarman/runqemu-imgfn-fix
>    http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgarman/runqemu-imgfn-fix
>
> Scott Garman (1):
>    runqemu: remove core-image-* whitelist
>
>   scripts/runqemu | 17 +++++------------
>   1 file changed, 5 insertions(+), 12 deletions(-)
>


-- 
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center

Re: [PATCH 0/1] runqemu fix for bug #5617

[Saul Wold]

On 12/18/2013 09:36 AM, Scott Garman wrote:
> Ping reminder on this patch.
>

I believe it was merged last week, did you update master?

Sau!

> Scott
>
> On 12/05/2013 01:57 PM, Scott Garman wrote:
>> Hi all,
>>
>> It's been a while since I've submitted a patch, let's see if I can get
>> this process right the first time. ;)
>>
>> This is a fix for Yocto bug #5617. Ross Burton wasn't a fan of the image
>> filename whitelist, and I have to agree - it's not very maintainable. So
>> when we have to guess the image filename, instead just pick the most
>> recently modified imgage filename that conforms to our typical naming
>> conventions, *image*machine.fstype
>>
>> Scott
>>
>> The following changes since commit
>> 300760193c6bcfd20f1d4908f912bebd53e86281:
>>
>>    tcl: fix tclConfig.sh to point to the correct private headers
>> (2013-12-05 16:48:17 +0000)
>>
>> are available in the git repository at:
>>
>>    git://git.openembedded.org/openembedded-core-contrib
>> sgarman/runqemu-imgfn-fix
>>
>> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgarman/runqemu-imgfn-fix
>>
>>
>> Scott Garman (1):
>>    runqemu: remove core-image-* whitelist
>>
>>   scripts/runqemu | 17 +++++------------
>>   1 file changed, 5 insertions(+), 12 deletions(-)
>>
>
>

Re: [PATCH 0/1] runqemu fix for bug #5617

[Scott Garman]

On 12/18/2013 09:42 AM, Saul Wold wrote:
> On 12/18/2013 09:36 AM, Scott Garman wrote:
>> Ping reminder on this patch.
>>
>
> I believe it was merged last week, did you update master?

Doh, sorry - I should have checked first. Thanks!

I'll mark the bug as fixed.

Scott

-- 
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center