Rearrange staging to match target system layout. This is a major change and will require a full rebuild.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3123 311d38ba-8fff-0310-9ca6-ca027cbcb966

5 files changed, 6 insertions, 13 deletions

diff --git a/meta/packages/apt/files/apt.conf b/meta/packages/apt/files/apt.conf
index 9e90616465..2bd9ddbfaf 100644
--- a/meta/packages/apt/files/apt.conf
+++ b/meta/packages/apt/files/apt.conf
@@ -1,4 +1,4 @@
-Dir "${STAGING_DIR}/"
+Dir "${STAGING_DIR_NATIVE}/"
 {
    State "var/lib/apt/"
    {
diff --git a/meta/packages/binutils/binutils-cross.inc b/meta/packages/binutils/binutils-cross.inc
index c63ea687aa..a45a39feab 100644
--- a/meta/packages/binutils/binutils-cross.inc
+++ b/meta/packages/binutils/binutils-cross.inc
@@ -3,7 +3,7 @@ inherit cross
 DEPENDS += "flex-native bison-native"
 PROVIDES = "virtual/${TARGET_PREFIX}binutils"
 PACKAGES = ""
-EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
+EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \
                 --program-prefix=${TARGET_PREFIX}"
 
 do_stage () {
diff --git a/meta/packages/gcc/gcc3-build-cross.inc b/meta/packages/gcc/gcc3-build-cross.inc
index ec285f522b..2b9766975c 100644
--- a/meta/packages/gcc/gcc3-build-cross.inc
+++ b/meta/packages/gcc/gcc3-build-cross.inc
@@ -1,7 +1,9 @@
 USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
 
-EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR}/${TARGET_SYS} \
-                      --with-gxx-include-dir=${STAGING_DIR}/${TARGET_SYS}/include/c++"
+EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \
+                      --with-gxx-include-dir=${STAGING_DIR_TARGET}/${layout_includedir}/c++ \
+                      --with-sysroot=${STAGING_DIR_TARGET} \
+                      --with-build-sysroot=${STAGING_DIR_TARGET}"
 
 do_configure_prepend () {
         rm -f ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
@@ -25,13 +27,6 @@ do_stage_append () {
         rm -f ${CROSS_DIR}/bin/*gcov
         rm -f ${CROSS_DIR}/bin/*gccbug
 
-        # Fix a few include links so cross builds are happier
-        if [ ! -e ${STAGING_INCDIR}/c++ ]; then
-                mkdir -p ${STAGING_INCDIR}
-                ln -sf ${CROSS_DIR}/${TARGET_SYS}/include/c++ \
-                        ${STAGING_INCDIR}/
-        fi
-
         # We use libiberty from binutils
         rm -f ${CROSS_DIR}/lib/libiberty.a
 
diff --git a/meta/packages/qemu/qemu-native_20070613.bb b/meta/packages/qemu/qemu-native_20070613.bb
index a6a5bda58d..28373e273e 100644
--- a/meta/packages/qemu/qemu-native_20070613.bb
+++ b/meta/packages/qemu/qemu-native_20070613.bb
@@ -1,6 +1,5 @@
 require qemu_${PV}.bb
 inherit native
 DEPENDS = "zlib-native"
-prefix = "${STAGING_DIR}/${BUILD_SYS}"
 
 require qemu-gcc3-check.inc
diff --git a/meta/packages/qemu/qemu-native_cvs.bb b/meta/packages/qemu/qemu-native_cvs.bb
index fae6ca2f1b..c87d45b601 100644
--- a/meta/packages/qemu/qemu-native_cvs.bb
+++ b/meta/packages/qemu/qemu-native_cvs.bb
@@ -1,6 +1,5 @@
 require qemu_cvs.bb
 inherit native
 DEPENDS = "zlib-native"
-prefix = "${STAGING_DIR}/${BUILD_SYS}"
 
 require qemu-gcc3-check.inc