From c6237dd2ee7e64b5c776bb9177538c4f29d56df0 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 29 Oct 2007 08:47:40 +0000
Subject: openmoko-icon-theme-standard2-qvga: don't implicitly assume the
 buildmachine supports imagemagick and rsvg. at least, have the user
 explicitly ASSUME_PROVIDED that

---
 packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb b/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
index 11e02ee56c..a02e05c1d2 100644
--- a/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
+++ b/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
@@ -1,7 +1,8 @@
 DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko framework, QVGA edition"
 SECTION = "openmoko/base"
+DEPENDS = "imagemagick-native librsvg-native"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 inherit openmoko2
 
-- 
cgit v1.2.3


From c13a99e7e044586ac00355d858203fb50ca4838a Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 29 Oct 2007 08:48:44 +0000
Subject: dbus-c++: catch up with SRCREV and make it build again

---
 conf/distro/include/sane-srcrevs.inc |  2 ++
 packages/dbus/dbus-c++-native_svn.bb | 15 +++++++++++++++
 packages/dbus/dbus-c++_svn.bb        |  8 ++------
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index dd706f6414..2239c21f56 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -9,6 +9,8 @@
 
 SRCREV_pn-aircrack-ng ?= "802"
 SRCREV_pn-bfin-uclibc ?= "1857"
+SRCREV_pn-dbus-c++-native ?= "13131"
+SRCREV_pn-dbus-c++ ?= "13131"
 SRCREV_pn-dfu-util ?= "2866"
 SRCREV_pn-dfu-util-native ?= "2866"
 SRCREV_pn-eglibc ?= "3531"
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.*"
-- 
cgit v1.2.3


From 290dd747921f8618edcd000ae6a20a93da58bb4c Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 29 Oct 2007 15:40:05 +0000
Subject: bitbake.conf: Start cleaning up STAGING variables (from Poky)

---
 conf/bitbake.conf | 54 +++++++++++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 43e45bd87d..092e3154e6 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -167,18 +167,26 @@ S = "${WORKDIR}/${P}"
 B = "${S}"
 
 STAGING_DIR = "${TMPDIR}/staging"
-STAGING_BINDIR = "${STAGING_DIR}/${HOST_SYS}/bin"
-STAGING_BINDIR_CROSS = "${STAGING_DIR}/${BUILD_SYS}/bin/${HOST_SYS}"
-STAGING_BINDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/bin"
-STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib"
-STAGING_LIBDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/lib"
-STAGING_ETCDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/etc"
-STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include"
-STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share"
-STAGING_LOADER_DIR = "${STAGING_DIR}/${HOST_SYS}/loader"
-STAGING_FIRMWARE_DIR = "${STAGING_DIR}/${HOST_SYS}/firmware"
+
+STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}"
+STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}/bin"
+STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}/bin/${HOST_SYS}"
+STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}/lib"
+STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}/include"
+STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}/etc"
+STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}/share"
+
+STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}"
+STAGING_BINDIR = "${STAGING_DIR_HOST}/bin"
+STAGING_LIBDIR = "${STAGING_DIR_HOST}/lib"
+STAGING_INCDIR = "${STAGING_DIR_HOST}/include"
+STAGING_DATADIR = "${STAGING_DIR_HOST}/share"
+STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader"
+STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware"
 STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4"
 
+STAGING_DIR_TARGET = "${STAGING_DIR}/${TARGET_SYS}"
+
 DEPLOY_DIR = "${TMPDIR}/deploy"
 DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar"
 DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk"
@@ -197,7 +205,7 @@ SDK_PREFIX = "/usr/local/${SDK_NAME}"
 ##################################################################
 
 OLDEST_KERNEL = "2.4.0"
-STAGING_KERNEL_DIR = "${STAGING_DIR}/${HOST_SYS}/kernel"
+STAGING_KERNEL_DIR = "${STAGING_DIR_HOST}/kernel"
 
 ##################################################################
 # Specific image creation and rootfs population info.
@@ -294,9 +302,9 @@ PATCHRESOLVE = 'noop'
 # Build flags and options.
 ##################################################################
 
-export BUILD_CPPFLAGS = "-isystem${STAGING_DIR}/${BUILD_SYS}/include"
+export BUILD_CPPFLAGS = "-isystem${STAGING_INCDIR_NATIVE}"
 export CPPFLAGS = "${TARGET_CPPFLAGS}"
-export TARGET_CPPFLAGS = "-isystem${STAGING_DIR}/${TARGET_SYS}/include"
+export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}/include"
 
 export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}"
 export CFLAGS = "${TARGET_CFLAGS}"
@@ -306,12 +314,12 @@ export BUILD_CXXFLAGS = "${BUILD_CFLAGS} -fpermissive"
 export CXXFLAGS = "${TARGET_CXXFLAGS}"
 export TARGET_CXXFLAGS = "${TARGET_CFLAGS} -fpermissive"
 
-export BUILD_LDFLAGS = "-L${STAGING_DIR}/${BUILD_SYS}/lib \
-                        -Wl,-rpath-link,${STAGING_DIR}/${BUILD_SYS}/lib \
-                        -Wl,-rpath,${STAGING_DIR}/${BUILD_SYS}/lib -Wl,-O1"
+export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \
+                        -Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} \
+                        -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-O1"
 export LDFLAGS = "${TARGET_LDFLAGS}"
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
-                         -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib \
+export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}/lib \
+                         -Wl,-rpath-link,${STAGING_DIR_TARGET}/lib \
                          -Wl,-O1"
 
 # Which flags to leave by strip-flags() in bin/build/oebuild.sh ?
@@ -340,9 +348,9 @@ BOOTSTRAP_EXTRA_RRECOMMENDS = ""
 # Palmtop stuff.
 ##################################################################
 
-export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt2"
-export QPEDIR = "${STAGING_DIR}/${HOST_SYS}"
-export OPIEDIR = "${STAGING_DIR}/${HOST_SYS}"
+export QTDIR = "${STAGING_DIR_HOST}/qt2"
+export QPEDIR = "${STAGING_DIR_HOST}"
+export OPIEDIR = "${STAGING_DIR_HOST}"
 export palmtopdir = "${libdir}/opie"
 export palmqtdir = "${palmtopdir}"
 
