summaryrefslogtreecommitdiffstats
path: root/scripts/poky-qemu-ifdown
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2010-12-07 20:59:06 -0800
committerJoshua Lock <josh@linux.intel.com>2011-01-14 12:07:29 +0000
commit54f08d23cd7d0de6aec31f4764389ff4dab2990d (patch)
tree1514e13c646a2c22031a0c2a75a2602ea4fae47e /scripts/poky-qemu-ifdown
parent8a3d0f375ce416ada1a5443e4a8e467504001beb (diff)
downloadpoky-54f08d23cd7d0de6aec31f4764389ff4dab2990d.tar.gz
Make poky-qemu and related scripts work with arbitrary SDK locations
* No longer assume SDK toolchains are installed in /opt/poky * [BUGFIX #568] where specifying paths to both the kernel and fs image caused an error due to POKY_NATIVE_SYSROOT never being set, triggering failure of poky-qemu-ifup/ifdown * Cosmetic improvements to usage() functions by using basename Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Diffstat (limited to 'scripts/poky-qemu-ifdown')
-rwxr-xr-xscripts/poky-qemu-ifdown9
1 files changed, 1 insertions, 8 deletions
diff --git a/scripts/poky-qemu-ifdown b/scripts/poky-qemu-ifdown
index 60ca919dea..bc90a9c12d 100755
--- a/scripts/poky-qemu-ifdown
+++ b/scripts/poky-qemu-ifdown
@@ -27,7 +27,7 @@
27# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 27# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
28 28
29usage() { 29usage() {
30 echo "sudo $0 <tap-dev> <native-sysroot-basedir>" 30 echo "sudo $(basename $0) <tap-dev> <native-sysroot-basedir>"
31} 31}
32 32
33if [ $EUID -ne 0 ]; then 33if [ $EUID -ne 0 ]; then
@@ -46,13 +46,6 @@ NATIVE_SYSROOT_DIR=$2
46TUNCTL=$NATIVE_SYSROOT_DIR/usr/bin/tunctl 46TUNCTL=$NATIVE_SYSROOT_DIR/usr/bin/tunctl
47if [ ! -e "$TUNCTL" ]; then 47if [ ! -e "$TUNCTL" ]; then
48 echo "Error: Unable to find tunctl binary in '$NATIVE_SYSROOT_DIR/usr/bin'" 48 echo "Error: Unable to find tunctl binary in '$NATIVE_SYSROOT_DIR/usr/bin'"
49
50 if [[ "$NATIVE_SYSROOT_DIR" =~ ^\/opt\/poky ]]; then
51 echo "This shouldn't happen - something is wrong with your toolchain installation"
52 else
53 echo "Have you run 'bitbake meta-ide-support'?"
54 fi
55
56 exit 1 49 exit 1
57fi 50fi
58 51