From 0f973ed66551cdd1112ee9df42df5603835b8384 Mon Sep 17 00:00:00 2001 From: Scott Garman Date: Mon, 4 Oct 2010 21:04:15 -0700 Subject: Merge runqemu features into poky-qemu This merges the functionality of the runqemu script into poky-qemu. It also removes the requirement to order command line args to poky-qemu in any particular order. This fixes a slew of runqemu-related bugs by making the runqemu script obsolete (and fixing the issues in the new poky-qemu), including [BUGID #294] [BUGID #295] [BUGID #371] and [BUGID #324]. Signed-off-by: Scott Garman --- scripts/poky-env-internal | 2 +- scripts/poky-qemu | 280 ++++++++++++++++++++++++++++++++++++++++----- scripts/poky-qemu-internal | 26 ++--- scripts/runqemu | 218 ----------------------------------- 4 files changed, 264 insertions(+), 262 deletions(-) delete mode 100755 scripts/runqemu (limited to 'scripts') diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal index 52747bf5c3..ae26cab7e4 100755 --- a/scripts/poky-env-internal +++ b/scripts/poky-env-internal @@ -128,7 +128,7 @@ Common targets are: meta-toolchain meta-toolchain-sdk -You can also run generated qemu images with a command like 'runqemu qemux86' +You can also run generated qemu images with a command like 'poky-qemu qemux86' EOM diff --git a/scripts/poky-qemu b/scripts/poky-qemu index 111aa15b70..ad4bdbf91c 100755 --- a/scripts/poky-qemu +++ b/scripts/poky-qemu @@ -1,8 +1,8 @@ #!/bin/bash - +# # Handle running Poky images standalone with QEMU # -# Copyright (C) 2006-2007 OpenedHand Ltd. +# Copyright (C) 2006-2010 Intel Corp. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -17,47 +17,267 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -if [ "x$1" = "x" ]; then +usage() { MYNAME=`basename $0` - echo "Run as MACHINE=xyz $MYNAME KERNEL ROOTFS [OPTIONS]" - echo "where:" + echo "" + echo "Usage: you can run this script with any valid combination" + echo "of the following options (in any order):" + echo " QEMUARCH - the qemu machine architecture to use" echo " KERNEL - the kernel image file to use" echo " ROOTFS - the rootfs image file or nfsroot directory to use" -# echo " (NFS booting assumed if ROOTFS not specified)" echo " MACHINE=xyz - the machine name (optional, autodetected from KERNEL filename if unspecified)" - echo " OPTIONS - extra options to pass to QEMU" + echo " Additional QEMU command-line options can be passed with:" + echo " serial - enables a serial console on /dev/ttyS0" + echo "" + echo "Examples:" + echo " $0 qemuarm" + echo " $0 qemux86-64 poky-image-sato ext3" + echo " $0 path/to/bzImage-qemux86.bin path/to/nfsrootdir/ serial" exit 1 -else - KERNEL=$1 - shift +} + +if [ "x$1" = "x" ]; then + usage fi -if [ "x$MACHINE" = "x" ]; then +MACHINE=${MACHINE:=""} +KERNEL="" +FSTYPE="" +ROOTFS="" +SCRIPT_QEMU_OPT="" +SCRIPT_KERNEL_OPT="" + +TMPDIR="" + +# Parse command line args without requiring specific ordering. It's a +# bit more complex, but offers a great user experience. +i=1 +while [ $i -le $# ]; do + arg=${!i} + case $arg in + "qemux86" | "qemux86-64" | "qemuarm" | "qemumips" | "qemuppc") + if [ -z "$MACHINE" ]; then + MACHINE=$arg + else + echo "Error: conflicting MACHINE types [$MACHINE] and [$arg]" + usage + fi + ;; + "ext2" | "ext3" | "jffs2" | "nfs") + if [ -z "$FSTYPE" ]; then + FSTYPE=$arg + else + echo "Error: conflicting FSTYPE types [$FSTYPE] and [$arg]" + usage + fi + ;; + *-image-*) + if [ -z "$ROOTFS" ]; then + ROOTFS=$arg + else + echo "Error: conflicting ROOTFS args [$ROOTFS] and [$arg]" + usage + fi + ;; + "serial") + # Will need to append to these variables when we + # accept more values + SCRIPT_QEMU_OPT="-serial stdio" + SCRIPT_KERNEL_OPT="console=ttyS0" + ;; + *) + # A directory name is an nfs rootfs + if [ -d "$arg" ]; then + echo "Assuming $arg is an nfs rootfs" + if [[ -z "$FSTYPE" || "$FSTYPE" == "nfs" ]]; then + FSTYPE=nfs + else + echo "Error: conflicting FSTYPE types [$arg] and nfs" + usage + fi + + if [ -z "$ROOTFS" ]; then + ROOTFS=$arg + else + echo "Error: conflicting ROOTFS args [$ROOTFS] and [$arg]" + usage + fi + elif [ -f "$arg" ]; then + # Extract the filename extension + EXT=`echo $arg | awk -F . '{ print \$NF }'` + # A file ending in .bin is a kernel + if [ "x$EXT" = "xbin" ]; then + if [ -z "$KERNEL" ]; then + KERNEL=$arg + else + echo "Error: conflicting KERNEL args [$KERNEL] and [$arg]" + usage + fi + elif [[ "x$EXT" == "xext2" || "x$EXT" == "xext3" || + "x$EXT" == "xjffs2" ]]; then + # A file ending in a supportted fs type is a rootfs image + if [[ -z "$FSTYPE" || "$FSTYPE" == "$EXT" ]]; then + FSTYPE=$EXT + ROOTFS=$arg + else + echo "Error: conflicting FSTYPE types [$FSTYPE] and [$arg]" + usage + fi + else + echo "Error: unknown file arg [$arg]" + usage + fi + else + echo "Error: unable to classify arg [$arg]" + usage + fi + ;; + esac + i=$((i + 1)) +done + +# Report errors for missing combinations of options +if [[ -z "$MACHINE" && -z "$KERNEL" ]]; then + echo "Error: you must specify at least a MACHINE or KERNEL argument" + usage +fi +if [[ "$FSTYPE" == "nfs" && -z "$ROOTFS" ]]; then + echo "Error: NFS booting without an explicit ROOTFS path is not yet supported" + usage +fi + +if [ -z "$MACHINE" ]; then MACHINE=`basename $KERNEL | sed -r -e 's#.*-([a-z]+[0-9\-]*)-?[0-9]*..*#\1#'` + if [ -z "$MACHINE" ]; then + echo "Error: Unable to set MACHINE from kernel filename [$KERNEL]" + usage + fi + echo "Set MACHINE to [$MACHINE] based on kernel [$KERNEL]" fi +machine2=`echo $MACHINE | tr 'a-z' 'A-Z' | sed 's/-/_/'` +# MACHINE is now set for all cases -if [ "x$1" = "x" ]; then - FSTYPE="nfs" - echo "Error: NFS booting without an explicit ROOTFS path is not yet supported" - exit 1 -else - ROOTFS=$1 - - if [ -d "$1" ]; then - echo "$ROOTFS is a directory, assuming nfsroot" - FSTYPE="nfs" - else - FSTYPE="ext3" - EXT=${ROOTFS##.*} - if [[ "x$EXT" == "xext2" || "x$EXT" == "xext3" || - "x$EXT" == "xjffs2" ]]; then - FSTYPE=$EXT +# Defaults used when these vars need to be inferred +QEMUX86_DEFAULT_KERNEL=bzImage-qemux86.bin +QEMUX86_DEFAULT_FSTYPE=ext3 +QEMUX86_DEFAULT_ROOTFS="poky-image-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" + +QEMUX86_64_DEFAULT_KERNEL=bzImage-qemux86-64.bin +QEMUX86_64_DEFAULT_FSTYPE=ext3 +QEMUX86_64_DEFAULT_ROOTFS="poky-image-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" + +QEMUARM_DEFAULT_KERNEL=zImage-qemuarm.bin +QEMUARM_DEFAULT_FSTYPE=ext3 +QEMUARM_DEFAULT_ROOTFS="poky-image-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" + +QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin +QEMUMIPS_DEFAULT_FSTYPE=ext3 +QEMUMIPS_DEFAULT_ROOTFS="poky-image-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" + +QEMUPPC_DEFAULT_KERNEL=zImage-qemuppc.bin +QEMUPPC_DEFAULT_FSTYPE=ext3 +QEMUPPC_DEFAULT_ROOTFS="poky-image-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" + +AKITA_DEFAULT_KERNEL=zImage-akita.bin +AKITA_DEFAULT_FSTYPE=jffs2 +AKITA_DEFAULT_ROOTFS="poky-image-sato" + +SPITZ_DEFAULT_KERNEL=zImage-spitz.bin +SPITZ_DEFAULT_FSTYPE=ext3 +SPITZ_DEFAULT_ROOTFS="poky-image-sato" + +setup_tmpdir() { + if [ -z "$TMPDIR" ]; then + if [ "x$BUILDDIR" = "x" ]; then + # BUILDDIR unset, try and get TMPDIR from bitbake + type -P bitbake &>/dev/null || { + echo "In order for this script to dynamically infer paths"; + echo "to kernels or filesystem images, you either need"; + echo "bitbake in your PATH or to source poky-init-build-env"; + echo "before running this script" >&2; + exit 1; } + + # We have bitbake in PATH, get TMPDIR and BUILD_SYS + # from the environment + TMPDIR=`bitbake -e | grep TMPDIR=\" | cut -d '=' -f2 | cut -d '"' -f2` + BUILD_SYS=`bitbake -e | grep BUILD_SYS=\" | cut -d '=' -f2 | cut -d '"' -f2` + else + BUILD_ARCH=`uname -m` + BUILD_OS=`uname | tr '[A-Z]' '[a-z]'` + BUILD_SYS="$BUILD_ARCH-$BUILD_OS" + TMPDIR=$BUILDDIR/tmp fi - echo "Using $FSTYPE as filesytem type for $ROOTFS" + if [ -z "$POKY_NATIVE_SYSROOT" ]; then + POKY_NATIVE_SYSROOT=$TMPDIR/sysroots/$BUILD_SYS + fi + CROSSPATH=$POKY_NATIVE_SYSROOT/usr/bin + fi +} + +# Locate a rootfs image based on defaults defined above +findimage() { + where=$1 + machine=$2 + extension=$3 + names=$4 + + for name in $names; do + fullname=$where/$name-$machine.$extension + if [ -e "$fullname" ]; then + ROOTFS=$fullname + return + fi + done + + echo "Couldn't find image in $where. Attempted image names were:" + for name in $names; do + echo $name-$machine.$extension + done + + exit 1 +} + +if [ -z "$KERNEL" ]; then + setup_tmpdir + eval kernel_file=\$${machine2}_DEFAULT_KERNEL + KERNEL=$TMPDIR/deploy/images/$kernel_file + + if [ -z "$KERNEL" ]; then + echo "Error: Unable to determine default kernel for MACHINE [$MACHINE]" + usage + fi +fi +# KERNEL is now set for all cases + +if [ -z "$FSTYPE" ]; then + setup_tmpdir + eval FSTYPE=\$${machine2}_DEFAULT_FSTYPE + + if [ -z "$FSTYPE" ]; then + echo "Error: Unable to determine default fstype for MACHINE [$MACHINE]" + usage fi - shift fi +# FSTYPE is now set for all cases + +if [ -z "$ROOTFS" ]; then + setup_tmpdir + T=$TMPDIR/deploy/images + eval rootfs_list=\$${machine2}_DEFAULT_ROOTFS + findimage $T $MACHINE $FSTYPE "$rootfs_list" + + if [ -z "$ROOTFS" ]; then + echo "Error: Unable to determine default rootfs for MACHINE [$MACHINE]" + usage + fi +fi +# ROOTFS is now set for all cases + +echo "" +echo "Continuing with the following parameters:" +echo "KERNEL: [$KERNEL]" +echo "ROOTFS: [$ROOTFS]" +echo "FSTYPE: [$FSTYPE]" # We can't run without a libGL.so libgl='no' diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal index 532b255da9..01c92ee980 100755 --- a/scripts/poky-qemu-internal +++ b/scripts/poky-qemu-internal @@ -115,16 +115,16 @@ fi release_lock() { if [ ! -e "$NOSUDO_FLAG" ]; then - $QEMUIFDOWN $TAP $POKY_NATIVE_SYSROOT + sudo $QEMUIFDOWN $TAP $POKY_NATIVE_SYSROOT + fi + echo "Releasing lockfile of preconfigured tap device '$TAP'" + lockfile-remove $LOCKFILE + + if [ "$NFSRUNNING" = "true" ]; then + echo "Shutting down the userspace NFS server..." + echo "poky-export-rootfs stop $ROOTFS" + poky-export-rootfs stop $ROOTFS fi - echo "Releasing lockfile of preconfigured tap device '$TAP'" - lockfile-remove $LOCKFILE - - if [ "$NFSRUNNING" = "true" ]; then - echo "Shutting down the userspace NFS server..." - echo "poky-export-rootfs stop $ROOTFS" - poky-export-rootfs stop $ROOTFS - fi } n1=$[ (`echo $TAP | sed 's/tap//'` * 2) + 1 ] @@ -209,7 +209,7 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarm if [ -e /proc/sys/vm/mmap_min_addr ]; then if [ `cat /proc/sys/vm/mmap_min_addr` != "0" ]; then echo "Error, please set /proc/sys/vm/mmap_min_addr to 0 since otherwise it can cause problems with QEMU" - return + return fi fi @@ -295,7 +295,7 @@ if [ "$MACHINE" = "qemumips" ]; then QEMU=qemu-system-mips MACHINE_SUBTYPE=malta QEMU_UI_OPTIONS="-vga cirrus" - if [ "$TYPE" = "ext3" ]; then + if [ "$FSTYPE" = "ext3" ]; then #KERNCMDLINE="root=/dev/hda console=ttyS0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" KERNCMDLINE="root=/dev/hda console=ttyS0 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" QEMUOPTIONS="$QEMU_NETWORK_CMD -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" @@ -396,8 +396,8 @@ else fi echo "Running $QEMU..." -echo $QEMUBIN -kernel $KERNEL $QEMUOPTIONS $SERIALOPTS $* --append '"'$KERNCMDLINE'"' -$QEMUBIN -kernel $KERNEL $QEMUOPTIONS $SERIALOPTS $* --append "$KERNCMDLINE" || /bin/true +echo $QEMUBIN -kernel $KERNEL $QEMUOPTIONS $SERIALOPTS $SCRIPT_QEMU_CMDLINE_OPT --append '"'$KERNCMDLINE $SCRIPT_KERNEL_OPT'"' +$QEMUBIN -kernel $KERNEL $QEMUOPTIONS $SERIALOPTS $SCRIPT_QEMU_OPT --append "$KERNCMDLINE $SCRIPT_KERNEL_OPT" || /bin/true release_lock diff --git a/scripts/runqemu b/scripts/runqemu deleted file mode 100755 index 8a1c2120c2..0000000000 --- a/scripts/runqemu +++ /dev/null @@ -1,218 +0,0 @@ -#!/bin/bash - -# Handle Poky <-> QEmu interface voodoo -# -# Copyright (C) 2006-2007 OpenedHand Ltd. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -if [ "x$BUILDDIR" = "x" ]; then - # BUILDDIR unset, try and get TMPDIR from bitbake - type -P bitbake &>/dev/null || { - echo "You either need bitbake in your PATH or to source poky-init-build-env before running this script" >&2; exit 1; } - - # we have bitbake in PATH, get TMPDIR and BUILD_SYS from the environment - TMPDIR=`bitbake -e | grep TMPDIR=\" | cut -d '=' -f2 | cut -d '"' -f2` - BUILD_SYS=`bitbake -e | grep BUILD_SYS=\" | cut -d '=' -f2 | cut -d '"' -f2` -else - BUILD_ARCH=`uname -m` - BUILD_OS=`uname | tr '[A-Z]' '[a-z]'` - BUILD_SYS="$BUILD_ARCH-$BUILD_OS" - TMPDIR=$BUILDDIR/tmp -fi - -if ! (test -d "$TMPDIR"); then - echo >&2 "Error: no $TMPDIR directory, please re-run the script from the Poky build directory." - return -fi - -SCRIPTSDIR=`dirname "$0"` -INTERNAL_SCRIPT=$SCRIPTSDIR/poky-qemu-internal - -if [ "x$1" = "x" ]; then - echo - echo "Run as $0 MACHINE IMAGETYPE ZIMAGE IMAGEFILE" - echo "where:" - echo " MACHINE - the machine to emulate (qemuarm, qemux86)" - echo " IMAGETYPE - the type of image to run (ext3, nfs) (default: ext3)" - echo " ZIMAGE - the kernel to use (optional)" - echo " IMAGEFILE - the image file/location to use (optional)" - exit 1 -else - MACHINE=$1 - shift -fi - -if [ "x$1" != "x" ]; then - TYPE=$1 - shift -else - TYPE="ext3" - if [ "$MACHINE" = "akita" ]; then - TYPE="jffs2" - fi - if [ "$MACHINE" = "nokia800" ]; then - TYPE="jffs2" - fi - if [ "$MACHINE" = "spitz" ]; then - TYPE="ext3" - fi -fi - -if [ "x$1" != "x" ]; then - ZIMAGE=$1 - shift -fi - -if [ "x$1" != "x" ]; then - HDIMAGE=$1 - shift -fi - -if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o "$MACHINE" = "akita" -o "$MACHINE" = "nokia800" ]; then - if [ "x$ZIMAGE" = "x" ]; then - ZIMAGE=$TMPDIR/deploy/images/zImage-$MACHINE.bin - fi - CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/bin -fi - -function findimage { - where=$1 - machine=$2 - extension=$3 - names=$4 - for name in $names; - do - fullname=$where/$name-$machine.$extension - if [ -e "$fullname" ]; then - HDIMAGE=$fullname - return - fi - done - echo "Couldn't find image in $where. Attempted image names were:" - for name in $names; - do - echo $name-$machine.$extension - done - exit 1 -} - -if [ "$MACHINE" = "qemuarm" ]; then - if [ "$TYPE" = "ext3" ]; then - if [ "x$HDIMAGE" = "x" ]; then - T=$TMPDIR/deploy/images - findimage $T qemuarm ext3 "poky-image-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" - fi - fi -fi - -if [ "$MACHINE" = "qemumips" ]; then - if [ "x$ZIMAGE" = "x" ]; then - ZIMAGE=$TMPDIR/deploy/images/vmlinux-$MACHINE.bin - fi - if [ "$TYPE" = "ext3" ]; then - if [ "x$HDIMAGE" = "x" ]; then - T=$TMPDIR/deploy/images - findimage $T $MACHINE ext3 "poky-image-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" - fi - fi - CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/usr -fi - -if [ "$MACHINE" = "qemuppc" ]; then - if [ "x$ZIMAGE" = "x" ]; then - ZIMAGE=$TMPDIR/deploy/images/zImage-$MACHINE.bin - fi - if [ "$TYPE" = "ext3" ]; then - if [ "x$HDIMAGE" = "x" ]; then - T=$TMPDIR/deploy/images - findimage $T $MACHINE ext3 "poky-image-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" - fi - fi - CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/usr -fi - -if [ "$MACHINE" = "spitz" ]; then - if [ "$TYPE" = "ext3" ]; then - if [ "x$HDIMAGE" = "x" ]; then - HDIMAGE=$TMPDIR/deploy/images/poky-image-sato-spitz.ext3 - fi - fi -fi - -if [ "$MACHINE" = "akita" ]; then - if [ "$TYPE" = "jffs2" ]; then - if [ "x$HDIMAGE" = "x" ]; then - HDIMAGE=$TMPDIR/deploy/images/poky-image-sato-akita.jffs2 - fi - fi -fi - -if [ "$MACHINE" = "nokia800" ]; then - if [ "$TYPE" = "jffs2" ]; then - if [ "x$HDIMAGE" = "x" ]; then - HDIMAGE=$TMPDIR/deploy/images/poky-image-sato-nokia800.jffs2 - fi - fi -fi - - -if [ "$MACHINE" = "qemux86" ]; then - if [ "x$ZIMAGE" = "x" ]; then - ZIMAGE=$TMPDIR/deploy/images/bzImage-$MACHINE.bin - fi - if [ "$TYPE" = "ext3" ]; then - if [ "x$HDIMAGE" = "x" ]; then - T=$TMPDIR/deploy/images - findimage $T qemux86 ext3 "moblin-image-sdk moblin-image-netbook poky-image-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" - fi - fi - CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/usr -fi - -if [ "$MACHINE" = "qemux86-64" ]; then - if [ "x$ZIMAGE" = "x" ]; then - ZIMAGE=$TMPDIR/deploy/images/bzImage-$MACHINE.bin - fi - if [ "$TYPE" = "ext3" ]; then - if [ "x$HDIMAGE" = "x" ]; then - T=$TMPDIR/deploy/images - findimage $T qemux86-64 ext3 "moblin-image-sdk moblin-image-netbook poky-image-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal" - fi - fi - CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/usr -fi - -if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o "$MACHINE" = "akita" -o "$MACHINE" = "nokia800" ]; then - TARGET_SYS="arm-poky-linux" -elif [ "$MACHINE" = "qemux86" ]; then - TARGET_SYS="i586-poky-linux" -elif [ "$MACHINE" = "qemux86-64" ]; then - TARGET_SYS="x86_64-poky-linux" -elif [ "$MACHINE" = "qemumips" ]; then - TARGET_SYS="mips-poky-linux" -fi - -CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/usr/bin:$CROSSPATH - -SYSROOT_SETUP_SCRIPT=`which poky-find-native-sysroot` -if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then - echo "Error: Unable to find the poky-find-native-sysroot script" - echo "Did you forget to source your Poky environment script?" - exit 1 -fi -. $SYSROOT_SETUP_SCRIPT - -. $INTERNAL_SCRIPT -- cgit 1.2.3-korg