summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2015-10-27 15:54:30 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-29 07:31:17 (GMT)
commit24cfcc4ac06e7768fd9ce19930bfabd321af472c (patch)
tree589ada52b63c23335706f73cbd6e4505c2ff69c2 /scripts
parentda386d3d21cb4f87336f200906b717387d3a8c21 (diff)
downloadpoky-24cfcc4ac06e7768fd9ce19930bfabd321af472c.tar.gz
runqemu-export-rootfs: update location of unfsd binary
oe-core commit: 24b80d211f3808a0ffebee426932f11b8d4d46e0 sets sbindir = "${bindir}" in the nativesdk class. So, update the location of unfsd binary from "/usr/sbin" to "/usr/bin" in runqemu-export-rootfs. Also update unfs3-native to install unfsd under "bin" directory so the binary is always in the same location. [YOCTO #8315] (From OE-Core rev: 2e98b80a3a11798145f58c8ccc8b873cd713f4f2) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/runqemu-export-rootfs8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/runqemu-export-rootfs b/scripts/runqemu-export-rootfs
index 40ab201..3dee131 100755
--- a/scripts/runqemu-export-rootfs
+++ b/scripts/runqemu-export-rootfs
@@ -46,8 +46,8 @@ if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then
46fi 46fi
47. $SYSROOT_SETUP_SCRIPT 47. $SYSROOT_SETUP_SCRIPT
48 48
49if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/sbin/unfsd" ]; then 49if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/bin/unfsd" ]; then
50 echo "Error: Unable to find unfsd binary in $OECORE_NATIVE_SYSROOT/usr/sbin/" 50 echo "Error: Unable to find unfsd binary in $OECORE_NATIVE_SYSROOT/usr/bin/"
51 51
52 if [ "x$OECORE_DISTRO_VERSION" = "x" ]; then 52 if [ "x$OECORE_DISTRO_VERSION" = "x" ]; then
53 echo "Have you run 'bitbake meta-ide-support'?" 53 echo "Have you run 'bitbake meta-ide-support'?"
@@ -115,8 +115,8 @@ case "$1" in
115 fi 115 fi
116 116
117 echo "Starting User Mode nfsd" 117 echo "Starting User Mode nfsd"
118 echo " $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/sbin/unfsd $UNFSD_OPTS" 118 echo " $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/bin/unfsd $UNFSD_OPTS"
119 $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/sbin/unfsd $UNFSD_OPTS 119 $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/bin/unfsd $UNFSD_OPTS
120 if [ ! $? = 0 ]; then 120 if [ ! $? = 0 ]; then
121 echo "Error starting nfsd" 121 echo "Error starting nfsd"
122 exit 1 122 exit 1