From 2e98b80a3a11798145f58c8ccc8b873cd713f4f2 Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Tue, 27 Oct 2015 17:54:30 +0200 Subject: 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] Signed-off-by: Maxin B. John Signed-off-by: Ross Burton --- meta/recipes-devtools/unfs3/unfs3_0.9.22.r490.bb | 1 + scripts/runqemu-export-rootfs | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/unfs3/unfs3_0.9.22.r490.bb b/meta/recipes-devtools/unfs3/unfs3_0.9.22.r490.bb index 45cf54591a..51308955dd 100644 --- a/meta/recipes-devtools/unfs3/unfs3_0.9.22.r490.bb +++ b/meta/recipes-devtools/unfs3/unfs3_0.9.22.r490.bb @@ -29,6 +29,7 @@ SRC_URI = "svn://svn.code.sf.net/p/unfs3/code;module=trunk;rev=${MOD_PV} \ BBCLASSEXTEND = "native nativesdk" inherit autotools +EXTRA_OECONF_append_class-native = " --sbindir=${bindir}" # Turn off these header detects else the inode search # will walk entire file systems and this is a real problem diff --git a/scripts/runqemu-export-rootfs b/scripts/runqemu-export-rootfs index 40ab20143f..3dee131166 100755 --- a/scripts/runqemu-export-rootfs +++ b/scripts/runqemu-export-rootfs @@ -46,8 +46,8 @@ if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then fi . $SYSROOT_SETUP_SCRIPT -if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/sbin/unfsd" ]; then - echo "Error: Unable to find unfsd binary in $OECORE_NATIVE_SYSROOT/usr/sbin/" +if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/bin/unfsd" ]; then + echo "Error: Unable to find unfsd binary in $OECORE_NATIVE_SYSROOT/usr/bin/" if [ "x$OECORE_DISTRO_VERSION" = "x" ]; then echo "Have you run 'bitbake meta-ide-support'?" @@ -115,8 +115,8 @@ case "$1" in fi echo "Starting User Mode nfsd" - echo " $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/sbin/unfsd $UNFSD_OPTS" - $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/sbin/unfsd $UNFSD_OPTS + echo " $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/bin/unfsd $UNFSD_OPTS" + $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/bin/unfsd $UNFSD_OPTS if [ ! $? = 0 ]; then echo "Error starting nfsd" exit 1 -- cgit 1.2.3-korg