summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2010-08-18 11:10:14 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-20 16:20:12 +0100
commitd7d803fa1cc7770c17bb8c59ff6a7802beefdea5 (patch)
treed353e0969f79961fa851bc97493703aeede15bea
parent3a0eeb81554b93f7d22f284623c1a25f68c41b22 (diff)
downloadpoky-d7d803fa1cc7770c17bb8c59ff6a7802beefdea5.tar.gz
poky-qemu-internal: fix broken call to poky-qemu-ifup
The poky-qemu-ifup script now requires a path to the native sysroot as an argument. This fixes a case where the argument was missing. Also, set up NATIVE_SYSROOT_DIR when running runqemu. Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-rwxr-xr-xscripts/poky-qemu-internal9
-rwxr-xr-xscripts/runqemu8
2 files changed, 15 insertions, 2 deletions
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal
index 01486ccff6..aac51b5888 100755
--- a/scripts/poky-qemu-internal
+++ b/scripts/poky-qemu-internal
@@ -71,7 +71,12 @@ done
71if [ "$TAP" = "" ]; then 71if [ "$TAP" = "" ]; then
72 GROUPID=`id -g` 72 GROUPID=`id -g`
73 echo 'Setting up tap interface under sudo' 73 echo 'Setting up tap interface under sudo'
74 TAP=`sudo $QEMUIFUP $GROUPID` 74 TAP=`sudo $QEMUIFUP $GROUPID $NATIVE_SYSROOT_DIR`
75 if [ $? -ne 0 ]; then
76 # Re-run standalone to see verbose errors
77 sudo $QEMUIFUP $GROUPID $NATIVE_SYSROOT_DIR
78 return
79 fi
75 LOCKFILE="" 80 LOCKFILE=""
76else 81else
77 echo "Using preconfigured tap device '$TAP'" 82 echo "Using preconfigured tap device '$TAP'"
@@ -79,7 +84,7 @@ fi
79 84
80release_lock() { 85release_lock() {
81 if [ "$LOCKFILE" = "" ]; then 86 if [ "$LOCKFILE" = "" ]; then
82 $QEMUIFDOWN $TAP 87 $QEMUIFDOWN $TAP $NATIVE_SYSROOT_DIR
83 else 88 else
84 echo "Releasing lockfile of preconfigured tap device '$TAP'" 89 echo "Releasing lockfile of preconfigured tap device '$TAP'"
85 rm -f $LOCKFILE 90 rm -f $LOCKFILE
diff --git a/scripts/runqemu b/scripts/runqemu
index 53ef5a5efb..16c2e85856 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -215,4 +215,12 @@ fi
215 215
216CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/usr/bin:$CROSSPATH 216CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/usr/bin:$CROSSPATH
217 217
218SYSROOT_SETUP_SCRIPT=`which poky-find-native-sysroot`
219if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then
220 echo "Error: Unable to find the poky-find-native-sysroot script"
221 echo "Did you forget to source your Poky environment script?"
222 exit 1
223fi
224. $SYSROOT_SETUP_SCRIPT
225
218. $INTERNAL_SCRIPT 226. $INTERNAL_SCRIPT