r3562 - in developers/john_lee/toolkit: . bin scripts

john_lee at sita.openmoko.org john_lee at sita.openmoko.org
Tue Dec 4 16:12:16 CET 2007


Author: john_lee
Date: 2007-12-04 16:12:10 +0100 (Tue, 04 Dec 2007)
New Revision: 3562

Modified:
   developers/john_lee/toolkit/README
   developers/john_lee/toolkit/bin/om-conf
   developers/john_lee/toolkit/bin/om-make-ipkg
   developers/john_lee/toolkit/scripts/script-env
   developers/john_lee/toolkit/setup-env
Log:
Fix multiple path error


Modified: developers/john_lee/toolkit/README
===================================================================
--- developers/john_lee/toolkit/README	2007-12-04 13:48:57 UTC (rev 3561)
+++ developers/john_lee/toolkit/README	2007-12-04 15:12:10 UTC (rev 3562)
@@ -19,8 +19,8 @@
 
 In your home directory:
 
-$ cp -r /usr/local/openmoko-sample2 ~/
-$ . /usr/local/openmoko/setup-env
+$ cp -r /usr/local/openmoko/arm/share/openmoko-sample2 ~/
+$ . /usr/local/openmoko/arm/setup-env
 $ om-conf openmoko-sample2
 $ om-make-ipkg openmoko-sample2
 

Modified: developers/john_lee/toolkit/bin/om-conf
===================================================================
--- developers/john_lee/toolkit/bin/om-conf	2007-12-04 13:48:57 UTC (rev 3561)
+++ developers/john_lee/toolkit/bin/om-conf	2007-12-04 15:12:10 UTC (rev 3562)
@@ -14,10 +14,10 @@
 	exit 1
 }
 
-test x${OMTOOL_DIR} = x && . /usr/local/openmoko/setup-env
+test x${OMTOOL_DIR} = x && . /usr/local/openmoko/arm/setup-env
 
-. ${OMTOOL_DIR}/scripts/script-env
-. ${OMTOOL_DIR}/scripts/functions
+. ${OMTOOL_DIR}/arm/scripts/script-env
+. ${OMTOOL_DIR}/arm/scripts/functions
 
 test -z $1 && error_exit
 S=$(absolute_path $1)

Modified: developers/john_lee/toolkit/bin/om-make-ipkg
===================================================================
--- developers/john_lee/toolkit/bin/om-make-ipkg	2007-12-04 13:48:57 UTC (rev 3561)
+++ developers/john_lee/toolkit/bin/om-make-ipkg	2007-12-04 15:12:10 UTC (rev 3562)
@@ -7,9 +7,9 @@
 	exit 1
 }
 
-test x${OMTOOL_DIR} = x && . /usr/local/openmoko/setup-env
+test x${OMTOOL_DIR} = x && . /usr/local/openmoko/arm/setup-env
 
-. ${OMTOOL_DIR}/scripts/functions
+. ${OMTOOL_DIR}/arm/scripts/functions
 
 test x$1 = x && error_exit
 S=$(absolute_path $1)

Modified: developers/john_lee/toolkit/scripts/script-env
===================================================================
--- developers/john_lee/toolkit/scripts/script-env	2007-12-04 13:48:57 UTC (rev 3561)
+++ developers/john_lee/toolkit/scripts/script-env	2007-12-04 15:12:10 UTC (rev 3562)
@@ -8,7 +8,7 @@
 # do not modify anything below.
 EXTRA_OEMAKE=
 
-STAGING_DATADIR=${OMTOOL_DIR}/arm-angstrom-linux-gnueabi/share/aclocal
+STAGING_DATADIR=${OMTOOL_DIR}/arm/arm-angstrom-linux-gnueabi/share/aclocal
 BUILD_SYS="x86_64-linux"
 HOST_SYS="arm-angstrom-linux-gnueabi"
 TARGET_SYS="arm-angstrom-linux-gnueabi"

Modified: developers/john_lee/toolkit/setup-env
===================================================================
--- developers/john_lee/toolkit/setup-env	2007-12-04 13:48:57 UTC (rev 3561)
+++ developers/john_lee/toolkit/setup-env	2007-12-04 15:12:10 UTC (rev 3562)
@@ -1,5 +1,5 @@
 export OMTOOL_DIR="/usr/local/openmoko"
-(echo "$PATH" | grep -q "${OMTOOL_DIR}") || export PATH="${OMTOOL_DIR}/bin:${OMTOOL_DIR}/arm/bin:${PATH}"
+(echo "$PATH" | grep -q "${OMTOOL_DIR}") || export PATH="${OMTOOL_DIR}/arm/bin:${PATH}"
 export STRIP="arm-angstrom-linux-gnueabi-strip"
 export LD="arm-angstrom-linux-gnueabi-ld"
 export CC="ccache arm-angstrom-linux-gnueabi-gcc -march=armv4t -mtune=arm920t"





More information about the commitlog mailing list