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>

1 files changed, 8 insertions, 8 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
 fi
 . $SYSROOT_SETUP_SCRIPT
 
-if [ ! -e "$NATIVE_SYSROOT_DIR/usr/sbin/rpc.mountd" ]; then
-        echo "Error: Unable to find rpc.mountd binary in $NATIVE_SYSROOT_DIR/usr/sbin/"
+if [ ! -e "$POKY_NATIVE_SYSROOT/usr/sbin/rpc.mountd" ]; then
+        echo "Error: Unable to find rpc.mountd binary in $POKY_NATIVE_SYSROOT/usr/sbin/"
 
-        if [ "$SYSROOT_MODE" = "in-tree" ]; then
+        if [ "x$POKY_DISTRO_VERSION" = "x" ]; then
             echo "Have you run 'bitbake unfs-server-native'?"
         else
             echo "This shouldn't happen - something is missing from your toolchain installation"
@@ -67,7 +67,7 @@ RMTAB=~/.poky-sdk/rmtab$TARGET_VIRT_INSTANCE
 NFSPID=~/.poky-sdk/nfs$TARGET_VIRT_INSTANCE.pid
 MOUNTPID=~/.poky-sdk/mount$TARGET_VIRT_INSTANCE.pid
 
-PSEUDO_OPTS="-P $NATIVE_SYSROOT_DIR/usr"
+PSEUDO_OPTS="-P $POKY_NATIVE_SYSROOT/usr"
 PSEUDO_LOCALSTATEDIR="$NFS_EXPORT_DIR/var/pseudo"
 export PSEUDO_LOCALSTATEDIR
 
@@ -100,8 +100,8 @@ fi
 case "$1" in
   start)
         echo "Starting User Mode rpc.mountd"
-        echo "  $PSEUDO $PSEUDO_OPTS $NATIVE_SYSROOT_DIR/usr/sbin/rpc.mountd $MOUNTD_OPTS"
-        $PSEUDO $PSEUDO_OPTS $NATIVE_SYSROOT_DIR/usr/sbin/rpc.mountd $MOUNTD_OPTS
+        echo "  $PSEUDO $PSEUDO_OPTS $POKY_NATIVE_SYSROOT/usr/sbin/rpc.mountd $MOUNTD_OPTS"
+        $PSEUDO $PSEUDO_OPTS $POKY_NATIVE_SYSROOT/usr/sbin/rpc.mountd $MOUNTD_OPTS
         if [ ! $? = 0 ] ; then
             echo "====================="
             echo "Error starting MOUNTD"
@@ -123,8 +123,8 @@ case "$1" in
             exit 1
         fi
         echo "Starting User Mode nfsd"
-        echo "  $PSEUDO $PSEUDO_OPTS $NATIVE_SYSROOT_DIR/usr/sbin/rpc.nfsd $NFSD_OPTS"
-        $PSEUDO $PSEUDO_OPTS $NATIVE_SYSROOT_DIR/usr/sbin/rpc.nfsd $NFSD_OPTS
+        echo "  $PSEUDO $PSEUDO_OPTS $POKY_NATIVE_SYSROOT/usr/sbin/rpc.nfsd $NFSD_OPTS"
+        $PSEUDO $PSEUDO_OPTS $POKY_NATIVE_SYSROOT/usr/sbin/rpc.nfsd $NFSD_OPTS
         if [ ! $? = 0 ] ; then
             echo "Error starting nfsd"
             exit 1