diff options
-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 | |||
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 |
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 | ||
216 | CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/usr/bin:$CROSSPATH | 216 | CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/usr/bin:$CROSSPATH |
217 | 217 | ||
218 | SYSROOT_SETUP_SCRIPT=`which poky-find-native-sysroot` | ||
219 | if [ -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 | ||
223 | fi | ||
224 | . $SYSROOT_SETUP_SCRIPT | ||
225 | |||
218 | . $INTERNAL_SCRIPT | 226 | . $INTERNAL_SCRIPT |