diff options
author | Scott Garman <scott.a.garman@intel.com> | 2010-12-07 20:59:06 -0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-12-09 15:00:45 +0000 |
commit | ba5e0b9531b9a967aa3d408a13024590d96b8391 (patch) | |
tree | 47b7536aa4da6efc78106a1a57c6ebe9a13e91d2 /scripts/poky-qemu-ifup | |
parent | 7581654a030961eda03b07de0e0f6d62a7f4055e (diff) | |
download | poky-ba5e0b9531b9a967aa3d408a13024590d96b8391.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-ifup')
-rwxr-xr-x | scripts/poky-qemu-ifup | 9 |
1 files changed, 1 insertions, 8 deletions
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 @@ | |||
34 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 34 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
35 | 35 | ||
36 | usage() { | 36 | usage() { |
37 | echo "sudo $0 <gid> <native-sysroot-basedir>" | 37 | echo "sudo $(basename $0) <gid> <native-sysroot-basedir>" |
38 | } | 38 | } |
39 | 39 | ||
40 | if [ $EUID -ne 0 ]; then | 40 | if [ $EUID -ne 0 ]; then |
@@ -53,13 +53,6 @@ NATIVE_SYSROOT_DIR=$2 | |||
53 | TUNCTL=$NATIVE_SYSROOT_DIR/usr/bin/tunctl | 53 | TUNCTL=$NATIVE_SYSROOT_DIR/usr/bin/tunctl |
54 | if [ ! -x "$TUNCTL" ]; then | 54 | if [ ! -x "$TUNCTL" ]; then |
55 | echo "Error: Unable to find tunctl binary in '$NATIVE_SYSROOT_DIR/usr/bin'" | 55 | echo "Error: Unable to find tunctl binary in '$NATIVE_SYSROOT_DIR/usr/bin'" |
56 | |||
57 | if [[ "$NATIVE_SYSROOT_DIR" =~ ^\/opt\/poky ]]; then | ||
58 | echo "This shouldn't happen - something is wrong with your toolchain installation" | ||
59 | else | ||
60 | echo "Have you run 'bitbake meta-ide-support'?" | ||
61 | fi | ||
62 | |||
63 | exit 1 | 56 | exit 1 |
64 | fi | 57 | fi |
65 | 58 | ||