Skip to contentSkip to conversation

runqemu fix for bug #5617

PATCH In review Scott Garman 2 participants 5 messages Dec 5, 2013 – Dec 18, 2013

lore
Share & tools
lore
#0 lore raw

cover runqemu fix for bug #5617

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(-)
Signature · 1 line
1.8.1.2
#1 lore raw

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

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].

---
 scripts/runqemu | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)
scripts/runqemu +5 -12
index 619ffb6..9c0a03b 100755
@@ -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
Signature · 1 line
1.8.1.2
#2 lore raw
In reply to Scott Garman

Ping reminder on this patch.

Scott

Quoted 28 lines · 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(-)
Signature · 3 lines
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center
#3 lore raw
Quoted 2 lines · Scott Garman

Ping reminder on this patch.

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

Sau!

Quoted 38 lines

Scott

Quoted 33 lines · 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(-)
#4 lore raw
Quoted 5 lines · Saul Wold
Quoted 2 lines · Scott Garman

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

Signature · 3 lines
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center