@@ -443,8 +451,8 @@ export PKG_CONFIG_DIR = "${STAGING_LIBDIR}/pkgconfig"
 export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}"
 export PKG_CONFIG_DISABLE_UNINSTALLED = "yes"
 
-export QMAKE_MKSPEC_PATH = "${STAGING_DIR}/${BUILD_SYS}/share/qmake"
-export STAGING_SIPDIR = "${STAGING_DIR}/${BUILD_SYS}/share/sip"
+export QMAKE_MKSPEC_PATH = "${STAGING_DATADIR_NATIVE}/qmake"
+export STAGING_SIPDIR = "${STAGING_DATADIR_NATIVE}/sip"
 export STAGING_IDLDIR = "${STAGING_DATADIR}/idl"
 
 # library package naming
-- 
cgit v1.2.3


From 3c2e93f1c6973e2b797e2b9dd9286ce37ee03966 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 29 Oct 2007 15:41:39 +0000
Subject: bitbake.conf: Fix base prefixes in FILES (from poky)

---
 conf/bitbake.conf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 092e3154e6..6ff5d29374 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -115,7 +115,7 @@ FILES = ""
 
 FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
             ${sysconfdir} ${sharedstatedir} ${localstatedir} \
-            /bin/* /sbin/* /lib/*.so* ${datadir}/${PN} ${libdir}/${PN}/* \
+            ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so* ${datadir}/${PN} ${libdir}/${PN}/* \
             ${datadir}/pixmaps ${datadir}/applications \
             ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
             ${libdir}/bonobo/servers"
@@ -126,13 +126,13 @@ SECTION_${PN}-doc = "doc"
 
 FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
                 ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
-                /lib/*.a /lib/*.o ${datadir}/aclocal"
+                ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
 SECTION_${PN}-dev = "devel"
 ALLOW_EMPTY_${PN}-dev = "1"
 RDEPENDS_${PN}-dev = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}"
 
 FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \
-            /bin/.debug /sbin/.debug /lib/.debug ${libdir}/${PN}/.debug \
+            ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug ${libdir}/${PN}/.debug \
             ${libdir}/matchbox-panel/.debug"
 SECTION_${PN}-dbg = "devel"
 ALLOW_EMPTY_${PN}-dbg = "1"
-- 
cgit v1.2.3


From 74554526998506d094a0adec1abc20879a1d53c9 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 29 Oct 2007 15:44:56 +0000
Subject: autotools.bbclass: Reference STAGING_DATADIR (from poky)

---
 classes/autotools.bbclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index fccf2b6d80..8e4fba9400 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -97,9 +97,9 @@ autotools_do_configure() {
 			AUTOV=`automake --version |head -n 1 |sed "s/.* //;s/\.[0-9]\+$//"`
 			automake --version
 			echo "AUTOV is $AUTOV"
-			install -d ${STAGING_DIR}/${HOST_SYS}/share/aclocal
-			install -d ${STAGING_DIR}/${HOST_SYS}/share/aclocal-$AUTOV
-			acpaths="$acpaths -I ${STAGING_DIR}/${HOST_SYS}/share/aclocal-$AUTOV -I ${STAGING_DIR}/${HOST_SYS}/share/aclocal"
+			install -d ${STAGING_DATADIR}/aclocal
+			install -d ${STAGING_DATADIR}/aclocal-$AUTOV
+			acpaths="$acpaths -I${STAGING_DATADIR}/aclocal-$AUTOV -I ${STAGING_DATADIR}/aclocal"
 			# autoreconf is too shy to overwrite aclocal.m4 if it doesn't look
 			# like it was auto-generated.  Work around this by blowing it away
 			# by hand, unless the package specifically asked not to run aclocal.
-- 
cgit v1.2.3


From 103d1e3ddb00577f4027de29c000b63d9a5bb062 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 29 Oct 2007 15:52:18 +0000
Subject: base.bbclass: Update staging references (from poky)

---
 classes/base.bbclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 2cf205fbe9..8904b97883 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -687,10 +687,10 @@ base_do_stage () {
 	:
 }
 
-do_populate_staging[dirs] = "${STAGING_DIR}/${TARGET_SYS}/bin ${STAGING_DIR}/${TARGET_SYS}/lib \
-			     ${STAGING_DIR}/${TARGET_SYS}/include \
-			     ${STAGING_DIR}/${BUILD_SYS}/bin ${STAGING_DIR}/${BUILD_SYS}/lib \
-			     ${STAGING_DIR}/${BUILD_SYS}/include \
+do_populate_staging[dirs] = "${STAGING_DIR_TARGET}/bin ${STAGING_DIR_TARGET}/lib \
+			     ${STAGING_DIR_TARGET}/include \
+			     ${STAGING_BINDIR_NATIVE} ${STAGING_LIBDIR_NATIVE} \
+			     ${STAGING_INCDIR_NATIVE} \
 			     ${STAGING_DATADIR} \
 			     ${S} ${B}"
 
-- 
cgit v1.2.3


From 4a8c887ee370ce0bb2153d474e7f1321b89c21d1 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 29 Oct 2007 15:54:02 +0000
Subject: base.bbclass: Move do_install note to more appropriate place

---
 classes/base.bbclass | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 8904b97883..c504f78283 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -387,9 +387,6 @@ oe_machinstall() {
 	fi
 }
 
-# Remove and re-create ${D} so that is it guaranteed to be empty
-do_install[cleandirs] = "${D}"
-
 addtask listtasks
 do_listtasks[nostamp] = "1"
 python do_listtasks() {
@@ -703,6 +700,8 @@ python do_populate_staging () {
 
 addtask install after do_compile
 do_install[dirs] = "${D} ${S} ${B}"
+# Remove and re-create ${D} so that is it guaranteed to be empty
+do_install[cleandirs] = "${D}"
 
 base_do_install() {
 	:
-- 
cgit v1.2.3


From c8aa41816965b9c0b4a23782a2af98ca11f8acbd Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 29 Oct 2007 16:01:18 +0000
Subject: gnome-common: Don't hardcode staging paths (from Poky)

---
 packages/gnome/gnome-common_2.18.0.bb | 2 +-
 packages/gnome/gnome-common_2.20.0.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/gnome/gnome-common_2.18.0.bb b/packages/gnome/gnome-common_2.18.0.bb
index 2991db81c7..41c25b69c2 100644
--- a/packages/gnome/gnome-common_2.18.0.bb
+++ b/packages/gnome/gnome-common_2.18.0.bb
@@ -19,7 +19,7 @@ do_stage () {
 	rm -rf ${STAGE_TEMP}
 	mkdir -p ${STAGE_TEMP}
 	make DESTDIR="${STAGE_TEMP}" install
-	cp -pPR ${STAGE_TEMP}${bindir}/* ${STAGING_DIR}/${BUILD_SYS}/bin
+	cp -pPR ${STAGE_TEMP}${bindir}/* ${STAGING_BINDIR_NATIVE}
 	install -d ${STAGING_DATADIR}/gnome-common
 	install -d ${STAGING_DATADIR}/aclocal
 	cp -pPR ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DATADIR}/gnome-common
diff --git a/packages/gnome/gnome-common_2.20.0.bb b/packages/gnome/gnome-common_2.20.0.bb
index 2991db81c7..41c25b69c2 100644
--- a/packages/gnome/gnome-common_2.20.0.bb
+++ b/packages/gnome/gnome-common_2.20.0.bb
@@ -19,7 +19,7 @@ do_stage () {
 	rm -rf ${STAGE_TEMP}
 	mkdir -p ${STAGE_TEMP}
 	make DESTDIR="${STAGE_TEMP}" install
-	cp -pPR ${STAGE_TEMP}${bindir}/* ${STAGING_DIR}/${BUILD_SYS}/bin
+	cp -pPR ${STAGE_TEMP}${bindir}/* ${STAGING_BINDIR_NATIVE}
 	install -d ${STAGING_DATADIR}/gnome-common
 	install -d ${STAGING_DATADIR}/aclocal
 	cp -pPR ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DATADIR}/gnome-common
-- 
cgit v1.2.3


From c241d31a09487327f3d445da7fd2e4b18fda3eb9 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 29 Oct 2007 18:06:56 +0000
Subject: fontconfig: Fix hardcoded staging path (from poky)

---
 packages/fontconfig/fontconfig_2.4.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
cgit v1.2.3


From 40ba90e61e5bce452c8d2f9750b77f0f5f44c307 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 29 Oct 2007 18:07:33 +0000
Subject: dbus-glib: Fix harcoded staging paths (from Poky)

---
 packages/dbus/dbus-glib_0.74.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 () {
-- 
cgit v1.2.3


From b649c14203eac716583e447477c92efbd9af2565 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 29 Oct 2007 18:10:08 +0000
Subject: pkgconfig.inc: We should be installing pkgconfig files into LIBDIR
 now (from poky)

---
 packages/pkgconfig/pkgconfig.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pkgconfig/pkgconfig.inc b/packages/pkgconfig/pkgconfig.inc
index ed9e7e69af..a246c8750f 100644
--- a/packages/pkgconfig/pkgconfig.inc
+++ b/packages/pkgconfig/pkgconfig.inc
@@ -21,5 +21,5 @@ do_configure_prepend () {
 }
 
 do_stage_prepend() {
-	install -d -m 0755 ${STAGING_DATADIR}/pkgconfig
+	install -d -m 0755 ${STAGING_LIBDIR}/pkgconfig
 }
-- 
cgit v1.2.3


From 3c24214f7871a1e5ed1a995515ce76584ef7e0a0 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 29 Oct 2007 18:31:12 +0000
Subject: linux-ezx 2.6.23: repair defconfig

---
 packages/linux/linux-ezx-2.6.23/a780/defconfig | 380 ++++++++++++++++++++++---
 packages/linux/linux-ezx_2.6.23.bb             |   2 +-
 2 files changed, 335 insertions(+), 47 deletions(-)

diff --git a/packages/linux/linux-ezx-2.6.23/a780/defconfig b/packages/linux/linux-ezx-2.6.23/a780/defconfig
index 921fa94b69..f1738cd2c8 100755
--- a/packages/linux/linux-ezx-2.6.23/a780/defconfig
+++ b/packages/linux/linux-ezx-2.6.23/a780/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.23.1
-# Wed Oct 24 18:00:57 2007
+# Mon Oct 29 19:21:10 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -35,7 +35,7 @@ CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_LOCALVERSION="-ezxdev"
 # CONFIG_LOCALVERSION_AUTO is not set
-# CONFIG_SWAP is not set
+CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
@@ -43,7 +43,8 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
@@ -52,7 +53,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
 CONFIG_UID16=y
-# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
@@ -204,13 +205,13 @@ CONFIG_XSCALE_PMU=y
 #
 # Kernel Features
 #
-# CONFIG_TICK_ONESHOT is not set
-# CONFIG_NO_HZ is not set
-# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 CONFIG_PREEMPT=y
 CONFIG_HZ=100
 CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
+CONFIG_OABI_COMPAT=y
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
@@ -231,9 +232,9 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=tty1 noinitrd root=/dev/mmcblk0p2 rootfstype=ext2 ip=192.168.0.202:192.168.0.200:192.168.0.200:255.255.255.0 debug mem=32M@0xA0000000 mem=16M@0xAC000000"
+CONFIG_CMDLINE="console=tty1  root=/dev/mmcblk0p2 rootfstype=ext2 rootdelay=1 ip=192.168.0.202:192.168.0.200:192.168.0.200:255.255.255.0   debug mem=32M@0xA0000000 mem=16M@0xAC000000"
 # CONFIG_XIP_KERNEL is not set
-# CONFIG_KEXEC is not set
+CONFIG_KEXEC=y
 
 #
 # Floating point emulation
@@ -242,6 +243,8 @@ CONFIG_CMDLINE="console=tty1 noinitrd root=/dev/mmcblk0p2 rootfstype=ext2 ip=192
 #
 # At least one emulation must be selected
 #
+# CONFIG_FPE_NWFPE is not set
+# CONFIG_FPE_FASTFPE is not set
 
 #
 # Userspace binary formats
@@ -269,8 +272,12 @@ CONFIG_NET=y
 # Networking options
 #
 CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
+CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -278,8 +285,8 @@ CONFIG_INET=y
 CONFIG_IP_FIB_HASH=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
-# CONFIG_IP_PNP_BOOTP is not set
-# CONFIG_IP_PNP_RARP is not set
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
 # CONFIG_ARPD is not set
@@ -288,7 +295,7 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_TUNNEL=m
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
@@ -297,18 +304,169 @@ CONFIG_SYN_COOKIES=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET6_TUNNEL is not set
+# CONFIG_IP_VS is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
 # CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETFILTER is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK_ENABLED=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CT_ACCT=y
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_SAME=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration (EXPERIMENTAL)
+#
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_OWNER=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_RAW=m
+
+#
+# Bridge: Netfilter Configuration
+#
+# CONFIG_BRIDGE_NF_EBTABLES is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
+CONFIG_BRIDGE=m
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set
+CONFIG_LLC=m
 # CONFIG_LLC2 is not set
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
@@ -321,6 +479,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # QoS and/or fair queueing
 #
 # CONFIG_NET_SCHED is not set
+CONFIG_NET_SCH_FIFO=y
+CONFIG_NET_CLS_ROUTE=y
 
 #
 # Network testing
@@ -329,35 +489,45 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 CONFIG_BT=y
-CONFIG_BT_L2CAP=y
+CONFIG_BT_L2CAP=m
 CONFIG_BT_SCO=y
-CONFIG_BT_RFCOMM=y
+CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=y
+CONFIG_BT_BNEP=m
 CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=y
+CONFIG_BT_HIDP=m
 
 #
 # Bluetooth device drivers
 #
-# CONFIG_BT_HCIUSB is not set
+CONFIG_BT_HCIUSB=m
+CONFIG_BT_HCIUSB_SCO=y
 CONFIG_BT_HCIUART=y
 CONFIG_BT_HCIUART_H4=y
-# CONFIG_BT_HCIUART_BCSP is not set
+CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIBCM203X is not set
 # CONFIG_BT_HCIBPA10X is not set
 # CONFIG_BT_HCIBFUSB is not set
 # CONFIG_BT_HCIVHCI is not set
 # CONFIG_AF_RXRPC is not set
+CONFIG_FIB_RULES=y
 
 #
 # Wireless
 #
-# CONFIG_CFG80211 is not set
-# CONFIG_WIRELESS_EXT is not set
-# CONFIG_MAC80211 is not set
-# CONFIG_IEEE80211 is not set
+CONFIG_CFG80211=m
+CONFIG_WIRELESS_EXT=y
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUG is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_IEEE80211_SOFTMAC=m
+# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 # CONFIG_RFKILL is not set
 # CONFIG_NET_9P is not set
 
@@ -436,8 +606,8 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 # CONFIG_MTD_ARM_INTEGRATOR is not set
 # CONFIG_MTD_SHARP_SL is not set
 CONFIG_MTD_EZX=y
-CONFIG_MTD_EZX_A780=y
-# CONFIG_MTD_EZX_A780_ALTERNATE is not set
+# CONFIG_MTD_EZX_A780 is not set
+CONFIG_MTD_EZX_A780_ALTERNATE=y
 # CONFIG_MTD_EZX_A1200 is not set
 # CONFIG_MTD_EZX_E2 is not set
 # CONFIG_MTD_EZX_E6 is not set
@@ -470,10 +640,13 @@ CONFIG_MTD_EZX_A780=y
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=m
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_NBD=m
 # CONFIG_BLK_DEV_UB is not set
-# CONFIG_BLK_DEV_RAM is not set
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_IDE is not set
@@ -713,7 +886,22 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 #
 # Multimedia devices
 #
-# CONFIG_VIDEO_DEV is not set
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L1=y
+CONFIG_VIDEO_V4L1_COMPAT=y
+CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+# CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_CPIA2 is not set
+# CONFIG_VIDEO_SAA5246A is not set
+# CONFIG_VIDEO_SAA5249 is not set
+# CONFIG_TUNER_3036 is not set
+# CONFIG_TUNER_TEA5761 is not set
+# CONFIG_V4L_USB_DRIVERS is not set
+CONFIG_RADIO_ADAPTERS=y
+# CONFIG_USB_DSBR is not set
 # CONFIG_DVB_CORE is not set
 # CONFIG_DAB is not set
 
@@ -779,7 +967,10 @@ CONFIG_FONT_MINI_4x6=y
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
-# CONFIG_LOGO is not set
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
 
 #
 # Sound
@@ -967,7 +1158,7 @@ CONFIG_USB_ETH=y
 # CONFIG_USB_MIDI_GADGET is not set
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
+CONFIG_MMC_UNSAFE_RESUME=y
 
 #
 # MMC/SD Card Drivers
@@ -980,16 +1171,64 @@ CONFIG_MMC_BLOCK_BOUNCE=y
 #
 CONFIG_MMC_PXA=y
 CONFIG_RTC_LIB=y
-# CONFIG_RTC_CLASS is not set
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_SA1100=m
 
 #
 # DMA Engine support
 #
-# CONFIG_DMA_ENGINE is not set
+CONFIG_DMA_ENGINE=y
 
 #
 # DMA Clients
 #
+CONFIG_NET_DMA=y
 
 #
 # DMA Devices
@@ -1017,7 +1256,11 @@ CONFIG_REISERFS_FS_POSIX_ACL=y
 CONFIG_REISERFS_FS_SECURITY=y
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
-# CONFIG_XFS_FS is not set
+CONFIG_XFS_FS=m
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_SECURITY is not set
+# CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_XFS_RT is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
@@ -1028,7 +1271,7 @@ CONFIG_INOTIFY_USER=y
 CONFIG_DNOTIFY=y
 CONFIG_AUTOFS_FS=y
 CONFIG_AUTOFS4_FS=y
-# CONFIG_FUSE_FS is not set
+CONFIG_FUSE_FS=m
 
 #
 # CD-ROM/DVD Filesystems
@@ -1081,7 +1324,7 @@ CONFIG_CRAMFS=m
 #
 # Network File Systems
 #
-CONFIG_NFS_FS=m
+CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
 # CONFIG_NFS_V4 is not set
@@ -1092,12 +1335,13 @@ CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
 # CONFIG_NFSD_V4 is not set
 CONFIG_NFSD_TCP=y
-CONFIG_LOCKD=m
+# CONFIG_ROOT_NFS is not set
+CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=m
-CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
+CONFIG_SUNRPC=y
 # CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
@@ -1194,7 +1438,47 @@ CONFIG_FRAME_POINTER=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-# CONFIG_CRYPTO is not set
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=m
+CONFIG_CRYPTO_ABLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_HMAC=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+# CONFIG_CRYPTO_WP512 is not set
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_KHAZAD=m
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_CAMELLIA is not set
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_HW=y
 
 #
 # Library routines
@@ -1208,6 +1492,10 @@ CONFIG_CRC32=y
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=m
 CONFIG_ZLIB_DEFLATE=m
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
diff --git a/packages/linux/linux-ezx_2.6.23.bb b/packages/linux/linux-ezx_2.6.23.bb
index 72004ebf83..957fda0e8c 100644
--- a/packages/linux/linux-ezx_2.6.23.bb
+++ b/packages/linux/linux-ezx_2.6.23.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and
 AUTHOR = "The OpenEZX Team <openezx-devel@lists.openezx.org>"
 HOMEPAGE = "http://www.openezx.org"
 EZX = "ezxdev"
-PR = "${EZX}-r0"
+PR = "${EZX}-r1"
 
 # unstable branch, use 2.6.21 if you want something working
 DEFAULT_PREFERENCE = "-99"
-- 
cgit v1.2.3


From 3392215cf75059ab22618bbf6a96b602d615c249 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 29 Oct 2007 18:33:53 +0000
Subject: ezxd: mark ezxd.conf as conffile to preser user changes

---
 packages/ezx/ezxd_svn.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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"
 
-- 
cgit v1.2.3


From 2e3519cf3094dc83291d1373a9ece2075505433d Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 29 Oct 2007 20:12:02 +0000
Subject: xterm: Fix what looks like a totally insane staging path (probably
 missed in pervious rounds of cleanup?)

---
 packages/xorg-app/xterm_207.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/xorg-app/xterm_207.bb b/packages/xorg-app/xterm_207.bb
index 8c940bd2e8..547b42d0f1 100644
--- a/packages/xorg-app/xterm_207.bb
+++ b/packages/xorg-app/xterm_207.bb
@@ -11,7 +11,7 @@ inherit autotools pkgconfig
 FILES_${PN} += " /usr/lib/X11"
 
 #EXTRA_OERECONF = " -I${S}/xterm.m4"
-EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} FREETYPE_CONFIG=${STAGING_DIR}/${BUILD_SYS}/bin/freetype-config --disable-imake"
+EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} FREETYPE_CONFIG=${STAGING_BINDIR_CROSS}/freetype-config --disable-imake"
 
 #do_configure_prepend () {
 #	mv ${S}/aclocal.m4 ${S}/xterm.m4
-- 
cgit v1.2.3


From 24587de38122fd93d807594d7aa88ae376313f2a Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 29 Oct 2007 20:22:35 +0000
Subject: lua-gtk: This looks very very wrong but is equivalent... - Fix
 staging references

---
 packages/lua/lua-gtk2_0.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/lua/lua-gtk2_0.3.bb b/packages/lua/lua-gtk2_0.3.bb
index 35e564ae96..3abca0e88a 100644
--- a/packages/lua/lua-gtk2_0.3.bb
+++ b/packages/lua/lua-gtk2_0.3.bb
@@ -12,7 +12,7 @@ SRC_URI = "http://luaforge.net/frs/download.php/989/${P}.tar.gz \
 
 FILES_${PN} =  "${datadir}/lua   ${libdir}/lua50"
 
-CFLAGS_append = " -I '${S}/build-linux' -I src -DLINUX -I${STAGING_INCDIR} -L${STAGING_LIBDIR} -L${STAGING_LIBDIR}/../../${BUILD_SYS}/lib"
+CFLAGS_append = " -I '${S}/build-linux' -I src -DLINUX -I${STAGING_INCDIR} -L${STAGING_LIBDIR} -L${STAGING_LIBDIR_NATIVE}"
 
 do_compile () {
 	oe_runmake PREFIX='${prefix}' HGCC='${BUILD_CC}' LIBDIR='${STAGING_LIBDIR}' ODIR='build-linux/' CFLAGS='${CFLAGS}'
-- 
cgit v1.2.3


From c61d6845d6ceddacf4ddaed9ea4e46bc0b7c65c0 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 29 Oct 2007 20:31:21 +0000
Subject: packages: Improve BUILD_SYS references to staging

---
 packages/avetanabt/avetanabt_20060413.bb      | 8 ++++----
 packages/avetanabt/avetanabt_cvs.bb           | 8 ++++----
 packages/crimsonfields/crimsonfields_0.4.8.bb | 4 ++--
 packages/glibc/eglibc_svn.bb                  | 2 +-
 packages/glibc/glibc_2.4.bb                   | 2 +-
 packages/glibc/glibc_2.5.bb                   | 2 +-
 packages/glibc/glibc_2.6.1.bb                 | 2 +-
 packages/gutenprint/gutenprint_5.1.3.bb       | 2 +-
 packages/icewm/icewm_1.2.20.bb                | 2 +-
 packages/icewm/icewm_1.2.30.bb                | 2 +-
 packages/klibc/klibc.inc                      | 4 ++--
 packages/mozilla/minimo_cvs.bb                | 2 +-
 packages/netatalk/netatalk_2.0.3.bb           | 3 +--
 packages/obsolete/dbus/dbus_0.34.bb           | 4 ++--
 packages/obsolete/dbus/dbus_0.50.bb           | 4 ++--
 packages/omniorb/omniorb-native_4.0.7.bb      | 2 +-
 packages/perl/perl_5.8.8.bb                   | 6 +++---
 packages/python/python-native_2.5.1.bb        | 2 +-
 packages/python/python-sip_4.7.bb             | 2 +-
 packages/python/python24-native_2.4.0.bb      | 2 +-
 20 files changed, 32 insertions(+), 33 deletions(-)

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/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb
index 7abac644bc..0004eabaaf 100644
--- a/packages/glibc/eglibc_svn.bb
+++ b/packages/glibc/eglibc_svn.bb
@@ -14,7 +14,7 @@ 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"
+BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
 TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
 
 GLIBC_ADDONS ?= "ports,nptl,libidn"
diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb
index 6f408d70f8..9217779ad0 100644
--- a/packages/glibc/glibc_2.4.bb
+++ b/packages/glibc/glibc_2.4.bb
@@ -7,7 +7,7 @@ COMPATIBLE_HOST = '(i.86.*-linux|sh.*-linux)'
 DEFAULT_PREFERENCE_arm = "-1"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
-BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
+BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
 TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
 
 
diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb
index e35e1ced43..0218993f64 100644
--- a/packages/glibc/glibc_2.5.bb
+++ b/packages/glibc/glibc_2.5.bb
@@ -8,7 +8,7 @@ RPROVIDES_${PN}-dev = "libc6-dev"
 PR = "r7"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
-BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
+BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
 TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
 
 
diff --git a/packages/glibc/glibc_2.6.1.bb b/packages/glibc/glibc_2.6.1.bb
index 7a73a03794..26ea0e3d93 100644
--- a/packages/glibc/glibc_2.6.1.bb
+++ b/packages/glibc/glibc_2.6.1.bb
@@ -8,7 +8,7 @@ RPROVIDES_${PN}-dev = "libc6-dev"
 PR = "r1"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
-BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
+BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
 TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
 
 
diff --git a/packages/gutenprint/gutenprint_5.1.3.bb b/packages/gutenprint/gutenprint_5.1.3.bb
index 8886323da5..f0e0b734ab 100644
--- a/packages/gutenprint/gutenprint_5.1.3.bb
+++ b/packages/gutenprint/gutenprint_5.1.3.bb
@@ -36,7 +36,7 @@ do_configure() {
 
 do_install_append() {
         install -d ${D}${datadir}/cups/model/
-	install -m 644 ${STAGING_DIR}/${BUILD_SYS}/share/cups/model/* ${D}${datadir}/cups/model/
+	install -m 644 ${STAGING_DATADIR_NATIVE}/cups/model/* ${D}${datadir}/cups/model/
         cp -pPr ${D}${STAGING_LIBDIR}/* ${D}${libdir}/
 	cp -pPr ${D}${STAGING_DATADIR}/* ${D}${datadir}/
 }
diff --git a/packages/icewm/icewm_1.2.20.bb b/packages/icewm/icewm_1.2.20.bb
index 4da5da5146..b6a90a54a4 100644
--- a/packages/icewm/icewm_1.2.20.bb
+++ b/packages/icewm/icewm_1.2.20.bb
@@ -14,7 +14,7 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-i18n --without-imlib --with-xpm --with-gnome-menus \
 	--x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} \
-	--with-mkfontdir=${STAGING_DIR}/${BUILD_SYS}/bin/mkfontdir"
+	--with-mkfontdir=${STAGING_BINDIR_NATIVE}/mkfontdir"
 
 pkg_postinst() {
 update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/icewm-session 10
diff --git a/packages/icewm/icewm_1.2.30.bb b/packages/icewm/icewm_1.2.30.bb
index 5266b0adb9..4e7b7125ec 100644
--- a/packages/icewm/icewm_1.2.30.bb
+++ b/packages/icewm/icewm_1.2.30.bb
@@ -12,7 +12,7 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-i18n --without-imlib --with-xpm --with-gnome-menus \
 	--x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} \
-	--with-mkfontdir=${STAGING_DIR}/${BUILD_SYS}/bin/mkfontdir"
+	--with-mkfontdir=${STAGING_BINDIR_NATIVE}/mkfontdir"
 
 pkg_postinst() {
 update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/icewm-session 10
diff --git a/packages/klibc/klibc.inc b/packages/klibc/klibc.inc
index 4e86824eac..c33458eebc 100644
--- a/packages/klibc/klibc.inc
+++ b/packages/klibc/klibc.inc
@@ -54,13 +54,13 @@ do_configure () {
 	ln -sf ${STAGING_KERNEL_DIR} linux
 }
 
-STAGING_KLIBC_DIR = "${STAGING_DIR}/${HOST_SYS}/klibc"
+STAGING_KLIBC_DIR = "${STAGING_DIR_HOST}/klibc"
 
 do_stage() {
 	rm -rf "${STAGING_KLIBC_DIR}"
 	oe_runmake	'prefix=${STAGING_KLIBC_DIR}' \
 			'bindir=${STAGING_BINDIR}' \
-			'mandir=${STAGING_DIR}/${BUILD_SYS}/share/man' \
+			'mandir=${STAGING_DATADIR}/man' \
 			install
 	# The following is sufficient, at least in klibc 1.1.1 to make klcc
 	# use the staged libraries and include files.
diff --git a/packages/mozilla/minimo_cvs.bb b/packages/mozilla/minimo_cvs.bb
index 5f1ae3e996..b94dff2ab1 100644
--- a/packages/mozilla/minimo_cvs.bb
+++ b/packages/mozilla/minimo_cvs.bb
@@ -35,7 +35,7 @@ export ac_cv_prog_HOST_CC="${BUILD_CC}"
 export ac_cv_prog_HOST_CFLAGS="${BUILD_CFLAGS}"
 export ac_cv_prog_HOST_CXX="${BUILD_CXX}"
 export ac_cv_prog_HOST_CXXFLAGS="${BUILD_CXXFLAGS}"
-export HOST_LIBIDL_CONFIG = "${STAGING_DIR}/${BUILD_SYS}/bin/libIDL-config-2"
+export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2"
 
 mozdir="${libdir}/mozilla-minimo"
 
diff --git a/packages/netatalk/netatalk_2.0.3.bb b/packages/netatalk/netatalk_2.0.3.bb
index 74cfd84042..5fd7255fed 100644
--- a/packages/netatalk/netatalk_2.0.3.bb
+++ b/packages/netatalk/netatalk_2.0.3.bb
@@ -1,4 +1,3 @@
-DESCRIPTION = "Appletalk protocol suite"
 SECTION = "net"
 PR = "r0"
 LICENSE = "GPL"
@@ -31,7 +30,7 @@ do_configure () {
 		--disable-static \
 		--with-pam \
 		--mandir=${mandir}
-	cp ${STAGING_DIR}/${BUILD_SYS}/bin/${TARGET_SYS}-libtool ./${TARGET_SYS}-libtool
+	cp ${STAGING_BINDIR_NATIVE}/${TARGET_SYS}-libtool ./${TARGET_SYS}-libtool
 }
 
 do_install_append() {
diff --git a/packages/obsolete/dbus/dbus_0.34.bb b/packages/obsolete/dbus/dbus_0.34.bb
index 2a9989fe3b..442cb191ea 100644
--- a/packages/obsolete/dbus/dbus_0.34.bb
+++ b/packages/obsolete/dbus/dbus_0.34.bb
@@ -9,6 +9,6 @@ FILES_${PN} += "${bindir}/dbus-daemon"
 FILES_${PN}-dev += "${bindir}/dbus-binding-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/
 }
diff --git a/packages/obsolete/dbus/dbus_0.50.bb b/packages/obsolete/dbus/dbus_0.50.bb
index 2a9989fe3b..442cb191ea 100644
--- a/packages/obsolete/dbus/dbus_0.50.bb
+++ b/packages/obsolete/dbus/dbus_0.50.bb
@@ -9,6 +9,6 @@ FILES_${PN} += "${bindir}/dbus-daemon"
 FILES_${PN}-dev += "${bindir}/dbus-binding-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/
 }
diff --git a/packages/omniorb/omniorb-native_4.0.7.bb b/packages/omniorb/omniorb-native_4.0.7.bb
index b8a2e40395..1df6236aea 100644
--- a/packages/omniorb/omniorb-native_4.0.7.bb
+++ b/packages/omniorb/omniorb-native_4.0.7.bb
@@ -14,5 +14,5 @@ do_compile () {
 # Ugly hack so libtool does not find native libs when building cross packages
 # We really only build this package for omniidl anyway
 do_stage_append() {
-        rm -f  ${STAGING_DIR}/${BUILD_SYS}/lib/libomni*
+        rm -f  ${STAGING_LIBDIR_NATIVE}/libomni*
 }
diff --git a/packages/perl/perl_5.8.8.bb b/packages/perl/perl_5.8.8.bb
index a3873d99fb..328b4fb5df 100644
--- a/packages/perl/perl_5.8.8.bb
+++ b/packages/perl/perl_5.8.8.bb
@@ -41,7 +41,7 @@ SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
 HOSTPERL = "${STAGING_BINDIR_NATIVE}/perl${PV}"
 
 # Where to find .so files - use the -native versions not those from the target build
-export PERLHOSTLIB = "${STAGING_DIR}/${BUILD_SYS}/lib/perl/${PV}/"
+export PERLHOSTLIB = "${STAGING_LIBDIR_NATIVE}/perl/${PV}/"
 
 do_configure() {
         # Make hostperl in build directory be the native perl
@@ -138,12 +138,12 @@ do_install() {
 }
 do_stage() {
         install -d ${STAGING_DIR}/${HOST_SYS}/perl \
-                   ${STAGING_DIR}/${BUILD_SYS}/lib/perl/${PV} \
+                   ${STAGING_LIBDIR_NATIVE}/perl/${PV} \
                    ${STAGING_LIBDIR}/perl/${PV}/CORE
         # target config, used by cpan.bbclass to extract version information
         install config.sh ${STAGING_DIR}/${HOST_SYS}/perl/
         # target configuration, used by native perl when cross-compiling
-        install lib/Config_heavy.pl ${STAGING_DIR}/${BUILD_SYS}/lib/perl/${PV}/Config_heavy-target.pl
+        install lib/Config_heavy.pl ${STAGING_LIBDIR_NATIVE}/perl/${PV}/Config_heavy-target.pl
         # perl shared library headers
         for i in av.h embed.h gv.h keywords.h op.h perlio.h pp.h regexp.h \
                  uconfig.h XSUB.h cc_runtime.h embedvar.h handy.h opnames.h \
diff --git a/packages/python/python-native_2.5.1.bb b/packages/python/python-native_2.5.1.bb
index a64a4f96c8..2587c5f421 100644
--- a/packages/python/python-native_2.5.1.bb
+++ b/packages/python/python-native_2.5.1.bb
@@ -30,5 +30,5 @@ EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""'
 #}
 
 do_stage_append() {
-	install -m 0755 Parser/pgen ${STAGING_DIR}/${BUILD_SYS}/bin/
+	install -m 0755 Parser/pgen ${STAGING_BINDIR_NATIVE}/
 }
diff --git a/packages/python/python-sip_4.7.bb b/packages/python/python-sip_4.7.bb
index 2978edd54f..61fcc32986 100644
--- a/packages/python/python-sip_4.7.bb
+++ b/packages/python/python-sip_4.7.bb
@@ -30,7 +30,7 @@ do_configure_prepend() {
 }
 
 do_stage() {
-	install -d ${STAGING_DIR}/${BUILD_SYS}/lib/${PYTHON_DIR}/site-packages/
+	install -d ${STAGING_LIBDIR_NATIVE}/${PYTHON_DIR}/site-packages/
 	# sipconfig.py sipdistutils.py
 	install -m 0644 sip.h ${STAGING_INCDIR}/sip.h
 }
diff --git a/packages/python/python24-native_2.4.0.bb b/packages/python/python24-native_2.4.0.bb
index 5e948965ad..0d852994b3 100644
--- a/packages/python/python24-native_2.4.0.bb
+++ b/packages/python/python24-native_2.4.0.bb
@@ -30,6 +30,6 @@ do_configure() {
 
 do_stage_append() {
 	# install pgen for later usage with non-native builds
-	install Parser/pgen ${STAGING_DIR}/${BUILD_SYS}/bin/
+	install Parser/pgen ${STAGING_BINDIR_NATIVE}/
 }
 
-- 
cgit v1.2.3


From 5961d49c627b234d37a4451966db5b18ff7b0921 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 29 Oct 2007 20:54:03 +0000
Subject: bitbake.conf: Add dummy layout variables (describing the current
 staging layout for now) (from Poky)

---
 conf/bitbake.conf | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 6ff5d29374..9e10e7405f 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -1,3 +1,37 @@
+##################################################################
+# Standard target filesystem layout.
+##################################################################
+
+# Note these currently match the existing staging layout but this 
+# is planned to change, see the oe-dev mailing list
+
+# Path prefixes
+layout_prefix = ""
+layout_exec_prefix = ""
+layout_base_prefix = ""
+
+# Base paths
+layout_base_bindir = "${layout_base_prefix}/bin"
+layout_base_sbindir = "${layout_base_prefix}/bin"
+layout_base_libdir = "${layout_base_prefix}/lib"
+
+# Architecture independent paths
+layout_sysconfdir = "/etc"
+layout_localstatedir = "/var"
+layout_servicedir = "/srv"
+layout_sharedstatedir = "${layout_prefix}/com"
+layout_datadir = "${layout_prefix}/share"
+layout_infodir = "${layout_datadir}/info"
+layout_mandir = "${layout_datadir}/man"
+layout_docdir = "${layout_datadir}/doc"
+
+# Architecture dependent paths
+layout_bindir = "${layout_exec_prefix}/bin"
+layout_sbindir = "${layout_exec_prefix}/bin"
+layout_libdir = "${layout_exec_prefix}/lib"
+layout_includedir = "${layout_exec_prefix}/include"
+layout_libexecdir = "${layout_exec_prefix}/libexec"
+
 ##################################################################
 # Standard target filesystem paths.
 ##################################################################
-- 
cgit v1.2.3


From ed8871081478dbba49836da15ef070e5b359e763 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 29 Oct 2007 21:45:43 +0000
Subject: glibc: Factor staging function into a common .inc and remove
 hardcoded staging layout

---
 packages/glibc/eglibc_svn.bb              |  2 +-
 packages/glibc/glibc-initial.inc          |  8 ++++----
 packages/glibc/glibc-stage.inc            | 23 +++++++++++++++++++++++
 packages/glibc/glibc_2.2.5.bb             | 12 ++++++------
 packages/glibc/glibc_2.3.2+cvs20040726.bb | 24 +-----------------------
 packages/glibc/glibc_2.3.2.bb             | 24 +-----------------------
 packages/glibc/glibc_2.3.3+cvs20041128.bb | 24 +-----------------------
 packages/glibc/glibc_2.3.3+cvs20050221.bb | 24 +-----------------------
 packages/glibc/glibc_2.3.3+cvs20050420.bb | 24 +-----------------------
 packages/glibc/glibc_2.3.3.bb             | 24 +-----------------------
 packages/glibc/glibc_2.3.5+cvs20050627.bb | 24 +-----------------------
 packages/glibc/glibc_2.4.bb               | 27 ++-------------------------
 packages/glibc/glibc_2.5.bb               | 26 ++------------------------
 packages/glibc/glibc_2.6.1.bb             | 26 ++------------------------
 packages/glibc/glibc_cvs.bb               | 24 +-----------------------
 15 files changed, 48 insertions(+), 268 deletions(-)
 create mode 100644 packages/glibc/glibc-stage.inc

diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb
index 0004eabaaf..da33cca3fa 100644
--- a/packages/glibc/eglibc_svn.bb
+++ b/packages/glibc/eglibc_svn.bb
@@ -15,7 +15,7 @@ RPROVIDES_${PN}-dev = "libc6-dev"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
-TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
+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' \
-		   '${STAGING_LIBDIR}/libc.so.6' \
+	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' \
 		   '${STAGING_INCDIR}/bits/errno.h' \
 		   '${STAGING_INCDIR}/bits/libc-lock.h' \
 		   '${STAGING_INCDIR}/gnu/stubs.h' \
@@ -187,9 +187,9 @@ do_stage() {
 		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_LIBDIR}/ || die "failed to install $i"
+		install -m 0644 ${B}/$i ${STAGING_DIR_HOST}/${layout_base_libdir}/ || die "failed to install $i"
 	done
-	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
+	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libc.so
 }
 
 require glibc-package.bbclass
diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb
index df39c659c9..c44bf7dd15 100644
--- a/packages/glibc/glibc_2.3.2+cvs20040726.bb
+++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb
@@ -70,28 +70,6 @@ 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' \
-		   '${STAGING_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_LIBDIR}/ || die "failed to install $i"
-	done
-	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
-	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-}
+require glibc-stage.inc
 
 require glibc-package.bbclass
diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb
index 6022210857..9290c9b831 100644
--- a/packages/glibc/glibc_2.3.2.bb
+++ b/packages/glibc/glibc_2.3.2.bb
@@ -156,28 +156,6 @@ 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' \
-		   '${STAGING_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_LIBDIR}/ || die "failed to install $i"
-	done
-	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
-	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-}
+require glibc-stage.inc
 
 require glibc-package.bbclass
diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb
index 9fc4bcf738..829ef8f64e 100644
--- a/packages/glibc/glibc_2.3.3+cvs20041128.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb
@@ -92,28 +92,6 @@ 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' \
-		   '${STAGING_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_LIBDIR}/ || die "failed to install $i"
-	done
-	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
-	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-}
+require glibc-stage.inc
 
 require glibc-package.bbclass
diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb
index 1bb949665d..b94025881e 100644
--- a/packages/glibc/glibc_2.3.3+cvs20050221.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb
@@ -75,28 +75,6 @@ do_compile () {
 	)
 }
 
-do_sta