summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-09-03 18:34:24 +0100
committerJoshua Lock <josh@linux.intel.com>2010-09-07 11:22:54 +0100
commit9b800fe261650e4300795ce9762422d93cd31251 (patch)
treeeee1bd6e1909a46dd5b5656b73a56942fdd2aa94
parentc97f3a5df4f498ec663d0bde88ed2652dd4db181 (diff)
downloadpoky-9b800fe261650e4300795ce9762422d93cd31251.tar.gz
scripts: use the exported POKY_NATIVE_SYSROOT variable
Rather than trying to determine things through guess-work use the newly exported variables to determine where the native binaries reside and whether we are running in a build directory or not. Signed-off-by: Joshua Lock <josh@linux.intel.com>
-rwxr-xr-xscripts/poky-export-rootfs16
-rwxr-xr-xscripts/poky-extract-sdk2
-rwxr-xr-xscripts/poky-find-native-sysroot59
-rwxr-xr-xscripts/poky-qemu-internal4
-rwxr-xr-xscripts/runqemu-nfs2
5 files changed, 39 insertions, 44 deletions
diff --git a/scripts/poky-export-rootfs b/scripts/poky-export-rootfs
index fd9018a9e8..ef527dc058 100755
--- a/scripts/poky-export-rootfs
+++ b/scripts/poky-export-rootfs
@@ -46,10 +46,10 @@ if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then
46fi 46fi
47. $SYSROOT_SETUP_SCRIPT 47. $SYSROOT_SETUP_SCRIPT
48 48
49if [ ! -e "$NATIVE_SYSROOT_DIR/usr/sbin/rpc.mountd" ]; then 49if [ ! -e "$POKY_NATIVE_SYSROOT/usr/sbin/rpc.mountd" ]; then
50 echo "Error: Unable to find rpc.mountd binary in $NATIVE_SYSROOT_DIR/usr/sbin/" 50 echo "Error: Unable to find rpc.mountd binary in $POKY_NATIVE_SYSROOT/usr/sbin/"
51 51
52 if [ "$SYSROOT_MODE" = "in-tree" ]; then 52 if [ "x$POKY_DISTRO_VERSION" = "x" ]; then
53 echo "Have you run 'bitbake unfs-server-native'?" 53 echo "Have you run 'bitbake unfs-server-native'?"
54 else 54 else
55 echo "This shouldn't happen - something is missing from your toolchain installation" 55 echo "This shouldn't happen - something is missing from your toolchain installation"
@@ -67,7 +67,7 @@ RMTAB=~/.poky-sdk/rmtab$TARGET_VIRT_INSTANCE
67NFSPID=~/.poky-sdk/nfs$TARGET_VIRT_INSTANCE.pid 67NFSPID=~/.poky-sdk/nfs$TARGET_VIRT_INSTANCE.pid
68MOUNTPID=~/.poky-sdk/mount$TARGET_VIRT_INSTANCE.pid 68MOUNTPID=~/.poky-sdk/mount$TARGET_VIRT_INSTANCE.pid
69 69
70PSEUDO_OPTS="-P $NATIVE_SYSROOT_DIR/usr" 70PSEUDO_OPTS="-P $POKY_NATIVE_SYSROOT/usr"
71PSEUDO_LOCALSTATEDIR="$NFS_EXPORT_DIR/var/pseudo" 71PSEUDO_LOCALSTATEDIR="$NFS_EXPORT_DIR/var/pseudo"
72export PSEUDO_LOCALSTATEDIR 72export PSEUDO_LOCALSTATEDIR
73 73
@@ -100,8 +100,8 @@ fi
100case "$1" in 100case "$1" in
101 start) 101 start)
102 echo "Starting User Mode rpc.mountd" 102 echo "Starting User Mode rpc.mountd"
103 echo " $PSEUDO $PSEUDO_OPTS $NATIVE_SYSROOT_DIR/usr/sbin/rpc.mountd $MOUNTD_OPTS" 103 echo " $PSEUDO $PSEUDO_OPTS $POKY_NATIVE_SYSROOT/usr/sbin/rpc.mountd $MOUNTD_OPTS"
104 $PSEUDO $PSEUDO_OPTS $NATIVE_SYSROOT_DIR/usr/sbin/rpc.mountd $MOUNTD_OPTS 104 $PSEUDO $PSEUDO_OPTS $POKY_NATIVE_SYSROOT/usr/sbin/rpc.mountd $MOUNTD_OPTS
105 if [ ! $? = 0 ] ; then 105 if [ ! $? = 0 ] ; then
106 echo "=====================" 106 echo "====================="
107 echo "Error starting MOUNTD" 107 echo "Error starting MOUNTD"
@@ -123,8 +123,8 @@ case "$1" in
123 exit 1 123 exit 1
124 fi 124 fi
125 echo "Starting User Mode nfsd" 125 echo "Starting User Mode nfsd"
126 echo " $PSEUDO $PSEUDO_OPTS $NATIVE_SYSROOT_DIR/usr/sbin/rpc.nfsd $NFSD_OPTS" 126 echo " $PSEUDO $PSEUDO_OPTS $POKY_NATIVE_SYSROOT/usr/sbin/rpc.nfsd $NFSD_OPTS"
127 $PSEUDO $PSEUDO_OPTS $NATIVE_SYSROOT_DIR/usr/sbin/rpc.nfsd $NFSD_OPTS 127 $PSEUDO $PSEUDO_OPTS $POKY_NATIVE_SYSROOT/usr/sbin/rpc.nfsd $NFSD_OPTS
128 if [ ! $? = 0 ] ; then 128 if [ ! $? = 0 ] ; then
129 echo "Error starting nfsd" 129 echo "Error starting nfsd"
130 exit 1 130 exit 1
diff --git a/scripts/poky-extract-sdk b/scripts/poky-extract-sdk
index 70bc44b79b..977adde1a6 100755
--- a/scripts/poky-extract-sdk
+++ b/scripts/poky-extract-sdk
@@ -36,7 +36,7 @@ if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then
36 exit 1 36 exit 1
37fi 37fi
38. $SYSROOT_SETUP_SCRIPT 38. $SYSROOT_SETUP_SCRIPT
39PSEUDO_OPTS="-P $NATIVE_SYSROOT_DIR/usr" 39PSEUDO_OPTS="-P $POKY_NATIVE_SYSROOT/usr"
40 40
41ROOTFS_TARBALL=$1 41ROOTFS_TARBALL=$1
42SDK_ROOTFS_DIR=$2 42SDK_ROOTFS_DIR=$2
diff --git a/scripts/poky-find-native-sysroot b/scripts/poky-find-native-sysroot
index fe36a2a932..9182f9d170 100755
--- a/scripts/poky-find-native-sysroot
+++ b/scripts/poky-find-native-sysroot
@@ -1,10 +1,9 @@
1#!/bin/bash 1#!/bin/bash
2# 2#
3# Find a native sysroot to use - either from an in-tree Poky build or 3# Find a native sysroot to use - either from an in-tree Poky build or
4# from a toolchain installation in /opt/poky. It then sets the variables 4# from a toolchain installation in /opt/poky. It then ensures the variable
5# $NATIVE_SYSROOT_DIR to the sysroot's base directory, $PSEUDO to the 5# $POKY_NATIVE_SYSROOT is set to the sysroot's base directory, and sets
6# path of the pseudo binary, and $SYSROOT_MODE is set to "in-tree" or 6# $PSEUDO to the path of the pseudo binary.
7# "toolchain".
8# 7#
9# This script is intended to be run within other scripts by source'ing 8# This script is intended to be run within other scripts by source'ing
10# it, e.g: 9# it, e.g:
@@ -31,40 +30,36 @@
31# with this program; if not, write to the Free Software Foundation, Inc., 30# with this program; if not, write to the Free Software Foundation, Inc.,
32# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 31# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
33 32
34BITBAKE=`which bitbake` 33if [ -z "$POKY_NATIVE_SYSROOT" ]; then
35if [ -z "$BITBAKE" ]; then 34 BITBAKE=`which bitbake`
36 SYSROOT_MODE="toolchain" 35 if [ "x$BITBAKE" != "x" ]; then
37 NATIVE_SYSROOT_DIR=`find /opt/poky -name "tunctl" | sed 's/\/usr\/bin\/tunctl//'` 36 if [ "$UID" = "0" ]; then
38else 37 # Root cannot run bitbake unless sanity checking is disabled
39 SYSROOT_MODE="in-tree" 38 if [ ! -d "./conf" ]; then
40 if [ "$UID" = "0" ]; then 39 echo "Error: root cannot run bitbake by default, and I cannot find a ./conf directory to be able to disable sanity checking"
41 # Root cannot run bitbake unless sanity checking is disabled 40 exit 1
42 if [ ! -d "./conf" ]; then 41 fi
43 echo "Error: root cannot run bitbake by default, and I cannot find a ./conf directory to be able to disable sanity checking" 42 touch conf/sanity.conf
44 exit 1 43 POKY_NATIVE_SYSROOT=`bitbake -e | grep ^STAGING_DIR_NATIVE | cut -d '=' -f2 | cut -d '"' -f2`
45 fi 44 rm -f conf/sanity.conf
46 touch conf/sanity.conf 45 else
47 NATIVE_SYSROOT_DIR=`bitbake -e | grep ^STAGING_DIR_NATIVE | cut -d '=' -f2 | cut -d '"' -f2` 46 POKY_NATIVE_SYSROOT=`bitbake -e | grep ^STAGING_DIR_NATIVE | cut -d '=' -f2 | cut -d '"' -f2`
48 rm -f conf/sanity.conf 47 fi
49 else 48 else
50 NATIVE_SYSROOT_DIR=`bitbake -e | grep ^STAGING_DIR_NATIVE | cut -d '=' -f2 | cut -d '"' -f2` 49 echo "Error: Unable to locate your native sysroot."
51 fi 50 echo "Did you forget to source the Poky environment script?"
52fi
53
54if [ -z "$NATIVE_SYSROOT_DIR" ]; then
55 echo "Error: Unable to locate your native sysroot."
56 echo "Did you forget to source the Poky environment script?"
57 51
58 if [ -z "$SKIP_STRICT_SYSROOT_CHECK" ]; then 52 if [ -z "$SKIP_STRICT_SYSROOT_CHECK" ]; then
59 exit 1 53 exit 1
54 fi
60 fi 55 fi
61fi 56fi
62 57
63# Set up pseudo command 58# Set up pseudo command
64if [ ! -e "$NATIVE_SYSROOT_DIR/usr/bin/pseudo" ]; then 59if [ ! -e "$POKY_NATIVE_SYSROOT/usr/bin/pseudo" ]; then
65 echo "Error: Unable to find pseudo binary in $NATIVE_SYSROOT_DIR/usr/bin/" 60 echo "Error: Unable to find pseudo binary in $POKY_NATIVE_SYSROOT/usr/bin/"
66 61
67 if [ "$SYSROT_MODE" = "in-tree" ]; then 62 if [ "x$POKY_DISTRO_VERSION" = "x" ]; then
68 echo "Have you run 'bitbake pseudo-native'?" 63 echo "Have you run 'bitbake pseudo-native'?"
69 else 64 else
70 echo "This shouldn't happen - something is wrong with your toolchain installation" 65 echo "This shouldn't happen - something is wrong with your toolchain installation"
@@ -74,4 +69,4 @@ if [ ! -e "$NATIVE_SYSROOT_DIR/usr/bin/pseudo" ]; then
74 exit 1 69 exit 1
75 fi 70 fi
76fi 71fi
77PSEUDO="$NATIVE_SYSROOT_DIR/usr/bin/pseudo" 72PSEUDO="$POKY_NATIVE_SYSROOT/usr/bin/pseudo"
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal
index a9029dc63f..b529241cbf 100755
--- a/scripts/poky-qemu-internal
+++ b/scripts/poky-qemu-internal
@@ -71,10 +71,10 @@ done
71if [ "$TAP" = "" ]; then 71if [ "$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 $NATIVE_SYSROOT_DIR` 74 TAP=`sudo $QEMUIFUP $GROUPID $POKY_NATIVE_SYSROOT`
75 if [ $? -ne 0 ]; then 75 if [ $? -ne 0 ]; then
76 # Re-run standalone to see verbose errors 76 # Re-run standalone to see verbose errors
77 sudo $QEMUIFUP $GROUPID $NATIVE_SYSROOT_DIR 77 sudo $QEMUIFUP $GROUPID $POKY_NATIVE_SYSROOT
78 return 78 return
79 fi 79 fi
80 LOCKFILE="" 80 LOCKFILE=""
diff --git a/scripts/runqemu-nfs b/scripts/runqemu-nfs
index 79b41ca79a..19943a7648 100755
--- a/scripts/runqemu-nfs
+++ b/scripts/runqemu-nfs
@@ -93,7 +93,7 @@ fi
93MACHINE=$QEMUARCH 93MACHINE=$QEMUARCH
94TYPE="nfs" 94TYPE="nfs"
95HDIMAGE=$SDK_ROOTFS_DIR 95HDIMAGE=$SDK_ROOTFS_DIR
96CROSSPATH=$NATIVE_SYSROOT_DIR/usr/bin 96CROSSPATH=$POKY_NATIVE_SYSROOT/usr/bin
97. $QEMU_INTERNAL_SCRIPT 97. $QEMU_INTERNAL_SCRIPT
98 98
99# Cleanup 99# Cleanup