17 files changed, 38 insertions, 48 deletions

diff --git a/handbook/development.xml b/handbook/development.xml
index 346bb85bf5..e6fb826d33 100644
--- a/handbook/development.xml
+++ b/handbook/development.xml
@@ -499,7 +499,7 @@ $ bitbake matchbox-desktop -c devshell
                 the gdb-cross package so for example you would run:
                 <programlisting>bitbake gdb-cross</programlisting>
                 Once built, the cross gdb binary can be found at
-                <programlisting>tmp/cross/bin/&lt;target-abi&gt;-gdb </programlisting>
+                <programlisting>tmp/sysroots/&lt;host-arch&lt;/usr/bin/&lt;target-abi&gt;-gdb </programlisting>
             </para>
 
         </section>
diff --git a/handbook/ref-structure.xml b/handbook/ref-structure.xml
index c80097ee18..3cc7295b7e 100644
--- a/handbook/ref-structure.xml
+++ b/handbook/ref-structure.xml
@@ -166,15 +166,6 @@
         </para>
     </section>
 
-    <section id='structure-build-tmp-cross'>
-        <title><filename class="directory">build/tmp/cross/</filename></title>
-
-        <para>
-            The cross compiler when generated is placed into this directory and those
-            beneath it.
-        </para>
-    </section>
-
     <section id='structure-build-tmp-deploy'>
         <title><filename class="directory">build/tmp/deploy/</filename></title>
 
diff --git a/meta-openmoko/packages/openmoko2/openmoko-browser2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-browser2_svn.bb
index c7f3066946..6d8349313f 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-browser2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-browser2_svn.bb
@@ -5,7 +5,6 @@ PV = "0.0.1+svnr${SRCREV}"
 PR = "r2"
 
 inherit openmoko2
-LDFLAGS_append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib"
 
 SRC_URI += "file://webkit-update.patch;patch=1;minrev=3646;maxrev=4171"
 
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass
index b7b449f478..56b0db8d6a 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/meta/classes/cross-canadian.bbclass
@@ -17,7 +17,7 @@ INHIBIT_DEFAULT_DEPS = "1"
 STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}-nativesdk"
 STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}"
 
-PATH_append = ":${TMPDIR}/cross/${HOST_ARCH}/${bindir_cross}"
+PATH_append = ":${TMPDIR}/sysroots/${HOST_ARCH}/${bindir_cross}"
 PKGDATA_DIR = "${TMPDIR}/pkgdata/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}"
 PKGHIST_DIR = "${TMPDIR}/pkghistory/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}/"
 
@@ -36,7 +36,7 @@ DEPENDS_GETTEXT = "gettext-native gettext-nativesdk"
 
 # Path mangling needed by the cross packaging
 # Note that we use := here to ensure that libdir and includedir are
-# target paths, not CROSS_DIR paths.
+# target paths.
 target_libdir := "${libdir}"
 target_includedir := "${includedir}"
 target_base_libdir := "${base_libdir}"
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index 30f136f150..5720cdbcc6 100644
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -32,7 +32,7 @@ DEPENDS_GETTEXT = "gettext-native"
 
 # Path mangling needed by the cross packaging
 # Note that we use := here to ensure that libdir and includedir are
-# target paths, not CROSS_DIR paths.
+# target paths.
 target_libdir := "${libdir}"
 target_includedir := "${includedir}"
 target_base_libdir := "${base_libdir}"
