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/poky-qemu-internal | |
| parent | 3a0eeb81554b93f7d22f284623c1a25f68c41b22 (diff) | |
| download | poky-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/poky-qemu-internal')
| -rwxr-xr-x | scripts/poky-qemu-internal | 9 |
1 files changed, 7 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 | |||
| 71 | if [ "$TAP" = "" ]; then | 71 | if [ "$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="" |
| 76 | else | 81 | else |
| 77 | echo "Using preconfigured tap device '$TAP'" | 82 | echo "Using preconfigured tap device '$TAP'" |
| @@ -79,7 +84,7 @@ fi | |||
| 79 | 84 | ||
| 80 | release_lock() { | 85 | release_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 |
