From ba5e0b9531b9a967aa3d408a13024590d96b8391 Mon Sep 17 00:00:00 2001 From: Scott Garman Date: Tue, 7 Dec 2010 20:59:06 -0800 Subject: 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 --- scripts/poky-qemu-ifup | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'scripts/poky-qemu-ifup') diff --git a/scripts/poky-qemu-ifup b/scripts/poky-qemu-ifup index 8685c83cce..f82848ccce 100755 --- a/scripts/poky-qemu-ifup +++ b/scripts/poky-qemu-ifup @@ -34,7 +34,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. usage() { - echo "sudo $0 " + echo "sudo $(basename $0) " } if [ $EUID -ne 0 ]; then @@ -53,13 +53,6 @@ NATIVE_SYSROOT_DIR=$2 TUNCTL=$NATIVE_SYSROOT_DIR/usr/bin/tunctl if [ ! -x "$TUNCTL" ]; then echo "Error: Unable to find tunctl binary in '$NATIVE_SYSROOT_DIR/usr/bin'" - - if [[ "$NATIVE_SYSROOT_DIR" =~ ^\/opt\/poky ]]; then - echo "This shouldn't happen - something is wrong with your toolchain installation" - else - echo "Have you run 'bitbake meta-ide-support'?" - fi - exit 1 fi -- cgit v1.2.3-54-g00ecf