summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-21 11:44:08 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-21 12:56:10 +0100
commit01f83c9e093d562e1beeece7a5f79467c2651849 (patch)
treed6b42addb11013e68f340e7400d31892782f0f91
parentb9fbc85938deaa18354cefa548026d3dc966e5c2 (diff)
downloadpoky-01f83c9e093d562e1beeece7a5f79467c2651849.tar.gz
Rename ~/.poky-sdk/ temp workdir to ~/.runqemu-sdk/
(From OE-Core rev: 69a0bfb8d7203db1c477dc28974287fda35d1a50) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/runqemu-export-rootfs12
-rw-r--r--scripts/runqemu-extract-sdk2
-rwxr-xr-xscripts/runqemu-internal2
3 files changed, 8 insertions, 8 deletions
diff --git a/scripts/runqemu-export-rootfs b/scripts/runqemu-export-rootfs
index 0076768d20..ae724bd63e 100644
--- a/scripts/runqemu-export-rootfs
+++ b/scripts/runqemu-export-rootfs
@@ -57,15 +57,15 @@ if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/sbin/rpc.mountd" ]; then
57 exit 1 57 exit 1
58fi 58fi
59 59
60if [ ! -d ~/.poky-sdk ]; then 60if [ ! -d ~/.runqemu-sdk ]; then
61 mkdir -p ~/.poky-sdk 61 mkdir -p ~/.runqemu-sdk
62fi 62fi
63 63
64NFS_INSTANCE=${NFS_INSTANCE:=0} 64NFS_INSTANCE=${NFS_INSTANCE:=0}
65EXPORTS=~/.poky-sdk/exports$NFS_INSTANCE 65EXPORTS=~/.runqemu-sdk/exports$NFS_INSTANCE
66RMTAB=~/.poky-sdk/rmtab$NFS_INSTANCE 66RMTAB=~/.runqemu-sdk/rmtab$NFS_INSTANCE
67NFSPID=~/.poky-sdk/nfs$NFS_INSTANCE.pid 67NFSPID=~/.runqemu-sdk/nfs$NFS_INSTANCE.pid
68MOUNTPID=~/.poky-sdk/mount$NFS_INSTANCE.pid 68MOUNTPID=~/.runqemu-sdk/mount$NFS_INSTANCE.pid
69 69
70PSEUDO_OPTS="-P $OECORE_NATIVE_SYSROOT/usr" 70PSEUDO_OPTS="-P $OECORE_NATIVE_SYSROOT/usr"
71PSEUDO_LOCALSTATEDIR="$NFS_EXPORT_DIR/var/pseudo" 71PSEUDO_LOCALSTATEDIR="$NFS_EXPORT_DIR/var/pseudo"
diff --git a/scripts/runqemu-extract-sdk b/scripts/runqemu-extract-sdk
index ed349dd306..50a9c316be 100644
--- a/scripts/runqemu-extract-sdk
+++ b/scripts/runqemu-extract-sdk
@@ -21,7 +21,7 @@
21# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 21# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22 22
23function usage() { 23function usage() {
24 echo "Usage: $0 <poky-sdk-tarball> <extract-dir>" 24 echo "Usage: $0 <runqemu-sdk-tarball> <extract-dir>"
25} 25}
26 26
27if [ $# -ne 2 ]; then 27if [ $# -ne 2 ]; then
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index adf2b47aae..afe97b5f9d 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -246,7 +246,7 @@ if [ "$FSTYPE" = "nfs" ]; then
246 NFSD_PORT=$[ 11111 + $NFS_INSTANCE ] 246 NFSD_PORT=$[ 11111 + $NFS_INSTANCE ]
247 UNFS_OPTS="nfsvers=2,mountprog=$MOUNTD_PORT,nfsprog=$NFSD_PORT,udp" 247 UNFS_OPTS="nfsvers=2,mountprog=$MOUNTD_PORT,nfsprog=$NFSD_PORT,udp"
248 248
249 PSEUDO_LOCALSTATEDIR=~/.poky-sdk/pseudo 249 PSEUDO_LOCALSTATEDIR=~/.runqemu-sdk/pseudo
250 export PSEUDO_LOCALSTATEDIR 250 export PSEUDO_LOCALSTATEDIR
251 251
252 rpcbind_running=`ps ax | grep rpcbind | grep -v grep | wc -l` 252 rpcbind_running=`ps ax | grep rpcbind | grep -v grep | wc -l`