diff --git a/meta/classes/module_strip.bbclass b/meta/classes/module_strip.bbclass
index 63e6569799..7636f1f403 100644
--- a/meta/classes/module_strip.bbclass
+++ b/meta/classes/module_strip.bbclass
@@ -9,8 +9,8 @@ do_strip_modules () {
                                         if ! [ -d "$module"  ] ; then
                                                 ${STRIP} -v -g $module
                                         fi
-                                done    
-#                               NM="${CROSS_DIR}/bin/${HOST_PREFIX}nm" OBJCOPY="${CROSS_DIR}/bin/${HOST_PREFIX}objcopy" strip_module $modules
+                                done
+#                               NM="${STAGING_BINDIR_NATIVE}/${HOST_PREFIX}nm" OBJCOPY="${STAGING_BINDIR_NATIVE}/${HOST_PREFIX}objcopy" strip_module $modules
                         fi
                 fi
         done
diff --git a/meta/packages/binutils/binutils-cross.inc b/meta/packages/binutils/binutils-cross.inc
index e67582ba98..f784a66ce0 100644
--- a/meta/packages/binutils/binutils-cross.inc
+++ b/meta/packages/binutils/binutils-cross.inc
@@ -12,16 +12,16 @@ do_install () {
         oe_runmake 'DESTDIR=${D}' install
 
         # We don't really need these, so we'll remove them...
-        rm -rf ${D}${CROSS_DIR}/lib/ldscripts
-        rm -rf ${D}${CROSS_DIR}/share/info
-        rm -rf ${D}${CROSS_DIR}/share/locale
-        rm -rf ${D}${CROSS_DIR}/share/man
-        rmdir ${D}${CROSS_DIR}/share || :
-        rmdir ${D}${CROSS_DIR}/${libdir}/gcc-lib || :
-        rmdir ${D}${CROSS_DIR}/${libdir}64/gcc-lib || :
-        rmdir ${D}${CROSS_DIR}/${libdir} || :
-        rmdir ${D}${CROSS_DIR}/${libdir}64 || :
-        rmdir ${D}${CROSS_DIR}/${prefix} || :
+        rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/lib/ldscripts
+        rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/share/info
+        rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/share/locale
+        rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/share/man
+        rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/share || :
+        rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir}/gcc-lib || :
+        rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir}64/gcc-lib || :
+        rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir} || :
+        rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir}64 || :
+        rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${prefix} || :
 }
 
 do_stage () {
diff --git a/meta/packages/gcc/gcc-configure-sdk.inc b/meta/packages/gcc/gcc-configure-sdk.inc
index 6738496219..3803902a58 100644
--- a/meta/packages/gcc/gcc-configure-sdk.inc
+++ b/meta/packages/gcc/gcc-configure-sdk.inc
@@ -6,7 +6,7 @@ USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d
 
 EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
                       --with-gxx-include-dir=${prefix}/${TARGET_SYS}${target_includedir}/c++/${BINV}/ \
-                      --with-build-time-tools=${CROSS_DIR}/${TARGET_SYS}/bin \
+                      --with-build-time-tools=${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin \
                       --with-sysroot=${prefix}/${TARGET_SYS} \
                       --with-build-sysroot=${STAGING_DIR_TARGET}"
 
@@ -14,18 +14,18 @@ EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix}
 # gcc-cross looks and finds these in ${exec_prefix} but we're not so lucky
 # for the sdk. Hardcoding the paths ensures the build doesn't go canadian or worse.
 #
-export AR_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/ar"
-export AS_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/as"
-export DLLTOOL_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/dlltool"
+export AR_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/ar"
+export AS_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/as"
+export DLLTOOL_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/dlltool"
 export CC_FOR_TARGET = "${TARGET_SYS}-gcc"
 export CXX_FOR_TARGET = "${TARGET_SYS}-g++"
 export LD_FOR_TARGET = "${TARGET_SYS}-ld"
-export LIPO_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/lipo"
-export NM_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/nm"
-export OBJDUMP_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/objdump"
-export RANLIB_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/ranlib"
-export STRIP_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/strip"
-export WINDRES_FOR_TARGET = "${CROSS_DIR}/${TARGET_SYS}/bin/windres"
+export LIPO_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/lipo"
+export NM_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/nm"
+export OBJDUMP_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/objdump"
+export RANLIB_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/ranlib"
+export STRIP_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/strip"
+export WINDRES_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/windres"
 
 #
 # We need to override this and make sure the compiler can find staging
diff --git a/meta/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb b/meta/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb
index a3664710f1..06211033b8 100644
--- a/meta/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb
+++ b/meta/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb
@@ -5,6 +5,6 @@ S = "${WORKDIR}/gcc-4.2"
 
 # Hack till we fix *libc properly
 do_install_append() {
-        ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/
+        ln -sf ${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/${BINV}/include/
 }
 
diff --git a/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb b/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
index b6d3a3a642..8a8f21a575 100644
--- a/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
+++ b/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
@@ -5,6 +5,6 @@ S = "${WORKDIR}/gcc-4.2"
 
 # Hack till we fix *libc properly
 do_install_append() {
-        ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/
+        ln -sf ${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/${BINV}/include/
 }
 
diff --git a/meta/packages/gcc/gcc-cross-kernel.inc b/meta/packages/gcc/gcc-cross-kernel.inc
index c602d72514..02d44583c9 100644
--- a/meta/packages/gcc/gcc-cross-kernel.inc
+++ b/meta/packages/gcc/gcc-cross-kernel.inc
@@ -6,7 +6,7 @@ PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}"
 do_install () {
         cd gcc
         oe_runmake 'DESTDIR=${D}' install-common install-headers install-libgcc
-        install -m 0755 xgcc ${D}${CROSS_DIR}/bin/${TARGET_PREFIX}gcc-${PV}
+        install -m 0755 xgcc ${D}${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}gcc-${PV}
 }
 
 do_stage () {
diff --git a/meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb b/meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb
index a1581c2aa1..77f309c5a6 100644
--- a/meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb
+++ b/meta/packages/gcc/gcc-cross_csl-arm-2008q1.bb
@@ -16,9 +16,9 @@ LDFLAGS = ""
 
 # staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain
 do_compile_prepend() {
-        ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/
-        ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/
-        ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/ 
+        ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/
+        ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/
+        ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/ 
         sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure
 
 }
diff --git a/meta/packages/gcc/gcc-package-cross.inc b/meta/packages/gcc/gcc-package-cross.inc
index 04ae78a88b..449c8b548b 100644
--- a/meta/packages/gcc/gcc-package-cross.inc
+++ b/meta/packages/gcc/gcc-package-cross.inc
@@ -13,7 +13,7 @@ do_install () {
 
         # Remove things we don't need but keep share/java
         for d in info man share/doc share/locale share/man share/info; do
-                rm -rf ${D}${CROSS_DIR}/$d
+                rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/$d
         done
 
         # gcc-runtime requires some headers, we stash them here
diff --git a/meta/packages/gstreamer/gst-ffmpeg_0.10.1.bb b/meta/packages/gstreamer/gst-ffmpeg_0.10.1.bb
index ad5ab59af4..65d60f9cea 100644
--- a/meta/packages/gstreamer/gst-ffmpeg_0.10.1.bb
+++ b/meta/packages/gstreamer/gst-ffmpeg_0.10.1.bb
@@ -24,7 +24,7 @@ EXTRA_OECONF = "--disable-sdltest --disable-ffplay --disable-freetypetest \
 
 # We do this because the install program is called with -s which causes it to
 # call "strip" and it then mangles cross compiled stuff..
-PATH_prepend="${CROSS_DIR}/${TARGET_SYS}/bin:"
+PATH_prepend="${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin:"
 
 # Hack to get STAGING_LIBDIR into the linker path when building ffmpeg
 CC = "${CCACHE} ${HOST_PREFIX}gcc -L${STAGING_LIBDIR}"
diff --git a/meta/packages/perl/perl_5.8.8.bb b/meta/packages/perl/perl_5.8.8.bb
index 1537a46b5d..5060705372 100644
--- a/meta/packages/perl/perl_5.8.8.bb
+++ b/meta/packages/perl/perl_5.8.8.bb
@@ -144,7 +144,7 @@ perl_package_preprocess () {
                    -e "s,${STAGING_LIBDIR},${libdir},g" \
                    -e "s,${STAGING_BINDIR},${bindir},g" \
                    -e "s,${STAGING_INCDIR},${includedir},g" \
-                   -e "s,${CROSS_DIR}${base_bindir}/,,g" \
+                   -e "s,${STAGING_BINDIR_NATIVE}/,,g" \
                 ${PKGD}${bindir}/h2xs \
                 ${PKGD}${bindir}/h2ph \
                 ${PKGD}${datadir}/perl/${PV}/pod/*.pod \
diff --git a/meta/packages/uclibc/uclibc-initial_0.9.30.1.bb b/meta/packages/uclibc/uclibc-initial_0.9.30.1.bb
index d0491fcc67..6d21d3a2c5 100644
--- a/meta/packages/uclibc/uclibc-initial_0.9.30.1.bb
+++ b/meta/packages/uclibc/uclibc-initial_0.9.30.1.bb
@@ -9,7 +9,7 @@ do_install() {
         # Install initial headers into the cross dir
         make V=1 CC="${CC}" PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
                 install_headers
-        #ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
+        #ln -sf include ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/sys-include
 
         # This conflicts with the c++ version of this header
         rm -f ${D}${includedir}/bits/atomicity.h
diff --git a/scripts/runqemu b/scripts/runqemu
index ff3c3045ad..2ab01d9257 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -69,7 +69,7 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o
     if [ "x$ZIMAGE" = "x" ]; then
         ZIMAGE=$BUILDDIR/tmp/deploy/images/zImage-$MACHINE.bin
     fi
-    CROSSPATH=$BUILDDIR/tmp/cross/arm-poky-linux-gnueabi/bin
+    CROSSPATH=$BUILDDIR/sysroots/$BUILD_SYS/arm-poky-linux-gnueabi/bin
 fi
 
 function findimage {
@@ -137,7 +137,7 @@ if [ "$MACHINE" = "qemux86" ]; then
             findimage $T qemux86 ext3 "moblin-image-sdk moblin-image-netbook poky-image-sdk poky-image-sato poky-image-minimal"
         fi
     fi
-    CROSSPATH=$BUILDDIR/tmp/cross/i586-poky-linux/bin
+    CROSSPATH=$BUILDDIR/sysroots/$BUILD_SYS/i586-poky-linux/bin
 fi
 
 if [ ! -e $CROSSPATH/cc ]; then