merge of '13924b6ed700ce1a3e3b1fca1d40f3d76389688a'

     and 'b93aeec0119f1318d2b0f72f074bfff67bc23942'

75 files changed, 533 insertions, 448 deletions

diff --git a/packages/agg/agg_2.5.bb b/packages/agg/agg_2.5.bb
index 84bbb4d4bb..f91d0112be 100644
--- a/packages/agg/agg_2.5.bb
+++ b/packages/agg/agg_2.5.bb
@@ -13,7 +13,7 @@ S = "${WORKDIR}/${P}"
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = "--with-sdl-exec-prefix=${STAGING_DIR}/${BUILD_SYS}"
+EXTRA_OECONF = "--with-sdl-exec-prefix=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
 CFLAGS += " -I{$STAGING_INCDIR} "
 
 PACKAGES =+ "${PN}-sdl ${PN}-x11"
diff --git a/packages/avetanabt/avetanabt_20060413.bb b/packages/avetanabt/avetanabt_20060413.bb
index be88139319..54e3d845bb 100644
--- a/packages/avetanabt/avetanabt_20060413.bb
+++ b/packages/avetanabt/avetanabt_20060413.bb
@@ -24,7 +24,7 @@ do_compile() {
   # generate classes
   # javac -> jikes
   ${STAGING_BINDIR_NATIVE}/find {de,javax,com} -iname *.java > file.list
-  ${STAGING_BINDIR_NATIVE}/jikes -verbose --bootclasspath ${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d build @file.list
+  ${STAGING_BINDIR_NATIVE}/jikes -verbose --bootclasspath ${STAGING_DATADIR_NATIVE}/kaffeh/rt.jar -d build @file.list
 
   # create own version.xml (add version information available at runtime)
   head -n 4 version.xml >> build/version.xml
@@ -37,7 +37,7 @@ do_compile() {
 
   # JNI generated header file - de_avetana_bluetooth_stack_BlueZ.h
   # javah -> kaffeh
-  ${STAGING_BINDIR_NATIVE}/kaffeh -jni -classpath avetanaBT.jar:${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d c de.avetana.bluetooth.stack.BlueZ
+  ${STAGING_BINDIR_NATIVE}/kaffeh -jni -classpath avetanaBT.jar:${STAGING_DATADIR_NATIVE}/kaffeh/rt.jar -d c de.avetana.bluetooth.stack.BlueZ
 
   # Native language (C) library - libavetanaBT.so
   ${CXX} ${CXXFLAGS}  -shared -lbluetooth -I${STAGING_INCDIR}/classpath c/BlueZ.cpp -o libavetanaBT.so ${LDFLAGS}
@@ -46,8 +46,8 @@ do_compile() {
 
 do_stage() {
 
-  install -d ${STAGING_DIR}/${BUILD_SYS}/share/avetanabt
-  install avetanaBT.jar ${STAGING_DIR}/${BUILD_SYS}/share/avetanabt/
+  install -d ${STAGING_DATADIR_NATIVE}/avetanabt
+  install avetanaBT.jar ${STAGING_DATADIR_NATIVE}/avetanabt/
 
 }
 
diff --git a/packages/avetanabt/avetanabt_cvs.bb b/packages/avetanabt/avetanabt_cvs.bb
index a5c9ce0ac7..a8f795989b 100644
--- a/packages/avetanabt/avetanabt_cvs.bb
+++ b/packages/avetanabt/avetanabt_cvs.bb
@@ -27,7 +27,7 @@ do_compile() {
   # generate classes
   # javac -> jikes
   ${STAGING_BINDIR_NATIVE}/find {de,javax,com} -iname *.java > file.list
-  ${STAGING_BINDIR_NATIVE}/jikes -verbose --bootclasspath ${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d build @file.list
+  ${STAGING_BINDIR_NATIVE}/jikes -verbose --bootclasspath ${STAGING_DATADIR_NATIVE}/kaffeh/rt.jar -d build @file.list
 
   # create own version.xml (add version information available at runtime)
   head -n 4 version.xml >> build/version.xml
@@ -40,7 +40,7 @@ do_compile() {
 
   # JNI generated header file - de_avetana_bluetooth_stack_BlueZ.h
   # javah -> kaffeh
-  ${STAGING_BINDIR_NATIVE}/kaffeh -jni -classpath avetanaBT.jar:${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d c de.avetana.bluetooth.stack.BlueZ
+  ${STAGING_BINDIR_NATIVE}/kaffeh -jni -classpath avetanaBT.jar:${STAGING_DATADIR_NATIVE}/kaffeh/rt.jar -d c de.avetana.bluetooth.stack.BlueZ
 
   # Native language (C) library - libavetanaBT.so
   ${CXX} ${CXXFLAGS}  -shared -lbluetooth -I${STAGING_INCDIR}/classpath c/BlueZ.cpp -o libavetanaBT.so ${LDFLAGS}
@@ -49,8 +49,8 @@ do_compile() {
 
 do_stage() {
 
-  install -d ${STAGING_DIR}/${BUILD_SYS}/share/avetanabt
-  install avetanaBT.jar ${STAGING_DIR}/${BUILD_SYS}/share/avetanabt/
+  install -d ${STAGING_DATADIR_NATIVE}/avetanabt
+  install avetanaBT.jar ${STAGING_DATADIR_NATIVE}/avetanabt/
 
 }
 
diff --git a/packages/crimsonfields/crimsonfields_0.4.8.bb b/packages/crimsonfields/crimsonfields_0.4.8.bb
index 6c36c1fca6..6e84c46570 100644
--- a/packages/crimsonfields/crimsonfields_0.4.8.bb
+++ b/packages/crimsonfields/crimsonfields_0.4.8.bb
@@ -17,9 +17,9 @@ do_configure() {
 	oe_runconf
 	for binary in ${HOST_TOOLS}
 	do
-		install -m 0755 ${STAGING_DIR}/${BUILD_SYS}/bin/$binary	tools/
+		install -m 0755 ${STAGING_BINDIR_NATIVE}/$binary tools/
 	done
-	install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/default.* tools/
+	install -m 0644 ${STAGING_DATADIR_NATIVE}/default.* tools/
 }
 
 do_install() {
diff --git a/packages/dbus/dbus-c++-native_svn.bb b/packages/dbus/dbus-c++-native_svn.bb
index 96eb2f3227..5599aeb1d2 100644
--- a/packages/dbus/dbus-c++-native_svn.bb
+++ b/packages/dbus/dbus-c++-native_svn.bb
@@ -4,3 +4,18 @@ inherit native
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-c++"
 # actually dbus-native and expat-native, but even the bearest build machine should have that nowadays...
 DEPENDS = ""
+
+do_compile() {
+	oe_runmake -C src libdbus-c++-1.la
+	oe_runmake -C tools dbusxx-xml2cpp
+	install -m 0755 tools/dbusxx-xml2cpp ${STAGING_BINDIR_NATIVE}
+}
+
+do_stage() {
+    autotools_stage_all
+}
+
+do_install() {
+	:
+}
+
diff --git a/packages/dbus/dbus-c++_svn.bb b/packages/dbus/dbus-c++_svn.bb
index ea6c0fa8ea..5be58741dc 100644
--- a/packages/dbus/dbus-c++_svn.bb
+++ b/packages/dbus/dbus-c++_svn.bb
@@ -3,8 +3,8 @@ LICENSE = "LGPL"
 SECTION = "libs"
 DEPENDS = "dbus dbus-c++-native expat"
 
-SRC_URI = "svn://dev.openwengo.org/svn/openwengo/wengophone-ng/branches/wengophone-dbus-api/libs;module=dbus;proto=http \
-           file://fix-linking.patch;patch=1"
+SRC_URI = "svn://dev.openwengo.org/svn/openwengo/wengophone-ng/branches/wengophone-dbus-api/libs;module=dbus;proto=http"
+#           file://fix-linking.patch;patch=1"
 S = "${WORKDIR}/dbus"
 
 inherit autotools pkgconfig
@@ -13,10 +13,6 @@ do_compile_prepend() {
 	find . -name "Makefile.am" |xargs sed -i -e 's,$(top_builddir)/tools/dbusxx-xml2cpp,dbusxx-xml2cpp,'
 }
 
-do_stage() {
-	autotools_stage_all
-}
-
 FILES_${PN}-dbg += "${bindir}/dbusxx-xml2cpp ${bindir}/dbusxx-introspect"
 FILES_${PN}-dev += "${bindir}/.dev"
 FILES_${PN} = "${libdir}/*.so.*"
diff --git a/packages/dbus/dbus-glib_0.74.bb b/packages/dbus/dbus-glib_0.74.bb
index 3754abb708..0a34c738c3 100644
--- a/packages/dbus/dbus-glib_0.74.bb
+++ b/packages/dbus/dbus-glib_0.74.bb
@@ -15,8 +15,8 @@ FILES_${PN} = "${libdir}/lib*.so.*"
 FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
 
 do_configure_prepend() {
-	install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-bus-introspect.xml ${S}/tools/
-	install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-glib-bindings.h ${S}/tools/
+	install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml ${S}/tools/
+	install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/
 }
 
 do_stage () {
diff --git a/packages/ezx/ezxd_svn.bb b/packages/ezx/ezxd_svn.bb
index 5493ad2fe8..86c3dc0aba 100644
--- a/packages/ezx/ezxd_svn.bb
+++ b/packages/ezx/ezxd_svn.bb
@@ -4,7 +4,7 @@ SECTION = "devel"
 AUTHOR = "Daniel Ribeiro"
 
 PV = "0.0+svnr${SRCREV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "svn://svn.openezx.org/trunk/src/userspace/;module=ezxd;proto=http \
            file://ezxd.init \
@@ -37,4 +37,5 @@ fakeroot do_install() {
 }
 
 FILES_${PN} += "/dev"
+CONFFILES_${PN} += "${sysconfdir}/ezxd.conf"
 
diff --git a/packages/fontconfig/fontconfig_2.4.1.bb b/packages/fontconfig/fontconfig_2.4.1.bb
index cdfc28fb38..38eeb960f7 100644
--- a/packages/fontconfig/fontconfig_2.4.1.bb
+++ b/packages/fontconfig/fontconfig_2.4.1.bb
@@ -45,7 +45,7 @@ do_stage () {
 	for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
 }
 
-BUILD_CFLAGS += " -I${STAGING_DIR}/${BUILD_SYS}/include/freetype2"
+BUILD_CFLAGS += " -I${STAGING_INCDIR_NATIVE}/freetype2"
 
 do_configure_append () {
 	sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile
diff --git a/packages/frodo/frodo_4.2.bb b/packages/frodo/frodo_4.2.bb
index b3a4463451..6535b5e2bb 100644
--- a/packages/frodo/frodo_4.2.bb
+++ b/packages/frodo/frodo_4.2.bb
@@ -17,7 +17,7 @@ S = "${WORKDIR}/Frodo4/Src"
 
 inherit autotools
 
-EXTRA_OECONF = "--disable-sdltest --enable-qtopia --with-sdl-exec-prefix=${STAGING_DIR}/${BUILD_SYS}"
+EXTRA_OECONF = "--disable-sdltest --enable-qtopia --with-sdl-exec-prefix=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
 
 do_install() {
         install -d ${D}${palmtopdir}/bin \
diff --git a/packages/gcc/gcc-cross-sdk_4.1.2.bb b/packages/gcc/gcc-cross-sdk_4.1.2.bb
index 238f5c2fd0..450dc82b08 100644
--- a/packages/gcc/gcc-cross-sdk_4.1.2.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.2.bb
@@ -10,4 +10,4 @@ require gcc_${PV}.bb
 require gcc4-build-sdk.inc
 require gcc-package-sdk.inc
 
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR}/${BUILD_SYS}"
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb
index 0328f45cfb..bfcfac2033 100644
--- a/packages/gcc/gcc-cross_4.1.0.bb
+++ b/packages/gcc/gcc-cross_4.1.0.bb
@@ -15,4 +15,4 @@ require gcc3-build-cross.inc
 # cross packaging
 require gcc-package-cross.inc
 
-EXTRA_OECONF += "--with-mpfr=${STAGING_DIR}/${BUILD_SYS}"
+EXTRA_OECONF += "--with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb
index 55d2cbde15..8a66ce250e 100644
--- a/packages/gcc/gcc-cross_4.1.1.bb
+++ b/packages/gcc/gcc-cross_4.1.1.bb
@@ -17,4 +17,4 @@ require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR}/${BUILD_SYS}"
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb
index 629e87b653..8204e2c316 100644
--- a/packages/gcc/gcc-cross_4.1.2.bb
+++ b/packages/gcc/gcc-cross_4.1.2.bb
@@ -17,4 +17,4 @@ require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR}/${BUILD_SYS}"
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb
index 3272876326..da27c68d9a 100644
--- a/packages/gcc/gcc-cross_4.2.1.bb
+++ b/packages/gcc/gcc-cross_4.2.1.bb
@@ -17,4 +17,4 @@ require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR}/${BUILD_SYS}"
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb
index 9025a98f3c..1d5ebdcc61 100644
--- a/packages/gcc/gcc-cross_4.2.2.bb
+++ b/packages/gcc/gcc-cross_4.2.2.bb
@@ -17,4 +17,4 @@ require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR}/${BUILD_SYS}"
+EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb
index 7abac644bc..da33cca3fa 100644
--- a/packages/glibc/eglibc_svn.bb
+++ b/packages/glibc/eglibc_svn.bb
@@ -14,8 +14,8 @@ PACKAGES_DYNAMIC = "libc6*"
 RPROVIDES_${PN}-dev = "libc6-dev"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
-BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
-TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
+BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
+TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
 
 GLIBC_ADDONS ?= "ports,nptl,libidn"
 
diff --git a/packages/glibc/glibc-initial.inc b/packages/glibc/glibc-initial.inc
index 9355320b3a..288cb082a5 100644
--- a/packages/glibc/glibc-initial.inc
+++ b/packages/glibc/glibc-initial.inc
@@ -30,14 +30,14 @@ do_compile () {
 }
 
 do_stage () {
-	oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include prefix="" install-headers
+	oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} includedir='${layout_includedir}' prefix='${layout_prefix}' install-headers
 
 	# Two headers -- stubs.h and features.h -- aren't installed by install-headers,
 	# so do them by hand.  We can tolerate an empty stubs.h for the moment.
 	# See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
-	mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu
-	touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h
-	cp ${S}/include/features.h ${STAGING_DIR}/${HOST_SYS}/include/features.h
+	mkdir -p ${STAGING_INCDIR}/gnu
+	touch ${STAGING_INCDIR}/gnu/stubs.h
+	cp ${S}/include/features.h ${STAGING_INCDIR}/features.h
 }
 
 do_install () {
diff --git a/packages/glibc/glibc-stage.inc b/packages/glibc/glibc-stage.inc
new file mode 100644
index 0000000000..a86cf7888e
--- /dev/null
+++ b/packages/glibc/glibc-stage.inc
@@ -0,0 +1,23 @@
+do_stage() {
+	rm -f ${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6
+	oe_runmake 'install_root=${STAGING_DIR_HOST}' \
+		   'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \
+		   '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \
+		   install-headers install-lib
+
+	install -d ${STAGING_INCDIR}/gnu \
+		   ${STAGING_INCDIR}/bits \
+		   ${STAGING_INCDIR}/rpcsvc
+	install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
+	install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
+	install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
+	for r in ${rpcsvc}; do
+		h=`echo $r|sed -e's,\.x$,.h,'`
+		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
+	done
+	for i in libc.a libc_pic.a libc_nonshared.a; do
+		install -m 0644 ${B}/$i ${STAGING_DIR_HOST}/${layout_base_libdir}/ || die "failed to install $i"
+	done
+	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libpthread.so
+	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libc.so
+}
diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb
index fd79701e6b..7b5eca2432 100644
--- a/packages/glibc/glibc_2.2.5.bb
+++ b/packages/glibc/glibc_2.2.5.bb
@@ -158,10 +158,10 @@ do_compile () {
 }
 
 do_stage() {
-	rm -f ${STAGING_LIBDIR}/libc.so.6
-	oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
-		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \