diff options
| author | Scott Garman <scott.a.garman@intel.com> | 2010-10-14 11:29:44 -0700 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-10-14 20:12:04 +0100 |
| commit | 7d7d35f369c271a7b7cf517601d472ab2104297b (patch) | |
| tree | 8c3d75e29babb9ed3bba04e70e17ceee99809772 /scripts | |
| parent | af404b1372ffe683ae1f3c1914fa9fee6800420c (diff) | |
| download | openembedded-core-7d7d35f369c271a7b7cf517601d472ab2104297b.tar.gz openembedded-core-7d7d35f369c271a7b7cf517601d472ab2104297b.tar.bz2 openembedded-core-7d7d35f369c271a7b7cf517601d472ab2104297b.zip | |
poky-qemu: miscellaneous bugfixes
In scenarios where the POKY_NATIVE_SYSROOT env variable hasn't been
set up, bug #427 can still be triggered. This fixes it by running
setup_tmpdir(). This fixes [BUGID #427].
Also, the qemu tap dev lock directory needs to be chmod 777 so that
multiple users can create and delete lock files.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/poky-qemu | 28 | ||||
| -rwxr-xr-x | scripts/poky-qemu-internal | 5 |
2 files changed, 19 insertions, 14 deletions
diff --git a/scripts/poky-qemu b/scripts/poky-qemu index 66a6631df5..9e604b5a10 100755 --- a/scripts/poky-qemu +++ b/scripts/poky-qemu @@ -165,19 +165,6 @@ fi machine2=`echo $MACHINE | tr 'a-z' 'A-Z' | sed 's/-/_/'` # MACHINE is now set for all cases -if [[ -e "$ROOTFS" && -z "$FSTYPE" ]]; then - # Extract the filename extension - EXT=`echo $ROOTFS | awk -F . '{ print \$NF }'` - if [[ "x$EXT" == "xext2" || "x$EXT" == "xext3" || - "x$EXT" == "xjffs2" ]]; then - FSTYPE=$EXT - else - echo "Note: Unable to determine filesystem extension for $ROOTFS" - echo "We will use the default FSTYPE for $MACHINE" - # ...which is done further below... - fi -fi - # Defaults used when these vars need to be inferred QEMUX86_DEFAULT_KERNEL=bzImage-qemux86.bin QEMUX86_DEFAULT_FSTYPE=ext3 @@ -258,6 +245,21 @@ findimage() { exit 1 } +if [[ -e "$ROOTFS" && -z "$FSTYPE" ]]; then + setup_tmpdir + + # Extract the filename extension + EXT=`echo $ROOTFS | awk -F . '{ print \$NF }'` + if [[ "x$EXT" == "xext2" || "x$EXT" == "xext3" || + "x$EXT" == "xjffs2" ]]; then + FSTYPE=$EXT + else + echo "Note: Unable to determine filesystem extension for $ROOTFS" + echo "We will use the default FSTYPE for $MACHINE" + # ...which is done further below... + fi +fi + if [ -z "$KERNEL" ]; then setup_tmpdir eval kernel_file=\$${machine2}_DEFAULT_KERNEL diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal index 2f8af95707..66db0333ee 100755 --- a/scripts/poky-qemu-internal +++ b/scripts/poky-qemu-internal @@ -108,7 +108,10 @@ release_lock() { } LOCKDIR="/tmp/qemu-tap-locks" -[ ! -d "$LOCKDIR" ] && mkdir $LOCKDIR +if [ ! -d "$LOCKDIR" ]; then + mkdir $LOCKDIR + chmod 777 $LOCKDIR +fi IFCONFIG=`which ifconfig` if [ -z "$IFCONFIG" ]; then |