| Submitter | Dennis Lan |
|---|---|
| Date | July 11, 2012, 7:05 a.m. |
| Message ID | <1341990302-30459-1-git-send-email-dennis.yxun@gmail.com> |
| Download | mbox | patch |
| Permalink | /patch/31739/ |
| State | New |
| Headers | show |
Comments
On Wed, Jul 11, 2012 at 3:05 PM, Dennis Lan <dennis.yxun@gmail.com> wrote: > Signed-off-by: Dennis Lan <dennis.yxun@gmail.com> > --- > scripts/runqemu | 5 ++++- > scripts/runqemu-internal | 9 +++------ > 2 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/scripts/runqemu b/scripts/runqemu > index 8d149a2..650d1df 100755 > --- a/scripts/runqemu > +++ b/scripts/runqemu > @@ -94,7 +94,7 @@ KVM_ENABLED="no" > while true; do > arg=${1} > case "$arg" in > - "qemux86" | "qemux86-64" | "qemuarm" | "qemumips" | "qemumips64" | "qemush4" | "qemuppc") > + "qemux86" | "qemux86-64" | "qemuarm" | "qemumips" | "qemumipsel" | "qemumips64" | "qemush4" | "qemuppc") > [ -z "$MACHINE" ] && MACHINE=$arg || \ > error "conflicting MACHINE types [$MACHINE] and [$arg]" > ;; > @@ -245,6 +245,9 @@ QEMUARM_DEFAULT_FSTYPE=ext3 > QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin > QEMUMIPS_DEFAULT_FSTYPE=ext3 > > +QEMUMIPSEL_DEFAULT_KERNEL=vmlinux-qemumipsel.bin > +QEMUMIPSEL_DEFAULT_FSTYPE=ext3 > + > QEMUMIPS64_DEFAULT_KERNEL=vmlinux-qemumips64.bin > QEMUMIPS64_DEFAULT_FSTYPE=ext3 > > diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal > index 041464d..bdf1a37 100755 > --- a/scripts/runqemu-internal > +++ b/scripts/runqemu-internal > @@ -236,6 +236,7 @@ fi > case "$MACHINE" in > "qemuarm") ;; > "qemumips") ;; > + "qemumipsel") ;; > "qemumips64") ;; > "qemush4") ;; > "qemuppc") ;; > @@ -375,12 +376,8 @@ if [ "$MACHINE" = "spitz" ]; then > fi > fi > > -if [ "$MACHINE" = "qemumips" -o "$MACHINE" = "qemumips64" ]; then > - if [ "$MACHINE" = "qemumips64" ]; then > - QEMU=qemu-system-mips64 > - else > - QEMU=qemu-system-mips > - fi > +if [ "$MACHINE" = "qemumips" -o "$MACHINE" = "qemumipsel" -o "$MACHINE" = "qemumips64" ]; then > + QEMU=${MACHINE/qemu/qemu-system-} > MACHINE_SUBTYPE=malta > QEMU_UI_OPTIONS="-vga cirrus $QEMU_UI_OPTIONS" > if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then > -- > 1.7.9.rc2 > hi all: any comment? suggestion or rejection? Dennis
On Thursday 12 July 2012 11:08:40 Dennis.Yxun wrote: > On Wed, Jul 11, 2012 at 3:05 PM, Dennis Lan <dennis.yxun@gmail.com> wrote: > > -if [ "$MACHINE" = "qemumips" -o "$MACHINE" = "qemumips64" ]; then > > - if [ "$MACHINE" = "qemumips64" ]; then > > - QEMU=qemu-system-mips64 > > - else > > - QEMU=qemu-system-mips > > - fi > > +if [ "$MACHINE" = "qemumips" -o "$MACHINE" = "qemumipsel" -o "$MACHINE" = "qemumips64" ]; then > > + QEMU=${MACHINE/qemu/qemu-system-} Unfortunately substitution like this is a bashism (i.e. does not work in purely POSIX-compliant shells such as dash). Can you rework this? Thanks, Paul
On Thu, Jul 12, 2012 at 5:46 PM, Paul Eggleton <paul.eggleton@linux.intel.com> wrote: > On Thursday 12 July 2012 11:08:40 Dennis.Yxun wrote: >> On Wed, Jul 11, 2012 at 3:05 PM, Dennis Lan <dennis.yxun@gmail.com> wrote: >> > -if [ "$MACHINE" = "qemumips" -o "$MACHINE" = "qemumips64" ]; then >> > - if [ "$MACHINE" = "qemumips64" ]; then >> > - QEMU=qemu-system-mips64 >> > - else >> > - QEMU=qemu-system-mips >> > - fi >> > +if [ "$MACHINE" = "qemumips" -o "$MACHINE" = "qemumipsel" -o "$MACHINE" = "qemumips64" ]; then >> > + QEMU=${MACHINE/qemu/qemu-system-} > > Unfortunately substitution like this is a bashism (i.e. does not work in > purely POSIX-compliant shells such as dash). Can you rework this? > > Thanks, > Paul > > -- > > Paul Eggleton > Intel Open Source Technology Centre re-sent with patch v2
Patch
diff --git a/scripts/runqemu b/scripts/runqemu index 8d149a2..650d1df 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -94,7 +94,7 @@ KVM_ENABLED="no" while true; do arg=${1} case "$arg" in - "qemux86" | "qemux86-64" | "qemuarm" | "qemumips" | "qemumips64" | "qemush4" | "qemuppc") + "qemux86" | "qemux86-64" | "qemuarm" | "qemumips" | "qemumipsel" | "qemumips64" | "qemush4" | "qemuppc") [ -z "$MACHINE" ] && MACHINE=$arg || \ error "conflicting MACHINE types [$MACHINE] and [$arg]" ;; @@ -245,6 +245,9 @@ QEMUARM_DEFAULT_FSTYPE=ext3 QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin QEMUMIPS_DEFAULT_FSTYPE=ext3 +QEMUMIPSEL_DEFAULT_KERNEL=vmlinux-qemumipsel.bin +QEMUMIPSEL_DEFAULT_FSTYPE=ext3 + QEMUMIPS64_DEFAULT_KERNEL=vmlinux-qemumips64.bin QEMUMIPS64_DEFAULT_FSTYPE=ext3 diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index 041464d..bdf1a37 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal @@ -236,6 +236,7 @@ fi case "$MACHINE" in "qemuarm") ;; "qemumips") ;; + "qemumipsel") ;; "qemumips64") ;; "qemush4") ;; "qemuppc") ;; @@ -375,12 +376,8 @@ if [ "$MACHINE" = "spitz" ]; then fi fi -if [ "$MACHINE" = "qemumips" -o "$MACHINE" = "qemumips64" ]; then - if [ "$MACHINE" = "qemumips64" ]; then - QEMU=qemu-system-mips64 - else - QEMU=qemu-system-mips - fi +if [ "$MACHINE" = "qemumips" -o "$MACHINE" = "qemumipsel" -o "$MACHINE" = "qemumips64" ]; then + QEMU=${MACHINE/qemu/qemu-system-} MACHINE_SUBTYPE=malta QEMU_UI_OPTIONS="-vga cirrus $QEMU_UI_OPTIONS" if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then
Signed-off-by: Dennis Lan <dennis.yxun@gmail.com> --- scripts/runqemu | 5 ++++- scripts/runqemu-internal | 9 +++------ 2 files changed, 7 insertions(+), 7 deletions(-)