diff options
| author |   Scott Garman <scott.a.garman@intel.com> | 2010-08-18 11:10:14 -0700 |
|---|---|---|
| committer |   Richard Purdie <rpurdie@linux.intel.com> | 2010-08-20 16:20:12 +0100 |
| commit | d7d803fa1cc7770c17bb8c59ff6a7802beefdea5 (patch) | |
| tree | d353e0969f79961fa851bc97493703aeede15bea /scripts | |
| parent | 3a0eeb81554b93f7d22f284623c1a25f68c41b22 (diff) | |
| download | openembedded-core-contrib-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>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/poky-qemu-internal | 9 | ||||
| -rwxr-xr-x | scripts/runqemu | 8 |
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 if [ "$TAP" = "" ]; then GROUPID=`id -g` echo 'Setting up tap interface under sudo' - TAP=`sudo $QEMUIFUP $GROUPID` + TAP=`sudo $QEMUIFUP $GROUPID $NATIVE_SYSROOT_DIR` + if [ $? -ne 0 ]; then + # Re-run standalone to see verbose errors + sudo $QEMUIFUP $GROUPID $NATIVE_SYSROOT_DIR + return + fi LOCKFILE="" else echo "Using preconfigured tap device '$TAP'" @@ -79,7 +84,7 @@ fi release_lock() { if [ "$LOCKFILE" = "" ]; then - $QEMUIFDOWN $TAP + $QEMUIFDOWN $TAP $NATIVE_SYSROOT_DIR else echo "Releasing lockfile of preconfigured tap device '$TAP'" 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 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 |