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>
This commit is contained in:
parent
3a0eeb8155
commit
d7d803fa1c
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue