All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ed Bartosh <ed.bartosh@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [wic][PATCH 04/15] runqemu: support path/to/<image>-<machine>.wic
Date: Tue,  2 Feb 2016 09:27:56 +0200	[thread overview]
Message-ID: <1b141cf9dbce801fbb635c692a254ba62b7cfeca.1454397260.git.ed.bartosh@linux.intel.com> (raw)
In-Reply-To: <cover.1454397260.git.ed.bartosh@linux.intel.com>
In-Reply-To: <cover.1454397260.git.ed.bartosh@linux.intel.com>

Supported providing wic image path to runqemu:
  runquemu path/to/<image>-<machine>.wic

[YOCTO #8691]

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
 scripts/runqemu | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/runqemu b/scripts/runqemu
index 0830901..48b7551 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -47,6 +47,7 @@ usage() {
     echo "  $MYNAME qemux86 qemuparams=\"-m 256\""
     echo "  $MYNAME qemux86 bootparams=\"psplash=false\""
     echo "  $MYNAME path/to/<image>-<machine>.vmdk"
+    echo "  $MYNAME path/to/<image>-<machine>.wic"
     exit 1
 }
 
@@ -88,7 +89,7 @@ process_filename() {
 		[ -z "$KERNEL" ] && KERNEL=$filename || \
 		    error "conflicting KERNEL args [$KERNEL] and [$filename]"
 		;;
-	/ext[234]/|/jffs2/|/btrfs/)
+	/ext[234]/|/jffs2/|/btrfs/|/wic/)
 		# A file ending in a supportted fs type is a rootfs image
 		if [ -z "$FSTYPE" -o "$FSTYPE" = "$EXT" ]; then
 		    FSTYPE=$EXT
@@ -235,7 +236,7 @@ elif [ ! -w /dev/net/tun ] ; then
 fi
 
 # Report errors for missing combinations of options
-if [ -z "$MACHINE" -a -z "$KERNEL" -a -z "$VM" ]; then
+if [ -z "$MACHINE" -a -z "$KERNEL" -a -z "$VM" -a "$FSTYPE" != "wic" ]; then
     error "you must specify at least a MACHINE, VM, or KERNEL argument"
 fi
 if [ "$FSTYPE" = "nfs" -a -z "$ROOTFS" ]; then
@@ -243,8 +244,9 @@ if [ "$FSTYPE" = "nfs" -a -z "$ROOTFS" ]; then
 fi
 
 if [ -z "$MACHINE" ]; then
-    if [ "x$FSTYPE" = "xvmdk" ] || [ "x$FSTYPE" = "xhddimg" ] || [ "x$FSTYPE" = "xhdddirect" ]; then
-        MACHINE=`basename $VM | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
+    if [ "x$FSTYPE" = "xvmdk" ] || [ "x$FSTYPE" = "xhddimg" ] || [ "x$FSTYPE" = "xhdddirect" ] || [ "x$FSTYPE" = "xwic" ]; then
+        [ "x$FSTYPE" = "xwic" ] && filename=$ROOTFS || filename=$VM
+        MACHINE=`basename $filename | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
         if [ -z "$MACHINE" ]; then
             error "Unable to set MACHINE from image filename [$VM]"
         fi
-- 
2.1.4



  parent reply	other threads:[~2016-02-02  9:38 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-02  7:27 [wic][PATCH 00/15] Support for wic images in runqemu and oe-selftest Ed Bartosh
2016-02-02  7:27 ` [wic][PATCH 01/15] runqemu: add support for wic images Ed Bartosh
2016-02-02  7:27 ` [wic][PATCH 02/15] runqemu: don't use virtio " Ed Bartosh
2016-02-02 14:50   ` Richard Purdie
2016-02-02 12:55     ` Ed Bartosh
2016-02-02 15:12       ` Burton, Ross
2016-02-02 15:57       ` Richard Purdie
2016-02-02 14:04         ` Ed Bartosh
2016-02-02  7:27 ` [wic][PATCH 03/15] runqemu: don't set KERNEL " Ed Bartosh
2016-02-02  7:27 ` Ed Bartosh [this message]
2016-02-02  7:27 ` [wic][PATCH 05/15] oe-selftest: remove unused parameter Ed Bartosh
2016-02-02  7:27 ` [wic][PATCH 06/15] qemurunner: add parameter to method 'start' Ed Bartosh
2016-02-02  7:27 ` [wic][PATCH 07/15] oeqa/targetcontrol: make ssh control optional Ed Bartosh
2016-02-02  7:28 ` [wic][PATCH 08/15] oeqa/targetcontrol: support wic image type Ed Bartosh
2016-02-02  7:28 ` [wic][PATCH 09/15] wic-image-minimal: change IMAGE_FSTYPES Ed Bartosh
2016-02-02  7:28 ` [wic][PATCH 10/15] wic-image-minimal: updated .wks to boot by qemu Ed Bartosh
2016-02-02  7:28 ` [wic][PATCH 11/15] oe-selftest: add new wic testcase Ed Bartosh
2016-02-02  7:28 ` [wic][PATCH 12/15] wic: fix processing of --use-uuid Ed Bartosh
2016-02-02  7:28 ` [wic][PATCH 13/15] wic-image-minimal: use uuid for root partition Ed Bartosh
2016-02-02  7:28 ` [wic][PATCH 14/15] oe-selftest: pylinted wic tests Ed Bartosh
2016-02-02  7:28 ` [wic][PATCH 15/15] oe-selftest: don't use specific tasks Ed Bartosh

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1b141cf9dbce801fbb635c692a254ba62b7cfeca.1454397260.git.ed.bartosh@linux.intel.com \
    --to=ed.bartosh@linux.intel.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.