283 files changed, 430 insertions, 358 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index d763a771dd..dfa2b9d4b4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -23,6 +23,16 @@ Machines:   h3600, h5400
 Interests:  Kernels, Porting, Distro refinement
 Recipes:    at76c503a, dropbear, handhelds-sa, handhelds-pxa
 
+Person:     Florian Boor
+Mail:       fb@kernelconcepts.de
+Website:    http://fl0rian.wordpress.com, http://www.kernelconcepts.de/~fuchs/
+Machines:   nokia770, netvista, htcuniversal, netbook-pro
+Distros:  
+Interests:  GPE, OpenSync, GPE, Matchbox, *dbus*, X, sqlite
+Recipes:    gpe-*, libgpe*, libeventdb, libtododb, libcontactsdb, xserver-common
+Recipes:    gomunicator, mbmerlin, prismstumbler gkdial, fbreader, networkmanager
+Recipes:    minimix, minilite, miniclipboard
+
 Person:     Graeme Gregory
 Mail:       dp@xora.org.uk
 Website:    http://www.xora.org.uk
@@ -93,7 +103,7 @@ Machines:   collie, spitz, tosa
 Distros:    OpenZaurus, celinux-test
 Interests:  WiFi, Opie, Qtopia fonts, Native SDK
 Recipes:    hostap*, orinoco*, wpa-supplicant*, wireless-tools, keymaps
-Recipes:    linux-openzaurus, kdepimpi, subapplet, corsair, gammu, iqnotes, zbedic
+Recipes:    linux-rp, kdepimpi, subapplet, corsair, gammu, iqnotes, zbedic
 Recipes:    ttf-fonts/* qpf-fonts/*
 
 Person:     Michael 'Mickey' Lauer
@@ -121,7 +131,7 @@ Mail:       rpurdie@rpsys.net
 Distros:    poky, openzaurus, Ångström
 Machines:   poodle, c7x0, spitz, nokia770, qemuarm, qemux86, hx2xxx
 Interests:  Kernels, Bitbake, Core OE infrastructure, Zaurus 2.6
-Recipes:    linux-openzaurus, udev, zaurusd, task-base
+Recipes:    linux-rp, udev, zaurusd, task-base
 
 Person:	    Rolf 'Laibsch' Leggewie
 Mail:       OE-recipes@rolf.leggewie.biz
diff --git a/classes/ccdv.bbclass b/classes/ccdv.bbclass
index a28ea672e5..8c8306cbf1 100644
--- a/classes/ccdv.bbclass
+++ b/classes/ccdv.bbclass
@@ -10,7 +10,7 @@ python () {
 def quiet_libtool(bb,d):
 	deps = (bb.data.getVar('DEPENDS', d, 1) or "").split()
 	if 'libtool-cross' in deps:
-		return "'LIBTOOL=${STAGING_BINDIR}/${HOST_SYS}-libtool --silent'"
+		return "'LIBTOOL=${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool --silent'"
 	elif 'libtool-native' in deps:
 		return "'LIBTOOL=${B}/${HOST_SYS}-libtool --silent'"
 	else:
diff --git a/classes/distutils.bbclass b/classes/distutils.bbclass
index a2b0e2b770..5f57a9ea19 100644
--- a/classes/distutils.bbclass
+++ b/classes/distutils.bbclass
@@ -2,13 +2,13 @@ inherit distutils-base
 
 distutils_do_compile() {
 	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-	${STAGING_BINDIR}/python setup.py build || \
+	${STAGING_BINDIR_NATIVE}/python setup.py build || \
 	oefatal "python setup.py build execution failed."
 }
 
 distutils_do_install() {
 	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-	${STAGING_BINDIR}/python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir} || \
+	${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir} || \
 	oefatal "python setup.py install execution failed."
 }
 
diff --git a/classes/insane.bbclass b/classes/insane.bbclass
index 4ff867b62f..e30375288d 100644
--- a/classes/insane.bbclass
+++ b/classes/insane.bbclass
@@ -28,7 +28,7 @@ def package_qa_check_rpath(file,name,d):
     Check for dangerous RPATHs
     """
     import bb, os
-    scanelf = os.path.join(bb.data.getVar('STAGING_BINDIR',d,True),'scanelf')
+    scanelf = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True),'scanelf')
     bad_dir = bb.data.getVar('TMPDIR', d, True) + "/work"
     if not os.path.exists(scanelf):
         bb.note("Can not check RPATH scanelf not found")
diff --git a/classes/mozilla.bbclass b/classes/mozilla.bbclass
index 3295c2b270..bd8e9193d9 100644
--- a/classes/mozilla.bbclass
+++ b/classes/mozilla.bbclass
@@ -19,7 +19,7 @@ export MOZ_OBJDIR = "${S}"
 export CONFIGURE_ARGS = "${EXTRA_OECONF}"
 export HOST_LIBIDL_CFLAGS = "`${HOST_LIBIDL_CONFIG} --cflags`"
 export HOST_LIBIDL_LIBS = "`${HOST_LIBIDL_CONFIG} --libs`"
-export HOST_LIBIDL_CONFIG = "PKG_CONFIG_PATH=${STAGING_BINDIR}/../share/pkgconfig pkg-config libIDL-2.0"
+export HOST_LIBIDL_CONFIG = "PKG_CONFIG_PATH=${STAGING_DIR}/${BUILD_SYS}/share/pkgconfig pkg-config libIDL-2.0"
 export HOST_CC = "${BUILD_CC}"
 export HOST_CXX = "${BUILD_CXX}"
 export HOST_CFLAGS = "${BUILD_CFLAGS}"
@@ -33,8 +33,8 @@ mozilla_do_configure() {
 		set -e
 		for cg in `find ${S} -name config.guess`; do
 			install -m 0755 \
-			${STAGING_BINDIR}/../share/gnu-config/config.guess \
-			${STAGING_BINDIR}/../share/gnu-config/config.sub \
+			${STAGING_DIR}/${BUILD_SYS}/share/gnu-config/config.guess \
+			${STAGING_DIR}/${BUILD_SYS}/share/gnu-config/config.sub \
 			`dirname $cg`/
 		done
 	)
diff --git a/classes/native.bbclass b/classes/native.bbclass
index 04ff7d92d1..556c0e17e2 100644
--- a/classes/native.bbclass
+++ b/classes/native.bbclass
@@ -36,6 +36,8 @@ CXXFLAGS = "${BUILD_CFLAGS}"
 LDFLAGS = "${BUILD_LDFLAGS}"
 LDFLAGS_build-darwin = "-L${STAGING_DIR}/${BUILD_SYS}/lib "
 
+STAGING_BINDIR = "${STAGING_BINDIR_NATIVE}"
+STAGING_BINDIR_CROSS = "${STAGING_BINDIR_NATIVE}"
 
 # set the compiler as well. It could have been set to something else
 export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
diff --git a/classes/qmake-base.bbclass b/classes/qmake-base.bbclass
index 36ecfb622f..09694e97b8 100644
--- a/classes/qmake-base.bbclass
+++ b/classes/qmake-base.bbclass
@@ -14,10 +14,10 @@ export OE_QMAKE_LDFLAGS="${LDFLAGS}"
 export OE_QMAKE_LINK="${CCLD}"
 export OE_QMAKE_AR="${AR}"
 export OE_QMAKE_STRIP="${STRIP}"
-export OE_QMAKE_UIC="${STAGING_BINDIR}/uic"
-export OE_QMAKE_MOC="${STAGING_BINDIR}/moc"
+export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic"
+export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc"
 export OE_QMAKE_RCC="non-existant"
-export OE_QMAKE_QMAKE="${STAGING_BINDIR}/qmake"
+export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake"
 export OE_QMAKE_RPATH="-Wl,-rpath-link,"
 
 # default to qte2 via bb.conf, inherit qt3x11 to configure for qt3x11
diff --git a/classes/qt3e.bbclass b/classes/qt3e.bbclass
index c34d7c04f5..58a6779af6 100644
--- a/classes/qt3e.bbclass
+++ b/classes/qt3e.bbclass
@@ -3,8 +3,8 @@
 #
 export QTDIR="${STAGING_DIR}/${HOST_SYS}/qte3"
 export QTEDIR="${STAGING_DIR}/${HOST_SYS}/qte3"
-export OE_QMAKE_UIC="${STAGING_BINDIR}/uic3"
-export OE_QMAKE_MOC="${STAGING_BINDIR}/moc3"
+export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic3"
+export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc3"
 export OE_QMAKE_CXXFLAGS="${CXXFLAGS} "
 export OE_QMAKE_INCDIR_QT="${QTEDIR}/include"
 export OE_QMAKE_LIBDIR_QT="${QTEDIR}/lib"
diff --git a/classes/qt3x11.bbclass b/classes/qt3x11.bbclass
index 6e3d5f8ba2..24e824d06f 100644
--- a/classes/qt3x11.bbclass
+++ b/classes/qt3x11.bbclass
@@ -4,8 +4,8 @@ EXTRA_QMAKEVARS_POST += "CONFIG+=thread"
 # override variables set by qmake-base to compile Qt/X11 apps
 #
 export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt3"
-export OE_QMAKE_UIC = "${STAGING_BINDIR}/uic3"
-export OE_QMAKE_MOC = "${STAGING_BINDIR}/moc3"
+export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic3"
+export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc3"
 export OE_QMAKE_CXXFLAGS = "${CXXFLAGS} -DQT_NO_XIM"
 export OE_QMAKE_INCDIR_QT = "${QTDIR}/include"
 export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib"
diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass
index 635fc67694..cb836cc362 100644
--- a/classes/qt4x11.bbclass
+++ b/classes/qt4x11.bbclass
@@ -5,10 +5,10 @@ DEPENDS_prepend = "${@["qt4x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-x11-fr
 #
 export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4"
 export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++"
-export OE_QMAKE_UIC = "${STAGING_BINDIR}/uic4"
-export OE_QMAKE_MOC = "${STAGING_BINDIR}/moc4"
-export OE_QMAKE_RCC = "${STAGING_BINDIR}/rcc4"
-export OE_QMAKE_QMAKE = "${STAGING_BINDIR}/qmake2"
+export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4"
+export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4"
+export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4"
+export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2"
 export OE_QMAKE_LINK = "${CXX}"
 export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}"
 export OE_QMAKE_INCDIR_QT = "${QTDIR}/include"
diff --git a/classes/rubyextension.bbclass b/classes/rubyextension.bbclass
index 9c9d66e260..628ebdb7c7 100644
--- a/classes/rubyextension.bbclass
+++ b/classes/rubyextension.bbclass
@@ -2,17 +2,17 @@ DEPENDS  += "ruby-native"
 RDEPENDS += "ruby"
 
 rubyextension_do_configure() {
-	${STAGING_BINDIR}/ruby setup.rb config || \
+	${STAGING_BINDIR_NATIVE}/ruby setup.rb config || \
 	oefatal "ruby setup.rb config stage failed."
 }
 
 rubyextension_do_compile() {
-	${STAGING_BINDIR}/ruby setup.rb setup || \
+	${STAGING_BINDIR_NATIVE}/ruby setup.rb setup || \
 	oefatal "ruby setup.rb setup stage failed."
 }
 
 rubyextension_do_install() {
-	${STAGING_BINDIR}/ruby setup.rb install || \
+	${STAGING_BINDIR_NATIVE}/ruby setup.rb install || \
 	oefatal "ruby setup.rb install stage failed."
 }
 
diff --git a/classes/scons.bbclass b/classes/scons.bbclass
index 3160eca69a..89b5da2d0e 100644
--- a/classes/scons.bbclass
+++ b/classes/scons.bbclass
@@ -1,12 +1,12 @@
 DEPENDS += "python-scons-native"
 
 scons_do_compile() {
-        ${STAGING_BINDIR}/scons || \
+        ${STAGING_BINDIR_NATIVE}/scons || \
         oefatal "scons build execution failed."
 }
 
 scons_do_install() {
-        ${STAGING_BINDIR}/scons install || \
+        ${STAGING_BINDIR_NATIVE}/scons install || \
         oefatal "scons install execution failed."
 }
 
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 92c7cef2dd..b06e2bb3d4 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -154,6 +154,9 @@ B = "${S}"
 
 STAGING_DIR = "${TMPDIR}/staging"
 STAGING_BINDIR = "${STAGING_DIR}/${BUILD_SYS}/bin"
+# Set these to the same a STAGING_BINDIR for now
+STAGING_BINDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/bin"
+STAGING_BINDIR_CROSS = "${STAGING_DIR}/${BUILD_SYS}/bin"
 STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib"
 STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include"
 STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share"
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 6a872e28ba..3182fa7d77 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -8,7 +8,7 @@
 
 #DISTRO_VERSION = "2007.1"
 DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "13"
+DISTRO_REVISION = "15"
 
 require conf/distro/include/angstrom.inc
 require conf/distro/include/sane-srcdates.inc
@@ -66,7 +66,7 @@ FEED_URIS += " \
 #SRCDATE = "20061029"
 
 PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh7"
-PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.17-hh2"
+PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.18-hh1"
 
 
 SRCDATE_gconf-dbus = "20060719"
@@ -85,7 +85,7 @@ PREFERRED_PROVIDER_virtual/libsdl       ?= "libsdl-x11"
 PREFERRED_PROVIDER_virtual/libxine      ?= "libxine-x11"
 
 
-PREFERRED_VERSION_fontconfig = "2.3.95"
+PREFERRED_VERSION_fontconfig = "2.4.1"
 PREFERRED_VERSION_freetype = "2.2.1"
 #fix screen corruption issues
 PREFERRED_VERSION_cairo = "1.3.4"
@@ -172,6 +172,8 @@ PREFERRED_VERSION_glibc-intermediate ?= "2.5"
 # Busybox <1.1.0 doesn't have EABI support
 PREFERRED_VERSION_busybox = "1.2.1"
 
+PCMCIA_MANAGER = "pcmciautils"
+
 PREFERRED_VERSION_dbus ?= "1.0.1"
 PREFERRED_VERSION_dbus-glib ?= "0.71"
 
@@ -211,7 +213,7 @@ EXTRA_STUFF ?= ""
 DISTRO_EXTRA_RDEPENDS = "\
     update-modules module-init-tools modutils-initscripts \
     sysvinit initscripts sysvinit-pidof \
-    psplash \
+    ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \
     netbase dropbear \
     angstrom-version \
     ipkg ipkg-collateral \
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index d700e822ff..9d81476c39 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -42,6 +42,7 @@ SRCDATE_zaurusd ?= "20060628"
 SRCDATE_dasher-gpe  ?= "20060814"
 SRCDATE_rosetta ?= "20060804"
 SRCDATE_libmimedir ?= "20060804"
+SRCDATE_gpesyncd ?= "20061128"
 
 # GNOME
 SRCDATE_gconf-dbus ?= "20060719"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 266426aed7..b255e85488 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -171,7 +171,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
 # Select the correct versions of the kernel and modules (these are the
 # defaults, override in the conf/distro top-level distro file).
 PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
-PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.19-rc6"
+PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.19"
 
 # Select the smallest provider of x11 libraries
 PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
diff --git a/conf/distro/ludeos.conf b/conf/distro/ludeos.conf
deleted file mode 100644
index c6722619f8..0000000000
--- a/conf/distro/ludeos.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-#@TYPE: Distribution
-#@NAME: LudeOS
-#@DESCRIPTION: LudeOS Linux Distribution for the Iomega NAS 100d
-
-DISTRO_NAME    = "LudeOS"
-DISTRO_VERSION = "0.1-alpha"
-DISTRO_FEED    = "unstable"
-DISTRO_TYPE    = "beta"
-SLUGOS_IMAGENAME = "ludeos"
-SLUGOS_IMAGESEX  = "little-endian"
-
-ARCH_BYTE_SEX = "le"
-ARM_INSTRUCTION_SET = "arm"
-TARGET_OS = "linux"
-
-FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-lag/cross/${DISTRO_FEED}"
-FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-lag/native/${DISTRO_FEED}"
-
-# This removes the dependency on upslug2-native.
-SLUGOS_NATIVE_DEPENDS = ""
-
-SLUGOS_EXTRA_RDEPENDS = "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck \
-kernel-module-ext2 \
-kernel-module-jbd \
-kernel-module-ext3 \
-kernel-module-nfs \
-kernel-module-vfat \
-kernel-module-ntfs \
-kernel-module-isofs \
-kernel-module-udf \
-kernel-module-reiserfs \
-kernel-module-nls-cp437 \
-kernel-module-nls-utf8 \
-"
-
-require conf/distro/include/slugos.inc
diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf
index a62fafbc39..a369eab0a3 100644
--- a/conf/machine/a780.conf
+++ b/conf/machine/a780.conf
@@ -18,7 +18,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
 #mtd2: 00580000 00020000 "VFM_Filesystem"
 #mtd3: 00020000 00020000 "Logo"
 
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
 
 ROOT_FLASH_SIZE = "24"
 
diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf
index 67efb585c1..5e9917ffaf 100644
--- a/conf/machine/ep93xx.conf
+++ b/conf/machine/ep93xx.conf
@@ -11,7 +11,7 @@ PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
 #don't try to access tty1
 USE_VT = "0"
 
-MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost"
+MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost screen"
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "57600 ttyAM0"
diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf
index 8cdf37f6c0..11dbadacb8 100644
--- a/conf/machine/guinness.conf
+++ b/conf/machine/guinness.conf
@@ -14,7 +14,7 @@ OLDEST_KERNEL = "2.6.17"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
-MACHINE_FEATURES = "kernel26 usbhost ext2 pci acpi"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci acpi screen"
 
 #require conf/machine/include/tune-athlonmp.conf
 
diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf
index c8b2fad2fd..0f18728087 100644
--- a/conf/machine/h1910.conf
+++ b/conf/machine/h1910.conf
@@ -13,7 +13,7 @@ require conf/machine/include/tune-xscale.conf
 VOLATILE_STORAGE_SIZE = "64"
 ROOT_FLASH_SIZE = "32"
 GUI_MACHINE_CLASS = "smallscreen"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen"
 
 #
 # Software/packages selection
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 91c733b191..da8a58329a 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -17,7 +17,7 @@ ROOT_FLASH_SIZE = "32"
 GUI_MACHINE_CLASS = "smallscreen"
 
 #Set features for task-base 
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget screen"
 
 #
 # Software/packages selection
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index 60f2583db7..eb0b6d40e6 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -15,7 +15,7 @@ ROOT_FLASH_SIZE = "16"
 # h3630 have 32Mb only
 VOLATILE_STORAGE_SIZE = "64"
 GUI_MACHINE_CLASS = "smallscreen"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget  screen"
 
 #
 # Software/packages selection
diff --git a/conf/machine/h3800.conf b/conf/machine/h3800.conf
index abc3655a1e..173f2a5c8f 100644
--- a/conf/machine/h3800.conf
+++ b/conf/machine/h3800.conf
@@ -3,6 +3,6 @@
 #@DESCRIPTION: Machine configuration for the Compaq iPAQ 38xx devices
 
 #this machine will be primarily focussed on the 2.6 port
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget screen"
 
 require conf/machine/h3600.conf
diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index 4eef599aaf..3eaa96b327 100644
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -13,7 +13,7 @@ require conf/machine/include/tune-xscale.conf
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
 GUI_MACHINE_CLASS = "smallscreen"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget  screen"
 
 #
 # Software/packages selection
diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf
index ffc1328f50..c0c9b2fefe 100644
--- a/conf/machine/h5000.conf
+++ b/conf/machine/h5000.conf
@@ -13,7 +13,7 @@ require conf/machine/include/tune-xscale.conf
 ROOT_FLASH_SIZE = "32"
 VOLATILE_STORAGE_SIZE = "64"
 GUI_MACHINE_CLASS = "smallscreen"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost screen"
 
 #
 # Software/packages selection
diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf
index f793b49c70..ecc658982b 100644
--- a/conf/machine/h6300.conf
+++ b/conf/machine/h6300.conf
@@ -13,7 +13,7 @@ PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t"
 require conf/machine/include/tune-arm9tdmi.conf
 
 GUI_MACHINE_CLASS = "smallscreen"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen"
 
 #
 # Software/packages selection
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index efb92518a5..0eb733bfb5 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -15,7 +15,7 @@ require conf/machine/include/tune-xscale.conf
 #require conf/machine/include/tune-iwmmxt.conf
 
 GUI_MACHINE_CLASS = "bigscreen"
-MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen"
+MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen"
 
 #
 # Software/packages selection
diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf
index 25f093e1b8..48a4bbf3e5 100644
--- a/conf/machine/hx2000.conf
+++ b/conf/machine/hx2000.conf
@@ -5,7 +5,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa ipaq-pxa270"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
+PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
@@ -19,7 +19,7 @@ IMAGE_FSTYPES ?= "jffs2"
 
 MODUTILS = "26"	
 
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen"
 
 PCMCIA_MANAGER = "pcmciautils"
 BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)}"
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index 3a94220968..53903f7982 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -17,7 +17,7 @@ require conf/machine/include/tune-xscale.conf
 ROOT_FLASH_SIZE = "80"
 VOLATILE_STORAGE_SIZE = "64"
 GUI_MACHINE_CLASS = "bigscreen"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen"
 
 #
 # Software/packages selection
diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf
index 190ebe1c8c..0aba653201 100644
--- a/conf/machine/include/ixp4xx.conf
+++ b/conf/machine/include/ixp4xx.conf
@@ -15,7 +15,7 @@
 # <possible values>
 #    description
 
-ARCH_BYTE_SEX = "be"
+ARCH_BYTE_SEX = "le"
 # "be" "le"
 #    The memory byte sex and (on correctly implemented hardware - the IXP4XX is
 #    correct) the byte sex of the buses within the system.  'be' (big-endian)
diff --git a/conf/machine/include/qemu.conf b/conf/machine/include/qemu.conf
index 83ddf24b87..b314fa9bea 100644
--- a/conf/machine/include/qemu.conf
+++ b/conf/machine/include/qemu.conf
@@ -3,7 +3,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 GUI_MACHINE_CLASS = "bigscreen"
 GPE_EXTRA_INSTALL += "gaim sylpheed"
 
-MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget"
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen"
 
 IMAGE_FSTYPES ?= "tar.bz2 ext2"
 
diff --git a/conf/machine/include/tune-athlonmp.conf b/conf/machine/include/tune-athlonmp.conf
index f843f5e6ea..b2d0e703db 100644
--- a/conf/machine/include/tune-athlonmp.conf
+++ b/conf/machine/include/tune-athlonmp.conf
@@ -1,3 +1,3 @@
-TARGET_CC_ARCH = "-march=athlon-mp "
+TARGET_CC_ARCH = "-march=i686"
 PACKAGE_ARCH = "i686"
 
diff --git a/conf/machine/include/zaurus-2.6.conf b/conf/machine/include/zaurus-2.6.conf
index ce9b44c9fe..7a5b90e68e 100644
--- a/conf/machine/include/zaurus-2.6.conf
+++ b/conf/machine/include/zaurus-2.6.conf
@@ -1,12 +1,12 @@
 # Zaurus Clamshell specific configuration for kernel 2.6
 # Don't forget to include zaurus-clamshell.conf as well
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
+PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 PREFERRED_VERSION_wpa_supplicant = "0.4.7"
 
 PCMCIA_MANAGER ?= "pcmciautils"
 
-MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen"
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen"
 MACHINE_FEATURES_append_tosa  = " usbhost usbwlanng "
 MACHINE_FEATURES_append_akita = " usbhost "
 MACHINE_FEATURES_append_spitz = " usbhost ext2 "
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index afc1318f40..edd68c08f8 100644
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -8,7 +8,7 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa hx4700"
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 
 #use this for a hx2xxx ipaq
-#PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
+#PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf
index 680836ee14..aa6631a524 100644
--- a/conf/machine/jornada6xx.conf
+++ b/conf/machine/jornada6xx.conf
@@ -9,5 +9,5 @@ include conf/machine/include/tune-sh3.conf
 PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada6xx"
 PCMCIA_MANAGER = "pcmciautils"
 
-MACHINE_FEATURES = "kernel26 pcmcia irda keyboard touchscreen"
-MACHINE_TASK_PROVIDER = "task-base"
\ No newline at end of file
+MACHINE_FEATURES = "kernel26 pcmcia irda keyboard touchscreen screen"
+MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf
index f74f41c6ef..811ea6a3e8 100644
--- a/conf/machine/jornada7xx.conf
+++ b/conf/machine/jornada7xx.conf
@@ -8,6 +8,6 @@ include conf/machine/include/tune-strongarm.conf
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx"
 PCMCIA_MANAGER = "pcmciautils"
-MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda keyboard touchscreen"
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda keyboard touchscreen screen"
 MACHINE_EXTRA_RDEPENDS = "kernel-modules"
-MACHINE_TASK_PROVIDER = "task-base"
\ No newline at end of file
+MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf
index e5138be1c8..e16a46c619 100644
--- a/conf/machine/magician.conf
+++ b/conf/machine/magician.conf
@@ -17,7 +17,7 @@ require conf/machine/include/tune-xscale.conf
 ROOT_FLASH_SIZE = "80"
 VOLATILE_STORAGE_SIZE = "64"
 GUI_MACHINE_CLASS = "smallscreen"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen"
 
 #
 # Software/packages selection
diff --git a/conf/machine/navman-icn330.conf b/conf/machine/navman-icn330.conf
index c5fbdf2e97..5f035c33fa 100644
--- a/conf/machine/navman-icn330.conf
+++ b/conf/machine/navman-icn330.conf
@@ -16,10 +16,11 @@ require conf/machine/include/tune-xscale.conf
 #Set some hints for metadata  
 VOLATILE_STORAGE_SIZE = "32"
 GUI_MACHINE_CLASS = "smallscreen"
+UBOOT_MACHINE = ""
 
 #Set features for task-base 
 # touchscreen is not confirmed
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa  usbgadget"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa usbgadget screen"
 
 #
 # Software/packages selection
diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf
index 1048cb1d6c..f83de23786 100755
--- a/conf/machine/netbook-pro.conf
+++ b/conf/machine/netbook-pro.conf
@@ -15,7 +15,7 @@ USE_VT = "0"
 #use the epson xserver
 XSERVER = "xserver-kdrive-epson"
 
-MACHINE_FEATURES = "kernel26 touchscreen keyboard apm alsa pcmcia bluetooth irda usbhost"
+MACHINE_FEATURES = "kernel26 touchscreen keyboard apm alsa pcmcia bluetooth irda usbhost screen"
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttySA0 vt100"
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index 6bde574d02..de53f3c3bc 100644
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -30,7 +30,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-nokia770"
 #use this if you are using the nokia initfs
 ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
 
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost screen"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init"
 
 MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf
index ef8f4ca57b..ec7336fe06 100644
--- a/conf/machine/palmld.conf
+++ b/conf/machine/palmld.conf
@@ -9,7 +9,7 @@ PREFERRED_PROVIDER_virtual/kernel = "hackndev-2.6trunk"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda wifi ext2 usbgadget"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda wifi ext2 usbgadget screen"
 
 ROOT_FLASH_SIZE = "100"
 
diff --git a/conf/machine/progear.conf b/conf/machine/progear.conf
index 5957439f06..37974cb0ad 100644
--- a/conf/machine/progear.conf
+++ b/conf/machine/progear.conf
@@ -12,6 +12,6 @@ OLDEST_KERNEL = "2.6.17"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
-MACHINE_FEATURES = "kernel26 usbhost ext2 pci pcmcia apm screen alsa irda acpi"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci pcmcia apm screen alsa irda acpi screen"
 
 IMAGE_FSTYPES = "tar.gz"
diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf
index d67acac50f..371ba927bb 100644
--- a/conf/machine/qemuarm.conf
+++ b/conf/machine/qemuarm.conf
@@ -10,6 +10,6 @@ require conf/machine/include/tune-arm926ejs.conf
 
 SERIAL_CONSOLE = "115200 ttyAMA0"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
+PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 
 MACHINE_TASK_PROVIDER = "task-base"
\ No newline at end of file
diff --git a/conf/machine/smdk2440.conf b/conf/machine/smdk2440.conf
index c054cf6195..6a8deb9176 100644
--- a/conf/machine/smdk2440.conf
+++ b/conf/machine/smdk2440.conf
@@ -14,6 +14,6 @@ SERIAL_CONSOLE = "115200 ttySAC0"
 IMAGE_FSTYPES = "tar.gz"
 
 MACHINE_TASK_PROVIDER = "task-base"
-MACHINE_FEATURES = "kernel26 apm"
+MACHINE_FEATURES = "kernel26 apm screen"
 
 include conf/machine/include/tune-arm920t.conf
diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb
index e72691f345..ad2b0f79f8 100644
--- a/packages/angstrom/task-angstrom-x11.bb
+++ b/packages/angstrom/task-angstrom-x11.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r24"
+PR = "r25"
 ALLOW_EMPTY = "1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -40,7 +40,8 @@ RDEPENDS_angstrom-gpe-task-base := "\
     gpe-icons \
     gpe-confd \
     gpe-autostarter \
-    libgtkstylus \
+    ${@base_contains("MACHINE_FEATURES", "touchscreen", "libgtkstylus", "",d)} \
+    ${@base_contains("MACHINE_FEATURES", "keyboard", "", "libgtkinput",d)} \
     suspend-desktop \
     teleport \
     xauth \
@@ -48,7 +49,9 @@ RDEPENDS_angstrom-gpe-task-base := "\
     gdk-pixbuf-loader-xpm \
     gdk-pixbuf-loader-jpeg \
     pango-module-basic-x \
-    pango-module-basic-fc"
+    pango-module-basic-fc \
+    ${@base_contains("COMBINED_FEATURES", "bluetooth", "gpe-bluetooth", "",d)} \
+    "
 
 RDEPENDS_angstrom-gpe-task-pim := "\
     gpe-timesheet \
@@ -78,9 +81,9 @@ RDEPENDS_angstrom-gpe-task-apps := "\
     gpe-watch \
     gpe-what \
     matchbox-panel-hacks \
-    gpe-aerial \
+    ${@base_contains("COMBINED_FEATURES", "wifi", "gpe-aerial", "",d)} \
     gpe-soundbite \
-    rosetta \
+    ${@base_contains("MACHINE_FEATURES", "touchscreen", "rosetta", "",d)} \
     gpe-scap \
     gpe-windowlist"
 
diff --git a/packages/apmd/apmd_3.2.2.bb b/packages/apmd/apmd_3.2.2.bb
index 4a23f39590..94541581d3 100644
--- a/packages/apmd/apmd_3.2.2.bb
+++ b/packages/apmd/apmd_3.2.2.bb
@@ -22,7 +22,7 @@ INITSCRIPT_NAME = "apmd"
 INITSCRIPT_PARAMS = "defaults"
 
 do_compile() {
-	oe_runmake "LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool" apm apmd
+	oe_runmake "LIBTOOL=${STAGING_BINDIR_NATIVE}/${TARGET_PREFIX}libtool" apm apmd
 }
 
 do_stage() {
diff --git a/packages/apr/apr-util_0.9.12.bb b/packages/apr/apr-util_0.9.12.bb
index ba6e38241d..776fd03bfe 100644
--- a/packages/apr/apr-util_0.9.12.bb
+++ b/packages/apr/apr-util_0.9.12.bb
@@ -9,7 +9,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
            file://gen_uri_delims.patch;patch=1 \
            file://uri_delims.h"
 
-EXTRA_OECONF = "--with-apr=${STAGING_BINDIR} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}"
+EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}"
 
 inherit autotools lib_package binconfig
 
diff --git a/packages/apr/apr-util_1.1.2.bb b/packages/apr/apr-util_1.1.2.bb
index ad89228fff..ec1998d64b 100644
--- a/packages/apr/apr-util_1.1.2.bb
+++ b/packages/apr/apr-util_1.1.2.bb
@@ -8,7 +8,7 @@ PR = "r0"
 # apache mirrors?
 SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz"
 
-EXTRA_OECONF = "--with-apr=${STAGING_BINDIR} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}"
+EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}"
 
 inherit autotools lib_package binconfig
 
diff --git a/packages/apt/files/apt.conf b/packages/apt/files/apt.conf
index 37785871db..fc19018533 100644
--- a/packages/apt/files/apt.conf
+++ b/packages/apt/files/apt.conf
@@ -11,7 +11,7 @@ Dir "${STAGING_DIR}/"
       pkgcache "";
       srcpkgcache "";
    };
-   Bin "${STAGING_BINDIR}/"
+   Bin "${STAGING_BINDIR_NATIVE}/"
    {
       methods "${STAGING_LIBDIR}/apt/methods/";
       gzip "/bin/gzip";
diff --git a/packages/asterisk/asterisk-1.0.9/makefile.patch b/packages/asterisk/asterisk-1.0.9/makefile.patch
index 066fb677dc..6684d8696e 100644
--- a/packages/asterisk/asterisk-1.0.9/makefile.patch
+++ b/packages/asterisk/asterisk-1.0.9/makefile.patch
@@ -208,7 +208,7 @@
  
  # Add GTK console if appropriate
 -PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
-+PBX_LIBS+=$(shell ${STAGING_BINDIR}/gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
++PBX_LIBS+=$(shell ${STAGING_BINDIR_CROSS}/gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
  # Add KDE Console if appropriate
  #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so")
  
diff --git a/packages/asterisk/asterisk-1.2.8/makefile.patch b/packages/asterisk/asterisk-1.2.8/makefile.patch
index c786d09017..780868b91e 100644
--- a/packages/asterisk/asterisk-1.2.8/makefile.patch
+++ b/packages/asterisk/asterisk-1.2.8/makefile.patch
@@ -11,7 +11,7 @@
  # If cross compiling, define these to suit
 +CROSS_COMPILE=$(CROSS_DIR)
 +CROSS_COMPILE_TARGET=$(STAGING_DIR)
-+CROSS_COMPILE_BIN=$(STAGING_BINDIR)
++CROSS_COMPILE_BIN=$(STAGING_BINDIR_CROSS)
  # CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
  # CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
  # CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target
diff --git a/packages/asterisk/asterisk_1.2.12.1.bb b/packages/asterisk/asterisk_1.2.12.1.bb
index c27963c9a0..c0b7fc2ed9 100644
--- a/packages/asterisk/asterisk_1.2.12.1.bb
+++ b/packages/asterisk/asterisk_1.2.12.1.bb
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
 
 
 export CROSS_COMPILE="${CCACHE}${HOST_PREFIX}"
-export CROSS_COMPILE_BIN="${STAGING_BINDIR}"
+export CROSS_COMPILE_BIN="${STAGING_BINDIR_CROSS}"
 export CROSS_COMPILE_TARGET="${STAGING_DIR}/${HOST_SYS}"
 
 export CROSS_ARCH="Linux"
diff --git a/packages/asterisk/asterisk_1.2.13.bb b/packages/asterisk/asterisk_1.2.13.bb
index 224b367de6..42a3214f0a 100644
--- a/packages/asterisk/asterisk_1.2.13.bb
+++ b/packages/asterisk/asterisk_1.2.13.bb
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
 
 
 export CROSS_COMPILE="${CCACHE}${HOST_PREFIX}"
-export CROSS_COMPILE_BIN="${STAGING_BINDIR}"
+export CROSS_COMPILE_BIN="${STAGING_BINDIR_CROSS}"
 export CROSS_COMPILE_TARGET="${STAGING_DIR}/${HOST_SYS}"
 
 export CROSS_ARCH="Linux"
diff --git a/packages/asterisk/asterisk_1.2.9.1.bb b/packages/asterisk/asterisk_1.2.9.1.bb
index 00da4ab33f..c1cedf67f6 100644
--- a/packages/asterisk/asterisk_1.2.9.1.bb
+++ b/packages/asterisk/asterisk_1.2.9.1.bb
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
 
 
 export CROSS_COMPILE="${CCACHE}${HOST_PREFIX}"
-export CROSS_COMPILE_BIN="${STAGING_BINDIR}"
+export CROSS_COMPILE_BIN="${STAGING_BINDIR_CROSS}"
 export CROSS_COMPILE_TARGET="${STAGING_DIR}/${HOST_SYS}"
 
 export CROSS_ARCH="Linux"
diff --git a/packages/avetanabt/avetanabt_20060413.bb b/packages/avetanabt/avetanabt_20060413.bb
index b04a9e5552..5140b07874 100644
--- a/packages/avetanabt/avetanabt_20060413.bb
+++ b/packages/avetanabt/avetanabt_20060413.bb
@@ -23,8 +23,8 @@ do_compile() {
 
   # generate classes
   # javac -> jikes
-  ${STAGING_BINDIR}/find {de,javax,com} -iname *.java > file.list
-  ${STAGING_BINDIR}/jikes -verbose --bootclasspath ${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d build @file.list
+  ${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
 
   # create own version.xml (add version information available at runtime)
   head -n 4 version.xml >> build/version.xml
@@ -33,11 +33,11 @@ do_compile() {
 
   # move classes into jar archive
   # jar -> fastjar
-  ${STAGING_BINDIR}/fastjar -v -cf avetanaBT.jar -C build de -C build javax -C build com -C build version.xml
+  ${STAGING_BINDIR_NATIVE}/fastjar -v -cf avetanaBT.jar -C build de -C build javax -C build com -C build version.xml
   
   # JNI generated header file - de_avetana_bluetooth_stack_BlueZ.h
   # javah -> kaffeh
-  ${STAGING_BINDIR}/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_DIR}/${BUILD_SYS}/share/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}
diff --git a/packages/avetanabt/avetanabt_cvs.bb b/packages/avetanabt/avetanabt_cvs.bb
index b0deab2a42..66ee81d99a 100644
--- a/packages/avetanabt/avetanabt_cvs.bb
+++ b/packages/avetanabt/avetanabt_cvs.bb
@@ -26,8 +26,8 @@ do_compile() {
 
   # generate classes
   # javac -> jikes
-  ${STAGING_BINDIR}/find {de,javax,com} -iname *.java > file.list
-  ${STAGING_BINDIR}/jikes -verbose --bootclasspath ${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d build @file.list
+  ${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
 
   # create own version.xml (add version information available at runtime)
   head -n 4 version.xml >> build/version.xml
@@ -36,11 +36,11 @@ do_compile() {
 
   # move classes into jar archive
   # jar -> fastjar
-  ${STAGING_BINDIR}/fastjar -v -cf avetanaBT.jar -C build de -C build javax -C build com -C build version.xml
+  ${STAGING_BINDIR_NATIVE}/fastjar -v -cf avetanaBT.jar -C build de -C build javax -C build com -C build version.xml
   
   # JNI generated header file - de_avetana_bluetooth_stack_BlueZ.h
   # javah -> kaffeh
-  ${STAGING_BINDIR}/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_DIR}/${BUILD_SYS}/share/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}
diff --git a/packages/clearsilver/clearsilver_0.10.3.bb b/packages/clearsilver/clearsilver_0.10.3.bb
index 13d03a1705..6c41497ef4 100644
--- a/packages/clearsilver/clearsilver_0.10.3.bb
+++ b/packages/clearsilver/clearsilver_0.10.3.bb
@@ -8,7 +8,7 @@ PR = "r1"
 SRC_URI = "http://www.clearsilver.net/downloads/${P}.tar.gz \
            file://crosscompile.patch;patch=1"
 
-EXTRA_OECONF = "--disable-apache --disable-perl --disable-ruby --disable-java --disable-csharp --enable-gettext --with-python=${STAGING_BINDIR}/python"
+EXTRA_OECONF = "--disable-apache --disable-perl --disable-ruby --disable-java --disable-csharp --enable-gettext --with-python=${STAGING_BINDIR_NATIVE}/python"
 
 inherit autotools
 
diff --git a/packages/dejagnu/dejagnu-qemu_1.0.bb b/packages/dejagnu/dejagnu-qemu_1.0.bb
index 0b93e94a7b..7230f985f6 100644
--- a/packages/dejagnu/dejagnu-qemu_1.0.bb
+++ b/packages/dejagnu/dejagnu-qemu_1.0.bb
@@ -11,10 +11,10 @@ LD_SO = "lib/ld-linux.so.2"
 do_stage() {
 	install -d ${STAGING_DATADIR}/dejagnu/baseboards
 	install -m 0644 ${WORKDIR}/arm-qemu.exp ${STAGING_DATADIR}/dejagnu/baseboards/
-	cat <<EOF >${STAGING_BINDIR}/${QEMU}-test-wrapper
+	cat <<EOF >${STAGING_BINDIR_NATIVE}/${QEMU}-test-wrapper
 #!/bin/sh
 exec ${QEMU} ${CROSS_DIR}/${TARGET_SYS}/${LD_SO} --library-path ${CROSS_DIR}/${TARGET_SYS}/lib:${STAGING_DIR}/${TARGET_SYS}/lib \$1
 EOF
-	chmod 755 ${STAGING_BINDIR}/arm-qemu-test-wrapper
+	chmod 755 ${STAGING_BINDIR_NATIVE}/arm-qemu-test-wrapper
 }
 
diff --git a/packages/dillo/dillo_0.8.6.bb b/packages/dillo/dillo_0.8.6.bb
index 355d910d3f..81233ed28c 100644
--- a/packages/dillo/dillo_0.8.6.bb
+++ b/packages/dillo/dillo_0.8.6.bb
@@ -18,7 +18,7 @@ inherit autotools pkgconfig
 
 FILES_${PN} += " /usr/lib/dillo/ /usr/bin/dpid /usr/bin/dpidc "
 
-export PNG_CONFIG = "${STAGING_BINDIR}/libpng-config"
+export PNG_CONFIG = "${STAGING_BINDIR_CROSS}/libpng-config"
 
 EXTRA_OECONF = "--disable-dlgui"
 
diff --git a/packages/e17/e-iconbar_20060128.bb b/packages/e17/e-iconbar_20060128.bb
index 333f2406e1..de639bfd3f 100644
--- a/packages/e17/e-iconbar_20060128.bb
+++ b/packages/e17/e-iconbar_20060128.bb
@@ -8,6 +8,6 @@ inherit e
 SRC_URI = "${E_CVS};module=e17/apps/iconbar;date=${PV}"
 S = "${WORKDIR}/iconbar"
 
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
 FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
diff --git a/packages/e17/e-wm_0.16.999.036.bb b/packages/e17/e-wm_0.16.999.036.bb
index 78c1c1aa26..3084fd99bc 100644
--- a/packages/e17/e-wm_0.16.999.036.bb
+++ b/packages/e17/e-wm_0.16.999.036.bb
@@ -19,7 +19,7 @@ PROFILE_spitz = "HIRES_PDA"
 PROFILE_akita = "HIRES_PDA"
 
 EXTRA_OECONF = "--with-profile=${PROFILE} \
-                --with-edje-cc=${STAGING_BINDIR}/edje_cc \
+                --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
                 --x-includes=${STAGING_INCDIR}/X11 \
                 --x-libraries=${STAGING_LIBDIR}"
 
diff --git a/packages/e17/eclair_20060128.bb b/packages/e17/eclair_20060128.bb
index 36cf7c02ad..d78e1322c2 100644
--- a/packages/e17/eclair_20060128.bb
+++ b/packages/e17/eclair_20060128.bb
@@ -8,7 +8,7 @@ inherit e
 SRC_URI = "${E_CVS};module=e17/apps/eclair;date=${PV}"
 S = "${WORKDIR}/eclair"
 
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
 FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
 
diff --git a/packages/e17/engage_20060128.bb b/packages/e17/engage_20060128.bb
index d181d57ffd..ee71e1a0bb 100644
--- a/packages/e17/engage_20060128.bb
+++ b/packages/e17/engage_20060128.bb
@@ -9,7 +9,7 @@ SRC_URI = "${E_CVS};module=misc/engage;date=${PV} \
            file://no-local-includes.patch;patch=1"
 S = "${WORKDIR}/engage"
 
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
 FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
 
diff --git a/packages/e17/entice_20060128.bb b/packages/e17/entice_20060128.bb
index 48c37c72a2..776f652b96 100644
--- a/packages/e17/entice_20060128.bb
+++ b/packages/e17/entice_20060128.bb
@@ -11,7 +11,7 @@ RDEPENDS += "libesmart-container-plugins libesmart-thumb0 libesmart-trans-x11-0
 SRC_URI = "${E_CVS};module=e17/apps/entice;date=${PV}"
 S = "${WORKDIR}/entice"
 
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
 FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
 
diff --git a/packages/e17/entice_20060416.bb b/packages/e17/entice_20060416.bb
index 25b50467a4..87434e3d3b 100644
--- a/packages/e17/entice_20060416.bb
+++ b/packages/e17/entice_20060416.bb
@@ -11,7 +11,7 @@ RDEPENDS += "libesmart-container-plugins libesmart-thumb libesmart-trans-x11-0 l
 SRC_URI = "${E_CVS};module=e17/apps/entice;date=${PV}"
 S = "${WORKDIR}/entice"
 
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
 FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
 
diff --git a/packages/e17/entrance_0.9.0.007.bb b/packages/e17/entrance_0.9.0.007.bb
index 5d065ea36d..9f15c72282 100644
--- a/packages/e17/entrance_0.9.0.007.bb
+++ b/packages/e17/entrance_0.9.0.007.bb
@@ -20,7 +20,7 @@ SRC_URI = "${E_URI}/entrance-${PV}.tar.gz \
 
 S = "${WORKDIR}/entrance-${PV}"
 
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
                 --with-xsession=/etc/X11/Xsession \
                 --with-auth-mode=0"
 
diff --git a/packages/e17/examine_20060128.bb b/packages/e17/examine_20060128.bb
index e689eb1712..b406ea3b5f 100644
--- a/packages/e17/examine_20060128.bb
+++ b/packages/e17/examine_20060128.bb
@@ -8,6 +8,6 @@ inherit e
 SRC_URI = "${E_CVS};module=e17/apps/examine;date=${PV}"
 S = "${WORKDIR}/examine"
 
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
 FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass
index fc0313f936..903a7764ae 100644
--- a/packages/glibc/glibc-package.bbclass
+++ b/packages/glibc/glibc-package.bbclass
@@ -56,9 +56,9 @@ DESCRIPTION_localedef = "glibc: compile locale definition files"
 DESCRIPTION_glibc-utils = "glibc: misc utilities like iconf, local, gencat, tzselect, rpcinfo, ..."
 
 def get_glibc_fpu_setting(bb, d):
-	if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
-		return "--without-fp"
-	return ""
+    if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+        return "--without-fp"
+    return ""
 
 EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}"
 
@@ -116,23 +116,23 @@ rm -rf ${TMP_LOCALE}
 }
 
 python __anonymous () {
-	enabled = bb.data.getVar("ENABLE_BINARY_LOCALE_GENERATION", d, 1)
+    enabled = bb.data.getVar("ENABLE_BINARY_LOCALE_GENERATION", d, 1)
 
-	if enabled and int(enabled):
-		import re
+    if enabled and int(enabled):
+        import re
 
-		target_arch = bb.data.getVar("TARGET_ARCH", d, 1)
-		binary_arches = bb.data.getVar("BINARY_LOCALE_ARCHES", d, 1) or ""
+        target_arch = bb.data.getVar("TARGET_ARCH", d, 1)
+        binary_arches = bb.data.getVar("BINARY_LOCALE_ARCHES", d, 1) or ""
 
-		for regexp in binary_arches.split(" "):
-			r = re.compile(regexp)
+        for regexp in binary_arches.split(" "):
+            r = re.compile(regexp)
 
-			if r.match(target_arch):
-				depends = bb.data.getVar("DEPENDS", d, 1)
-				depends = "%s qemu-native" % depends
-				bb.data.setVar("DEPENDS", depends, d)
-				bb.data.setVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", "1", d)
-				break
+            if r.match(target_arch):
+                depends = bb.data.getVar("DEPENDS", d, 1)
+                depends = "%s qemu-native" % depends
+                bb.data.setVar("DEPENDS", depends, d)
+                bb.data.setVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", "1", d)
+                break
 }
 
 do_prep_locale_tree() {
diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb
index 702ea4b8fb..c33cef74ca 100644
--- a/packages/glibc/glibc_2.4.bb
+++ b/packages/glibc/glibc_2.4.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
 LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "required"
-PR = "r11"
+PR = "r12"
 
 #add the hosts that are confirmed to be working to COMPATIBLE_HOSTi
 COMPATIBLE_HOST = '(i.86.*-linux|sh.*-linux)'
diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb
index d83cad745b..07be0fa181 100644
--- a/packages/glibc/glibc_2.5.bb
+++ b/packages/glibc/glibc_2.5.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
 LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "required"
-PR = "r3"
+PR = "r4"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
diff --git a/packages/gnome/gconf_2.6.1.bb b/packages/gnome/gconf_2.6.1.bb
index cacd461a17..52cb799cf2 100644
--- a/packages/gnome/gconf_2.6.1.bb
+++ b/packages/gnome/gconf_2.6.1.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "GNOME configuration database system"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-${PV}.tar.bz2 \
 	   file://backends.patch;patch=1"
 DEPENDS = "orbit2 glib-2.0  libxml2"
-ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2"
+ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
 
 FILES_${PN} += " ${libdir}/GConf/*"
 
diff --git a/packages/gnome/gnome-vfs_2.12.0.bb b/packages/gnome/gnome-vfs_2.12.0.bb
index 29f6723486..1c11f9841f 100644
--- a/packages/gnome/gnome-vfs_2.12.0.bb
+++ b/packages/gnome/gnome-vfs_2.12.0.bb
@@ -8,7 +8,7 @@ RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info"
 
 SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1"
 
-ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2"
+ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
 
 FILES_${PN} += " ${libdir}/bonobo/servers ${libdir}/bonobo/monikers/*.so ${libdir}/vfs"
 FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/modules/*.a ${libdir}/gnome-vfs-2.0/modules/*.la ${libdir}/gnome-vfs-2.0/include ${libdir}/bonobo/monikers/*.a ${libdir}/bonobo/monikers/*.la"
diff --git a/packages/gnome/gnome-vfs_2.6.0.bb b/packages/gnome/gnome-vfs_2.6.0.bb
index 14e8d11fc5..c967c746d1 100644
--- a/packages/gnome/gnome-vfs_2.6.0.bb
+++ b/packages/gnome/gnome-vfs_2.6.0.bb
@@ -8,7 +8,7 @@ RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info"
 
 SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1"
 
-ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2"
+ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
 
 FILES_${PN} += " ${libdir}/gnome-vfs-2.0/modules/*.so ${libdir}/bonobo/servers ${libdir}/bonobo/monikers/*.so ${libdir}/vfs"
 FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/modules/*.a ${libdir}/gnome-vfs-2.0/modules/*.la ${libdir}/gnome-vfs-2.0/include ${libdir}/bonobo/monikers/*.a ${libdir}/bonobo/monikers/*.la"
diff --git a/packages/gnome/gnome-vfs_2.6.2.bb b/packages/gnome/gnome-vfs_2.6.2.bb
index 65973ab5f6..e9a903f598 100644
--- a/packages/gnome/gnome-vfs_2.6.2.bb
+++ b/packages/gnome/gnome-vfs_2.6.2.bb
@@ -8,7 +8,7 @@ RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info"
 
 SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1"
 
-ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2"
+ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
 
 FILES_${PN} += " ${libdir}/bonobo/servers ${libdir}/bonobo/monikers/*.so ${libdir}/vfs"
 FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/modules/*.a ${libdir}/gnome-vfs-2.0/modules/*.la ${libdir}/gnome-vfs-2.0/include ${libdir}/bonobo/monikers/*.a ${libdir}/bonobo/monikers/*.la"
diff --git a/packages/gnome/libbonobo_2.10.0.bb b/packages/gnome/libbonobo_2.10.0.bb
index bd51d4e45a..91e81f98ba 100644
--- a/packages/gnome/libbonobo_2.10.0.bb
+++ b/packages/gnome/libbonobo_2.10.0.bb
@@ -6,7 +6,7 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.10/libbonobo-${PV}
            file://gtk-doc.m4 \
            file://gtk-doc.make"
 DEPENDS = "glib-2.0 orbit2 intltool-native libxml2"
-ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2"
+ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
 
 FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so"
 FILES_${PN}-dev += "${libdir}/orbit-2.0/* ${libdir}/bonobo/monikers/* \
diff --git a/packages/gnome/libbonobo_2.14.0.bb b/packages/gnome/libbonobo_2.14.0.bb
index d3cdc3a1c8..0399b8b6c0 100644
--- a/packages/gnome/libbonobo_2.14.0.bb
+++ b/packages/gnome/libbonobo_2.14.0.bb
@@ -9,7 +9,7 @@ SRC_URI += "file://configure-gthread.patch;patch=1 \
             file://gtk-doc.m4 \
             file://gtk-doc.make"
 DEPENDS = "glib-2.0 orbit2 intltool-native libxml2"
-ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2"
+ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
 
 FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so"
 FILES_${PN}-dev += "${libdir}/orbit-2.0/* ${libdir}/bonobo/monikers/* \
diff --git a/packages/gnome/libbonobo_2.6.0.bb b/packages/gnome/libbonobo_2.6.0.bb
index 4af46fa444..d08b6bafd1 100644
--- a/packages/gnome/libbonobo_2.6.0.bb
+++ b/packages/gnome/libbonobo_2.6.0.bb
@@ -5,7 +5,7 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.6/libbonobo-${PV}.
            file://gtk-doc.m4 \
            file://gtk-doc.make"
 DEPENDS = "glib-2.0 orbit2 intltool-native libxml2"
-ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2"
+ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
 
 inherit autotools pkgconfig
 
diff --git a/packages/gnome/libbonobo_2.6.2.bb b/packages/gnome/libbonobo_2.6.2.bb
index f2374b953f..2eee5fd6d8 100644
--- a/packages/gnome/libbonobo_2.6.2.bb
+++ b/packages/gnome/libbonobo_2.6.2.bb
@@ -6,7 +6,7 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.6/libbonobo-${PV}.
            file://gtk-doc.m4 \
            file://gtk-doc.make"
 DEPENDS = "glib-2.0 orbit2 intltool-native libxml2"
-ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2"
+ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
 
 FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so"
 FILES_${PN}-dev += "${libdir}/orbit-2.0/* ${libdir}/bonobo/monikers/* \
diff --git a/packages/gnome/orbit2_2.10.2.bb b/packages/gnome/orbit2_2.10.2.bb
index 83d6f0ec15..4ac4129414 100644
--- a/packages/gnome/orbit2_2.10.2.bb
+++ b/packages/gnome/orbit2_2.10.2.bb
@@ -15,7 +15,7 @@ S = "${WORKDIR}/ORBit2-${PV}"
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-gtk-doc"
-EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR}/orbit-idl-2'"
+EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR_NATIVE}/orbit-idl-2'"
 
 do_configure_prepend() {
 	mkdir -p m4
@@ -24,7 +24,7 @@ do_configure_prepend() {
 }
 
 do_compile_append () {
-	sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new
+	sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR_NATIVE}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new
 	mv ORBit-2.0.pc.new ORBit-2.0.pc
 }
 
diff --git a/packages/gnome/orbit2_2.13.2.bb b/packages/gnome/orbit2_2.13.2.bb
index d196829add..e4d83408b1 100644
--- a/packages/gnome/orbit2_2.13.2.bb
+++ b/packages/gnome/orbit2_2.13.2.bb
@@ -15,7 +15,7 @@ S = "${WORKDIR}/ORBit2-${PV}"
 inherit autotools pkgconfig
 PARALLEL_MAKE = ""
 EXTRA_OECONF = "--disable-gtk-doc"
-EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR}/orbit-idl-2'"
+EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR_NATIVE}/orbit-idl-2'"
 
 do_configure_prepend() {
 	mkdir -p m4
@@ -24,7 +24,7 @@ do_configure_prepend() {
 }
 
 do_compile_append () {
-	sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new
+	sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR_NATIVE}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new
 	mv ORBit-2.0.pc.new ORBit-2.0.pc
 }
 
diff --git a/packages/gnome/orbit2_2.14.0.bb b/packages/gnome/orbit2_2.14.0.bb
index 44bc402c05..5ce381f0ad 100644
--- a/packages/gnome/orbit2_2.14.0.bb
+++ b/packages/gnome/orbit2_2.14.0.bb
@@ -16,7 +16,7 @@ S = "${WORKDIR}/ORBit2-${PV}"
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-gtk-doc"
-EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR}/orbit-idl-2'"
+EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR_NATIVE}/orbit-idl-2'"
 
 do_configure_prepend() {
 	mkdir -p m4
@@ -25,7 +25,7 @@ do_configure_prepend() {
 }
 
 do_compile_append () {
-	sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new
+	sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR_NATIVE}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new
 	mv ORBit-2.0.pc.new ORBit-2.0.pc
 }
 
diff --git a/packages/gpesyncd/gpesyncd_svn.bb b/packages/gpesyncd/gpesyncd_svn.bb
index f247a94837..c7adad7340 100644
--- a/packages/gpesyncd/gpesyncd_svn.bb
+++ b/packages/gpesyncd/gpesyncd_svn.bb
@@ -3,7 +3,7 @@ DESCRIPTION =	"Sync daemon for GPE and OpenSync"
 
 SRC_URI =	"${GPE_SVN}"
 
-DEPENDS =	"libgpevtype sqlite libmimedir glib-2.0"
+DEPENDS =	"libgpevtype libtododb libcontactsdb libeventdb sqlite libmimedir glib-2.0"
 
 S =		"${WORKDIR}/${PN}"
 PV =		"0.0+svn${SRCDATE}"
diff --git a/packages/gsoap/gsoap_2.7.7.bb b/packages/gsoap/gsoap_2.7.7.bb
index fb782ecb0b..170c251aaf 100644
--- a/packages/gsoap/gsoap_2.7.7.bb
+++ b/packages/gsoap/gsoap_2.7.7.bb
@@ -12,7 +12,7 @@ inherit autotools
 
 PARALLEL_MAKE = ""
 
-EXTRA_OEMAKE = "SOAP=${STAGING_BINDIR}/soapcpp2"
+EXTRA_OEMAKE = "SOAP=${STAGING_BINDIR_NATIVE}/soapcpp2"
 
 do_install_append() {
 	install -d ${D}${libdir}
diff --git a/packages/gtk+/gtk+-1.2_1.2.10.bb b/packages/gtk+/gtk+-1.2_1.2.10.bb
index 56b3c0849a..8025beb75c 100644
--- a/packages/gtk+/gtk+-1.2_1.2.10.bb
+++ b/packages/gtk+/gtk+-1.2_1.2.10.bb
@@ -48,7 +48,7 @@ do_stage () {
 	mkdir -p ${STAGING_LIBDIR}/gtk-1.2/include
 
 	install -m 0644 gtk.m4 ${STAGING_DATADIR}/aclocal/
-	install -m 0755 gtk-config ${STAGING_BINDIR}
+	install -m 0755 gtk-config ${STAGING_BINDIR_CROSS}
 }
 
 do_install_append () {
diff --git a/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb b/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb
index aaa4b3301c..33b0423e25 100644
--- a/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb
+++ b/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb
@@ -21,5 +21,5 @@ do_stage() {
 }
 
 do_compile() {
-	oe_runmake ORBIT_IDL=${STAGING_BINDIR}/orbit-idl-2
+	oe_runmake ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2
 }
diff --git a/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb b/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb
index 165b2ff5f4..d27f72ae4a 100644
--- a/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb
+++ b/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb
@@ -21,5 +21,5 @@ do_stage() {
 }
 
 do_compile() {
-	oe_runmake ORBIT_IDL=${STAGING_BINDIR}/orbit-idl-2
+	oe_runmake ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2
 }
diff --git a/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb b/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb
index c3687b70cc..7af6879042 100644
--- a/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb
+++ b/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb
@@ -20,5 +20,5 @@ do_stage() {
 }
 
 do_compile() {
-	oe_runmake ORBIT_IDL=${STAGING_BINDIR}/orbit-idl-2
+	oe_runmake ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2
 }
diff --git a/packages/images/ludeos-image.bb b/packages/images/ludeos-image.bb
deleted file mode 100644
index 0d8443c3e2..0000000000
--- a/packages/images/ludeos-image.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-DEPENDS = "slugos-image"
-COMPATIBLE_MACHINE = "nslu2"
diff --git a/packages/ion/ion3_0.0+ds20041104.bb b/packages/ion/ion3_0.0+ds20041104.bb
index 27742e0670..45a74e60a7 100644
--- a/packages/ion/ion3_0.0+ds20041104.bb
+++ b/packages/ion/ion3_0.0+ds20041104.bb
@@ -27,7 +27,7 @@ S = "${WORKDIR}/ion-3ds-${SNAPDATE}"
 
 EXTRA_OECONF += "--disable-xinerama --disable-xfree86-textprop-bug-workaround \
 		 --disable-Xutf8 --disable-sun-fix-remap --enable-shared \
-		 --with-lua-prefix=${STAGING_BINDIR}/.. \
+		 --with-lua-prefix=${STAGING_BINDIR_NATIVE}/.. \
 		 --x-libraries=${STAGING_LIBDIR} \
 		 --x-includes=${STAGING_INCDIR}"
 
diff --git a/packages/ixp4xx/ixp4xx-npe_2.1.bb b/packages/ixp4xx/ixp4xx-npe_2.1.bb
index 94188bedee..3370ad0c81 100644
--- a/packages/ixp4xx/ixp4xx-npe_2.1.bb
+++ b/packages/ixp4xx/ixp4xx-npe_2.1.bb
@@ -13,11 +13,11 @@ FILES_${PN} = "${base_libdir}/firmware/NPE-B"
 do_compile() {
 #        if test '${ARCH_BYTE_SEX}' = be
 #        then
-		${STAGING_BINDIR}/IxNpeMicrocode-${PV} -be
+		${STAGING_BINDIR_NATIVE}/IxNpeMicrocode-${PV} -be
 #        fi
 #        if test '${ARCH_BYTE_SEX}' = le
 #        then
-#                ${STAGING_BINDIR}/IxNpeMicrocode-${PV} -le
+#                ${STAGING_BINDIR_NATIVE}/IxNpeMicrocode-${PV} -le
 #        fi
 }
 
diff --git a/packages/ixp4xx/ixp4xx-npe_2.3.bb b/packages/ixp4xx/ixp4xx-npe_2.3.bb
index b6a47177cb..571080bda0 100644
--- a/packages/ixp4xx/ixp4xx-npe_2.3.bb
+++ b/packages/ixp4xx/ixp4xx-npe_2.3.bb
@@ -13,11 +13,11 @@ FILES_${PN} = "${base_libdir}/firmware/NPE-B"
 do_compile() {
 #        if test '${ARCH_BYTE_SEX}' = be
 #        then
-		${STAGING_BINDIR}/IxNpeMicrocode-${PV} -be
+		${STAGING_BINDIR_NATIVE}/IxNpeMicrocode-${PV} -be
 #        fi
 #        if test '${ARCH_BYTE_SEX}' = le
 #        then
-#                ${STAGING_BINDIR}/IxNpeMicrocode-${PV} -le
+#                ${STAGING_BINDIR_NATIVE}/IxNpeMicrocode-${PV} -le
 #        fi
 }
 
diff --git a/packages/jpeg/jpeg_6b.bb b/packages/jpeg/jpeg_6b.bb
index 342197c8ad..978ae10be5 100644
--- a/packages/jpeg/jpeg_6b.bb
+++ b/packages/jpeg/jpeg_6b.bb
@@ -16,7 +16,7 @@ S = "${WORKDIR}/jpeg-${PV}"
 inherit autotools 
 
 EXTRA_OECONF="--enable-static --enable-shared"
-EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR}/${HOST_SYS}-libtool"'
+EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool"'
 
 CFLAGS_append = " -D_REENTRANT"
 
diff --git a/packages/kaffe/kaffe-qt_cvs.bb b/packages/kaffe/kaffe-qt_cvs.bb
index bd5d2968f6..8edecdc868 100644
--- a/packages/kaffe/kaffe-qt_cvs.bb
+++ b/packages/kaffe/kaffe-qt_cvs.bb
@@ -9,7 +9,7 @@ require kaffe.inc
 DEPENDS += "libqpe-opie"
 
 CXXFLAGS += " -DQPE "
-EXTRA_OEMAKE += "MOC=${STAGING_BINDIR}/moc"
+EXTRA_OEMAKE += "MOC=${STAGING_BINDIR_NATIVE}/moc"
 EXTRA_OECONF += " --with-qtdir=$QTDIR \
 	--with-awt=qt \
 	--enable-pure-java-math \
diff --git a/packages/kf/kf_0.5.4.1.bb b/packages/kf/kf_0.5.4.1.bb
index 39229f7a9b..4cfd685f43 100755
--- a/packages/kf/kf_0.5.4.1.bb
+++ b/packages/kf/kf_0.5.4.1.bb
@@ -9,7 +9,7 @@ SRC_URI = "http://jabberstudio.2nw.net/${PN}/${PN}-${PV}.tar.gz \
 
 inherit autotools pkgconfig
 
-export PKG_CONFIG="${STAGING_BINDIR}/pkg-config"
+export PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config"
 
 EXTRA_OECONF = "--disable-binreloc"
 
diff --git a/packages/konqueror/konqueror-embedded_20030705.bb b/packages/konqueror/konqueror-embedded_20030705.bb
index 690df1acfa..4cc1f8d4fe 100644
--- a/packages/konqueror/konqueror-embedded_20030705.bb
+++ b/packages/konqueror/konqueror-embedded_20030705.bb
@@ -28,9 +28,9 @@ inherit autotools
 
 FILES_${PN} = "${palmtopdir}"
 
-export QMAKE = "${STAGING_BINDIR}/qmake"
-export MOC = "${STAGING_BINDIR}/moc"
-export UIC = "${STAGING_BINDIR}/uic"
+export QMAKE = "${STAGING_BINDIR_NATIVE}/qmake"
+export MOC = "${STAGING_BINDIR_NATIVE}/moc"
+export UIC = "${STAGING_BINDIR_NATIVE}/uic"
 export exec_prefix = "${STAGING_LIBDIR}/.."
 
 EXTRA_OECONF = '--prefix=${palmtopdir} --exec-prefix=${palmtopdir}                              \
diff --git a/packages/konqueror/konqueror-embedded_20060404.bb b/packages/konqueror/konqueror-embedded_20060404.bb
index 221ecb0bb3..0b7e0aff8b 100644
--- a/packages/konqueror/konqueror-embedded_20060404.bb
+++ b/packages/konqueror/konqueror-embedded_20060404.bb
@@ -18,9 +18,9 @@ SRC_URI = "svn://anonsvn.kde.org/home/kde/tags/KDE/3.5.1;module=kdelibs;date=${P
 #          file://inject-extraflags.patch;patch=1"
 S = "${WORKDIR}/kdenox"
 
-export QMAKE = "${STAGING_BINDIR}/qmake"
-export MOC = "${STAGING_BINDIR}/moc"
-export UIC = "${STAGING_BINDIR}/uic"
+export QMAKE = "${STAGING_BINDIR_NATIVE}/qmake"
+export MOC = "${STAGING_BINDIR_NATIVE}/moc"
+export UIC = "${STAGING_BINDIR_NATIVE}/uic"
 export exec_prefix = "${palmtopdir}"
 export CXXFLAGS = "-fexceptions -frtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DQT_NO_DOM -DENABLE_BOOKMARKS"
 export PCRE_CONFIG = "invalid"
diff --git a/packages/kphonepi/kphonepi_1.0.0.bb b/packages/kphonepi/kphonepi_1.0.0.bb
index fe1024afa8..6eb3249821 100644
--- a/packages/kphonepi/kphonepi_1.0.0.bb
+++ b/packages/kphonepi/kphonepi_1.0.0.bb
@@ -11,7 +11,7 @@ S = "${WORKDIR}/kphone_pi"
 
 inherit palmtop
 
-EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, OBJECTS_DIR=obj/ MOC_DIR=moc/ TARGET=${S}/dest/kppi HEADERS-=kphone/qptrlisth HEADERS+=kphone/qptrlist.h LIBS+=-lstdc++"
+EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR_NATIVE}/uic QMAKE_MOC=${STAGING_BINDIR_NATIVE}/moc QMAKE_RPATH=-Wl,-rpath-link, OBJECTS_DIR=obj/ MOC_DIR=moc/ TARGET=${S}/dest/kppi HEADERS-=kphone/qptrlisth HEADERS+=kphone/qptrlist.h LIBS+=-lstdc++"
 QMAKE_PROFILES= "kphone_piE.pro"
 
 do_configure_prepend() {
diff --git a/packages/ktimetrackerpi/ktimetrackerpi_0.9.7.bb b/packages/ktimetrackerpi/ktimetrackerpi_0.9.7.bb
index 7724a3605f..d022dc55cc 100644
--- a/packages/ktimetrackerpi/ktimetrackerpi_0.9.7.bb
+++ b/packages/ktimetrackerpi/ktimetrackerpi_0.9.7.bb
@@ -11,7 +11,7 @@ S = "${WORKDIR}/ktimetracker_pi"
 
 inherit palmtop
 
-EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, OBJECTS_DIR=obj/ MOC_DIR=moc/ TARGET=${S}/dest/ktpi HEADERS-=kphone/qptrlisth HEADERS+=kphone/qptrlist.h LIBS+=-lstdc++"
+EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR_NATIVE}/uic QMAKE_MOC=${STAGING_BINDIR_NATIVE}/moc QMAKE_RPATH=-Wl,-rpath-link, OBJECTS_DIR=obj/ MOC_DIR=moc/ TARGET=${S}/dest/ktpi HEADERS-=kphone/qptrlisth HEADERS+=kphone/qptrlist.h LIBS+=-lstdc++"
 QMAKE_PROFILES= "ktimetracker_piE.pro"
 
 do_configure_prepend() {
diff --git a/packages/lbreakout/lbreakout2_2.6beta.bb b/packages/lbreakout/lbreakout2_2.6beta.bb
index 49becccbd3..496a80904e 100644
--- a/packages/lbreakout/lbreakout2_2.6beta.bb
+++ b/packages/lbreakout/lbreakout2_2.6beta.bb
@@ -7,7 +7,7 @@ PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lgames/lbreakout2-2.6beta.tar.gz"
 
-export SDL_CONFIG = "${STAGING_BINDIR}/sdl-config"
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
 
 inherit autotools
 
diff --git a/packages/libgcrypt/libgcrypt_1.1.91.bb b/packages/libgcrypt/libgcrypt_1.1.91.bb
index c4259eb0f3..0eaeaaf9fc 100644
--- a/packages/libgcrypt/libgcrypt_1.1.91.bb
+++ b/packages/libgcrypt/libgcrypt_1.1.91.bb
@@ -22,7 +22,7 @@ EXTRA_OECONF = "--without-pth"
 do_stage() {
 	oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
 	oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
-	install -m 0755 src/libgcrypt-config ${STAGING_BINDIR}/
+	install -m 0755 src/libgcrypt-config ${STAGING_BINDIR_CROSS}/
 
 	install -d ${STAGING_INCDIR}/
 	for X in gcrypt.h gcrypt-module.h
diff --git a/packages/libgcrypt/libgcrypt_1.2.0.bb b/packages/libgcrypt/libgcrypt_1.2.0.bb
index d961e4f84a..be0ad787da 100644
--- a/packages/libgcrypt/libgcrypt_1.2.0.bb
+++ b/packages/libgcrypt/libgcrypt_1.2.0.bb
@@ -18,7 +18,7 @@ EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
 do_stage() {
 	oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
 	oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
-	install -m 0755 src/libgcrypt-config ${STAGING_BINDIR}/
+	install -m 0755 src/libgcrypt-config ${STAGING_BINDIR_CROSS}/
 
 	install -d ${STAGING_INCDIR}/
 	for X in gcrypt.h gcrypt-module.h
diff --git a/packages/libgcrypt/libgcrypt_1.2.1.bb b/packages/libgcrypt/libgcrypt_1.2.1.bb
index e797ee75c7..3f4942cae5 100644
--- a/packages/libgcrypt/libgcrypt_1.2.1.bb
+++ b/packages/libgcrypt/libgcrypt_1.2.1.bb
@@ -17,7 +17,7 @@ EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
 do_stage() {
 	oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
 	oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
-	install -m 0755 src/libgcrypt-config ${STAGING_BINDIR}/
+	install -m 0755 src/libgcrypt-config ${STAGING_BINDIR_CROSS}/
 
 	install -d ${STAGING_INCDIR}/
 	for X in gcrypt.h gcrypt-module.h
diff --git a/packages/libgcrypt/libgcrypt_1.2.2.bb b/packages/libgcrypt/libgcrypt_1.2.2.bb
index e797ee75c7..3f4942cae5 100644
--- a/packages/libgcrypt/libgcrypt_1.2.2.bb
+++ b/packages/libgcrypt/libgcrypt_1.2.2.bb
@@ -17,7 +17,7 @@ EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
 do_stage() {
 	oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
 	oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
-	install -m 0755 src/libgcrypt-config ${STAGING_BINDIR}/
+	install -m 0755 src/libgcrypt-config ${STAGING_BINDIR_CROSS}/
 
 	install -d ${STAGING_INCDIR}/
 	for X in gcrypt.h gcrypt-module.h
diff --git a/packages/libgcrypt/libgcrypt_1.2.3.bb b/packages/libgcrypt/libgcrypt_1.2.3.bb
index e797ee75c7..3f4942cae5 100644
--- a/packages/libgcrypt/libgcrypt_1.2.3.bb
+++ b/packages/libgcrypt/libgcrypt_1.2.3.bb
@@ -17,7 +17,7 @@ EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
 do_stage() {
 	oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
 	oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
-	install -m 0755 src/libgcrypt-config ${STAGING_BINDIR}/
+	install -m 0755 src/libgcrypt-config ${STAGING_BINDIR_CROSS}/
 
 	install -d ${STAGING_INCDIR}/
 	for X in gcrypt.h gcrypt-module.h
diff --git a/packages/libgpg-error/libgpg-error_0.6.bb b/packages/libgpg-error/libgpg-error_0.6.bb
index fced6b7adc..4929121167 100644
--- a/packages/libgpg-error/libgpg-error_0.6.bb
+++ b/packages/libgpg-error/libgpg-error_0.6.bb
@@ -10,7 +10,8 @@ inherit autotools binconfig
 
 do_stage() {
 	oe_libinstall -so -C src libgpg-error ${STAGING_LIBDIR}
-	install -m 0755 src/gpg-error-config ${STAGING_BINDIR}/
+	install -d ${STAGING_BINDIR_CROSS}/
+	install -m 0755 src/gpg-error-config ${STAGING_BINDIR_CROSS}/
 
 	install -d ${STAGING_INCDIR}/
 	for X in gpg-error.h
diff --git a/packages/libgpg-error/libgpg-error_0.7.bb b/packages/libgpg-error/libgpg-error_0.7.bb
index c165044e83..7edea97fe1 100644
--- a/packages/libgpg-error/libgpg-error_0.7.bb
+++ b/packages/libgpg-error/libgpg-error_0.7.bb
@@ -15,7 +15,8 @@ inherit autotools binconfig pkgconfig
 
 do_stage() {
 	oe_libinstall -a -so -C src libgpg-error ${STAGING_LIBDIR}
-	install -m 0755 src/gpg-error-config ${STAGING_BINDIR}/
+	install -d ${STAGING_BINDIR_CROSS}/
+	install -m 0755 src/gpg-error-config ${STAGING_BINDIR_CROSS}/
 
 	install -d ${STAGING_INCDIR}/
 	for X in gpg-error.h
diff --git a/packages/libgpg-error/libgpg-error_1.0.bb b/packages/libgpg-error/libgpg-error_1.0.bb
index a2a19b254c..e520a23ae0 100644
--- a/packages/libgpg-error/libgpg-error_1.0.bb
+++ b/packages/libgpg-error/libgpg-error_1.0.bb
@@ -15,7 +15,8 @@ inherit autotools binconfig pkgconfig
 
 do_stage() {
 	oe_libinstall -a -so -C src libgpg-error ${STAGING_LIBDIR}
-	install -m 0755 src/gpg-error-config ${STAGING_BINDIR}/
+	install -d ${STAGING_BINDIR_CROSS}/
+	install -m 0755 src/gpg-error-config ${STAGING_BINDIR_CROSS}/
 
 	install -d ${STAGING_INCDIR}/
 	for X in gpg-error.h
diff --git a/packages/libgpg-error/libgpg-error_1.3.bb b/packages/libgpg-error/libgpg-error_1.3.bb
index a2a19b254c..e520a23ae0 100644
--- a/packages/libgpg-error/libgpg-error_1.3.bb
+++ b/packages/libgpg-error/libgpg-error_1.3.bb
@@ -15,7 +15,8 @@ inherit autotools binconfig pkgconfig
 
 do_stage() {
 	oe_libinstall -a -so -C src libgpg-error ${STAGING_LIBDIR}
-	install -m 0755 src/gpg-error-config ${STAGING_BINDIR}/
+	install -d ${STAGING_BINDIR_CROSS}/
+	install -m 0755 src/gpg-error-config ${STAGING_BINDIR_CROSS}/
 
 	install -d ${STAGING_INCDIR}/
 	for X in gpg-error.h
diff --git a/packages/libmikmod/libmikmod_3.1.11.bb b/packages/libmikmod/libmikmod_3.1.11.bb
index 47128165b1..ad3f895db8 100644
--- a/packages/libmikmod/libmikmod_3.1.11.bb
+++ b/packages/libmikmod/libmikmod_3.1.11.bb
@@ -16,9 +16,10 @@ do_stage() {
 	oe_libinstall -a -so -C libmikmod libmikmod ${STAGING_LIBDIR}
 	install -m 0644 ${S}/include/mikmod.h ${STAGING_INCDIR}/
 
+	install -d ${STAGING_BINDIR_CROSS}
         cat libmikmod-config | sed 's,$libdir , ,' \
-                             | sed 's,$includes , ,' > ${STAGING_BINDIR}/libmikmod-config
-        chmod a+rx ${STAGING_BINDIR}/libmikmod-config
+                             | sed 's,$includes , ,' > ${STAGING_BINDIR_CROSS}/libmikmod-config
+        chmod a+rx ${STAGING_BINDIR_CROSS}/libmikmod-config
 	install -d ${STAGING_DATADIR}/aclocal/
 	install -m 0644 libmikmod.m4 ${STAGING_DATADIR}/aclocal/
 }
diff --git a/packages/libnet/libnet_1.0.2a.bb b/packages/libnet/libnet_1.0.2a.bb
index 071a53e0cd..6e6067cf8f 100644
--- a/packages/libnet/libnet_1.0.2a.bb
+++ b/packages/libnet/libnet_1.0.2a.bb
@@ -27,7 +27,7 @@ do_configure() {
 }
 
 do_stage() {
-	install -m 0755 libnet-config ${STAGING_BINDIR}/
+	install -m 0755 libnet-config ${STAGING_BINDIR_CROSS}/
 	install -m 0644 include/libnet.h ${STAGING_INCDIR}/
 	install -d ${STAGING_INCDIR}/libnet
 	install -m 0644 include/libnet/libnet-headers.h ${STAGING_INCDIR}/libnet/
diff --git a/packages/libol/libol_0.3.16.bb b/packages/libol/libol_0.3.16.bb
index 1f11d8371c..18bc4aa66e 100644
--- a/packages/libol/libol_0.3.16.bb
+++ b/packages/libol/libol_0.3.16.bb
@@ -7,7 +7,7 @@ inherit autotools
 
 do_stage() {
 	install -d ${STAGING_INCDIR}/libol
-	install -m 0755 ${S}/libol-config ${STAGING_BINDIR}
+	install -m 0755 ${S}/libol-config ${STAGING_BINDIR_CROSS}
 	install -m 0755 ${S}/src/.libs/libol.so.0.0.0 ${STAGING_LIBDIR}
 	ln -fs ${STAGING_LIBDIR}/libol.so.0.0.0 ${STAGING_LIBDIR}/libol.so.0
 	install ${S}/src/*.h ${STAGING_INCDIR}/libol/
diff --git a/packages/libol/libol_0.3.18.bb b/packages/libol/libol_0.3.18.bb
index dae22db04e..3ddaaa62a3 100644
--- a/packages/libol/libol_0.3.18.bb
+++ b/packages/libol/libol_0.3.18.bb
@@ -8,7 +8,7 @@ inherit autotools
 
 do_stage() {
         install -d ${STAGING_INCDIR}/libol
-        install -m 0755 ${S}/libol-config ${STAGING_BINDIR}
+        install -m 0755 ${S}/libol-config ${STAGING_BINDIR_CROSS}
         install -m 0755 ${S}/src/.libs/libol.so.0.0.0 ${STAGING_LIBDIR}
         ln -fs ${STAGING_LIBDIR}/libol.so.0.0.0 ${STAGING_LIBDIR}/libol.so.0
         install ${S}/src/*.h ${STAGING_INCDIR}/libol/
diff --git a/packages/libopie/libopie2.inc b/packages/libopie/libopie2.inc
index 9f488f346d..17ac4e2605 100644
--- a/packages/libopie/libopie2.inc
+++ b/packages/libopie/libopie2.inc
@@ -51,7 +51,7 @@ do_compile() {
 		install -m 0644 opiepim/private/$header ${STAGING_INCDIR}/opie2/private/
 	done
 
-	oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic DESTDIR=${S}
+	oe_runmake MOC=${STAGING_BINDIR_NATIVE}/moc UIC=${STAGING_BINDIR_NATIVE}/uic DESTDIR=${S}
 }
 
 do_stage() {
diff --git a/packages/libqpe/libqpe-opie.inc b/packages/libqpe/libqpe-opie.inc
index 832aff7cd0..342c7d643b 100644
--- a/packages/libqpe/libqpe-opie.inc
+++ b/packages/libqpe/libqpe-opie.inc
@@ -44,7 +44,7 @@ do_compile() {
 		install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i`
 	done
 	rm -f ${STAGING_INCDIR}/qtopia/*_p.h # remove private stuff out of qtopia
-	oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic
+	oe_runmake MOC=${STAGING_BINDIR_NATIVE}/moc UIC=${STAGING_BINDIR_NATIVE}/uic
 }
 
 do_stage() {
diff --git a/packages/libqtaux/libqtaux2.inc b/packages/libqtaux/libqtaux2.inc
index 258df26a15..f8721678cf 100644
--- a/packages/libqtaux/libqtaux2.inc
+++ b/packages/libqtaux/libqtaux2.inc
@@ -14,7 +14,7 @@ do_compile() {
 	do
 		install -m 0644 $i ${STAGING_INCDIR}/opie2/`basename $i`
 	done
-	oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic DESTDIR=${S}
+	oe_runmake MOC=${STAGING_BINDIR_NATIVE}/moc UIC=${STAGING_BINDIR_NATIVE}/uic DESTDIR=${S}
 }
 
 do_stage() {
diff --git a/packages/libsdl/libsdl-mixer_1.2.6.bb b/packages/libsdl/libsdl-mixer_1.2.6.bb
index ffc1c6956f..f78d992806 100644
--- a/packages/libsdl/libsdl-mixer_1.2.6.bb
+++ b/packages/libsdl/libsdl-mixer_1.2.6.bb
@@ -8,7 +8,7 @@ PR = "r1"
 SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz"
 S = "${WORKDIR}/SDL_mixer-${PV}"
 
-export SDL_CONFIG = "${STAGING_BINDIR}/sdl-config"
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
 
 inherit autotools
 
diff --git a/packages/libxine/libxine_1.1.0.bb b/packages/libxine/libxine_1.1.0.bb
index 7b78d2ae51..270ac8f6e5 100644
--- a/packages/libxine/libxine_1.1.0.bb
+++ b/packages/libxine/libxine_1.1.0.bb
@@ -43,7 +43,7 @@ EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
 	--disable-aalibtest \
 	--with-x --x-includes=${STAGING_INCDIR}/X11 --x-libraries=${STAGING_LIBDIR}"
 
-export WAND_CONFIG="${STAGING_BINDIR}/Wand-config"
+export WAND_CONFIG="${STAGING_BINDIR_CROSS}/Wand-config"
 
 do_compile() {
 	oe_runmake LIBTOOL=${S}/${TARGET_SYS}-libtool
diff --git a/packages/linux-hotplug/linux-hotplug-20040920/dash.patch b/packages/linux-hotplug/linux-hotplug-20040920/dash.patch
new file mode 100644
index 0000000000..161671f2e2
--- /dev/null
+++ b/packages/linux-hotplug/linux-hotplug-20040920/dash.patch
@@ -0,0 +1,17 @@
+Index: hotplug-2004_09_20/Makefile
+===================================================================
+--- hotplug-2004_09_20.orig/Makefile	2006-11-29 17:01:16.000000000 +0100
++++ hotplug-2004_09_20/Makefile	2006-11-29 17:04:39.000000000 +0100
+@@ -86,10 +86,10 @@
+ 	${INSTALL_SCRIPT} -D sbin/hotplug $(sbindir)/hotplug
+ 	$(INSTALL) -d $(etcdir)/hotplug/{usb,pci}
+ 	$(INSTALL) -D etc/hotplug.d/default/default.hotplug $(etcdir)/hotplug.d/default/default.hotplug
+-	for F in etc/hotplug/{*.{agent,rc},hotplug.functions} ; do \
++	for F in etc/hotplug/*.agent etc/hotplug/*.rc etc/hotplug/hotplug.functions ; do \
+ 	    ${INSTALL_SCRIPT} $$F $(etcdir)/hotplug ; \
+ 	    done
+-	for F in etc/hotplug/{blacklist,usb.{user,hand,dist}map} ; do \
++	for F in etc/hotplug/blacklist etc/hotplug/usb.*map ; do \
+ 	    ${INSTALL_DATA} $$F $(etcdir)/hotplug ; \
+ 	    done
+ 	${INSTALL_SCRIPT} -D etc/rc.d/init.d/hotplug $(etcdir)/init.d/hotplug
diff --git a/packages/linux-hotplug/linux-hotplug_20040920.bb b/packages/linux-hotplug/linux-hotplug_20040920.bb
index c6bcbb66e6..7c27551903 100644
--- a/packages/linux-hotplug/linux-hotplug_20040920.bb
+++ b/packages/linux-hotplug/linux-hotplug_20040920.bb
@@ -8,9 +8,10 @@ RCONFLICTS_${PN} = "hotplug"
 RREPLACES_${PN} = "hotplug"
 SECTION = "base"
 RSUGGESTS = "pciutils usbutils"
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_09_20.tar.gz \
+	file://dash.patch;patch=1 \
 	file://userspecified_hcd.patch;patch=1 \
 	file://hotplug-net-agent-usb.patch;patch=1 \
 	file://usbrc-busybox.patch;patch=1 \
diff --git a/packages/linux/ixp4xx-kernel-svnpatch.inc b/packages/linux/ixp4xx-kernel-svnpatch.inc
index 601d7e9090..992310b5a8 100644
--- a/packages/linux/ixp4xx-kernel-svnpatch.inc
+++ b/packages/linux/ixp4xx-kernel-svnpatch.inc
@@ -7,5 +7,5 @@ do_svnpatch() {
 	cp ${WORKDIR}/patches-${PV}/defconfig ${WORKDIR}/defconfig
 	rm -rf ${S}/patches
 	cd ${S} && ln -s ${WORKDIR}/patches-${PV} ${S}/patches
-	cd ${S} && rm -rf .pc && ${STAGING_BINDIR}/quilt push -av
+	cd ${S} && rm -rf .pc && ${STAGING_BINDIR_NATIVE}/quilt push -av
 }
diff --git a/packages/linux/ixp4xx-kernel_2.6.19-rc6.bb b/packages/linux/ixp4xx-kernel_2.6.19.bb
index 7620aedb0c..d7dbf10618 100644
--- a/packages/linux/ixp4xx-kernel_2.6.19-rc6.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.19.bb
@@ -6,7 +6,7 @@
 # http://trac.nslu2-linux.org/kernel/
 #
 # The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "591"
+IXP4XX_KERNEL_SVN_REV = "595"
 #
 # The directory containing the patches to be applied is
 # specified below
diff --git a/packages/linux/linux-openzaurus-2.6.16/.mtn2git_empty b/packages/linux/linux-rp-2.6.16/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.16/.mtn2git_empty
+++ b/packages/linux/linux-rp-2.6.16/.mtn2git_empty
diff --git a/packages/linux/linux-openzaurus-2.6.16/00-hostap.patch b/packages/linux/linux-rp-2.6.16/00-hostap.patch
index 20432b404a..20432b404a 100644
--- a/packages/linux/linux-openzaurus-2.6.16/00-hostap.patch
+++ b/packages/linux/linux-rp-2.6.16/00-hostap.patch
diff --git a/packages/linux/linux-openzaurus-2.6.16/10-pcnet.patch b/packages/linux/linux-rp-2.6.16/10-pcnet.patch
index 2e1966e837..2e1966e837 100644
--- a/packages/linux/linux-openzaurus-2.6.16/10-pcnet.patch
+++ b/packages/linux/linux-rp-2.6.16/10-pcnet.patch
diff --git a/packages/linux/linux-openzaurus-2.6.16/add-oz-release-string.patch b/packages/linux/linux-rp-2.6.16/add-oz-release-string.patch
index 22a6fd3943..22a6fd3943 100644
--- a/packages/linux/linux-openzaurus-2.6.16/add-oz-release-string.patch
+++ b/packages/linux/linux-rp-2.6.16/add-oz-release-string.patch
diff --git a/packages/linux/linux-openzaurus-2.6.16/connectplus-remove-ide-HACK.patch b/packages/linux/linux-rp-2.6.16/connectplus-remove-ide-HACK.patch
index 4414b21191..4414b21191 100644
--- a/packages/linux/linux-openzaurus-2.6.16/connectplus-remove-ide-HACK.patch
+++ b/packages/linux/linux-rp-2.6.16/connectplus-remove-ide-HACK.patch
diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-akita b/packages/linux/linux-rp-2.6.16/defconfig-akita
index 249466ac87..249466ac87 100644
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-akita
+++ b/packages/linux/linux-rp-2.6.16/defconfig-akita
diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 b/packages/linux/linux-rp-2.6.16/defconfig-c7x0
index 1d702f60c0..1d702f60c0 100644
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0
+++ b/packages/linux/linux-rp-2.6.16/defconfig-c7x0
diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-collie b/packages/linux/linux-rp-2.6.16/defconfig-collie
index 67bda811c4..67bda811c4 100644
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-collie
+++ b/packages/linux/linux-rp-2.6.16/defconfig-collie
diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-hx2000 b/packages/linux/linux-rp-2.6.16/defconfig-hx2000
index c1344660f3..c1344660f3 100644
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-hx2000
+++ b/packages/linux/linux-rp-2.6.16/defconfig-hx2000
diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-poodle b/packages/linux/linux-rp-2.6.16/defconfig-poodle
index 8450fc9b68..8450fc9b68 100644
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-poodle
+++ b/packages/linux/linux-rp-2.6.16/defconfig-poodle
diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-qemuarm b/packages/linux/linux-rp-2.6.16/defconfig-qemuarm
index 33f9693d9b..33f9693d9b 100644
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-qemuarm
+++ b/packages/linux/linux-rp-2.6.16/defconfig-qemuarm
diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-spitz b/packages/linux/linux-rp-2.6.16/defconfig-spitz
index d2b4c470aa..d2b4c470aa 100644
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-spitz
+++ b/packages/linux/linux-rp-2.6.16/defconfig-spitz
diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa b/packages/linux/linux-rp-2.6.16/defconfig-tosa
index 543aa10bb3..543aa10bb3 100644
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa
+++ b/packages/linux/linux-rp-2.6.16/defconfig-tosa
diff --git a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r5.patch b/packages/linux/linux-rp-2.6.16/hrw-pcmcia-ids-r5.patch
index b5a570d38c..b5a570d38c 100644
--- a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r5.patch
+++ b/packages/linux/linux-rp-2.6.16/hrw-pcmcia-ids-r5.patch
diff --git a/packages/linux/linux-openzaurus-2.6.16/locomo-kbd-hotkeys.patch b/packages/linux/linux-rp-2.6.16/locomo-kbd-hotkeys.patch
index 8b296780d4..8b296780d4 100644
--- a/packages/linux/linux-openzaurus-2.6.16/locomo-kbd-hotkeys.patch
+++ b/packages/linux/linux-rp-2.6.16/locomo-kbd-hotkeys.patch
diff --git a/packages/linux/linux-openzaurus-2.6.16/locomo-lcd-def-bightness.patch b/packages/linux/linux-rp-2.6.16/locomo-lcd-def-bightness.patch
index 6408ef9551..6408ef9551 100644
--- a/packages/linux/linux-openzaurus-2.6.16/locomo-lcd-def-bightness.patch
+++ b/packages/linux/linux-rp-2.6.16/locomo-lcd-def-bightness.patch
diff --git a/packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch b/packages/linux/linux-rp-2.6.16/locomo-sysrq+keyrepeat.patch
index 7e233277da..7e233277da 100644
--- a/packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch
+++ b/packages/linux/linux-rp-2.6.16/locomo-sysrq+keyrepeat.patch
diff --git a/packages/linux/linux-openzaurus-2.6.16/maxpower-message.patch b/packages/linux/linux-rp-2.6.16/maxpower-message.patch
index 6e76be4d1c..6e76be4d1c 100644
--- a/packages/linux/linux-openzaurus-2.6.16/maxpower-message.patch
+++ b/packages/linux/linux-rp-2.6.16/maxpower-message.patch
diff --git a/packages/linux/linux-openzaurus-2.6.16/pxa-serial-hack.patch b/packages/linux/linux-rp-2.6.16/pxa-serial-hack.patch
index b3a7f786ea..b3a7f786ea 100644
--- a/packages/linux/linux-openzaurus-2.6.16/pxa-serial-hack.patch
+++ b/packages/linux/linux-rp-2.6.16/pxa-serial-hack.patch
diff --git a/packages/linux/linux-openzaurus-2.6.16/rmk-mmc1.patch b/packages/linux/linux-rp-2.6.16/rmk-mmc1.patch
index 054b48d28d..054b48d28d 100644
--- a/packages/linux/linux-openzaurus-2.6.16/rmk-mmc1.patch
+++ b/packages/linux/linux-rp-2.6.16/rmk-mmc1.patch
diff --git a/packages/linux/linux-openzaurus-2.6.16/rmk-mmc2.patch b/packages/linux/linux-rp-2.6.16/rmk-mmc2.patch
index cef02436d6..cef02436d6 100644
--- a/packages/linux/linux-openzaurus-2.6.16/rmk-mmc2.patch
+++ b/packages/linux/linux-rp-2.6.16/rmk-mmc2.patch
diff --git a/packages/linux/linux-openzaurus-2.6.16/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch b/packages/linux/linux-rp-2.6.16/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
index 18bf4268fc..18bf4268fc 100644
--- a/packages/linux/linux-openzaurus-2.6.16/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
+++ b/packages/linux/linux-rp-2.6.16/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
diff --git a/packages/linux/linux-openzaurus-2.6.16/squashfs3.0-2.6.15.patch b/packages/linux/linux-rp-2.6.16/squashfs3.0-2.6.15.patch
index 6fec9eba03..6fec9eba03 100644
--- a/packages/linux/linux-openzaurus-2.6.16/squashfs3.0-2.6.15.patch
+++ b/packages/linux/linux-rp-2.6.16/squashfs3.0-2.6.15.patch
diff --git a/packages/linux/linux-openzaurus-2.6.17/.mtn2git_empty b/packages/linux/linux-rp-2.6.17/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.17/.mtn2git_empty
+++ b/packages/linux/linux-rp-2.6.17/.mtn2git_empty
diff --git a/packages/linux/linux-openzaurus-2.6.17/00-hostap.patch b/packages/linux/linux-rp-2.6.17/00-hostap.patch
index 20432b404a..20432b404a 100644
--- a/packages/linux/linux-openzaurus-2.6.17/00-hostap.patch
+++ b/packages/linux/linux-rp-2.6.17/00-hostap.patch
diff --git a/packages/linux/linux-openzaurus-2.6.17/10-pcnet.patch b/packages/linux/linux-rp-2.6.17/10-pcnet.patch
index 2e1966e837..2e1966e837 100644
--- a/packages/linux/linux-openzaurus-2.6.17/10-pcnet.patch
+++ b/packages/linux/linux-rp-2.6.17/10-pcnet.patch
diff --git a/packages/linux/linux-openzaurus-2.6.17/add-oz-release-string.patch b/packages/linux/linux-rp-2.6.17/add-oz-release-string.patch
index 22a6fd3943..22a6fd3943 100644
--- a/packages/linux/linux-openzaurus-2.6.17/add-oz-release-string.patch
+++ b/packages/linux/linux-rp-2.6.17/add-oz-release-string.patch
diff --git a/packages/linux/linux-openzaurus-2.6.17/asoc-v0.12.4_2.6.17.patch b/packages/linux/linux-rp-2.6.17/asoc-v0.12.4_2.6.17.patch
index 7fa3822bba..7fa3822bba 100644
--- a/packages/linux/linux-openzaurus-2.6.17/asoc-v0.12.4_2.6.17.patch
+++ b/packages/linux/linux-rp-2.6.17/asoc-v0.12.4_2.6.17.patch
diff --git a/packages/linux/linux-openzaurus-2.6.17/connectplus-remove-ide-HACK.patch b/packages/linux/linux-rp-2.6.17/connectplus-remove-ide-HACK.patch
index 4414b21191..4414b21191 100644
--- a/packages/linux/linux-openzaurus-2.6.17/connectplus-remove-ide-HACK.patch
+++ b/packages/linux/linux-rp-2.6.17/connectplus-remove-ide-HACK.patch
diff --git a/packages/linux/linux-openzaurus-2.6.17/defconfig-akita b/packages/linux/linux-rp-2.6.17/defconfig-akita
index 249466ac87..249466ac87 100644
--- a/packages/linux/linux-openzaurus-2.6.17/defconfig-akita
+++ b/packages/linux/linux-rp-2.6.17/defconfig-akita
diff --git a/packages/linux/linux-openzaurus-2.6.17/defconfig-c7x0 b/packages/linux/linux-rp-2.6.17/defconfig-c7x0
index 1d702f60c0..1d702f60c0 100644
--- a/packages/linux/linux-openzaurus-2.6.17/defconfig-c7x0
+++ b/packages/linux/linux-rp-2.6.17/defconfig-c7x0
diff --git a/packages/linux/linux-openzaurus-2.6.17/defconfig-collie b/packages/linux/linux-rp-2.6.17/defconfig-collie
index f488d42d93..f488d42d93 100644
--- a/packages/linux/linux-openzaurus-2.6.17/defconfig-collie
+++ b/packages/linux/linux-rp-2.6.17/defconfig-collie
diff --git a/packages/linux/linux-openzaurus-2.6.17/defconfig-hx2000 b/packages/linux/linux-rp-2.6.17/defconfig-hx2000
index ea56989b75..ea56989b75 100644
--- a/packages/linux/linux-openzaurus-2.6.17/defconfig-hx2000
+++ b/packages/linux/linux-rp-2.6.17/defconfig-hx2000
diff --git a/packages/linux/linux-openzaurus-2.6.17/defconfig-poodle b/packages/linux/linux-rp-2.6.17/defconfig-poodle
index deacd170f2..deacd170f2 100644
--- a/packages/linux/linux-openzaurus-2.6.17/defconfig-poodle
+++ b/packages/linux/linux-rp-2.6.17/defconfig-poodle
diff --git a/packages/linux/linux-openzaurus-2.6.17/defconfig-qemuarm b/packages/linux/linux-rp-2.6.17/defconfig-qemuarm
index abb6726556..abb6726556 100644
--- a/packages/linux/linux-openzaurus-2.6.17/defconfig-qemuarm
+++ b/packages/linux/linux-rp-2.6.17/defconfig-qemuarm
diff --git a/packages/linux/linux-openzaurus-2.6.17/defconfig-qemux86 b/packages/linux/linux-rp-2.6.17/defconfig-qemux86
index fb66874b90..fb66874b90 100644
--- a/packages/linux/linux-openzaurus-2.6.17/defconfig-qemux86
+++ b/packages/linux/linux-rp-2.6.17/defconfig-qemux86
diff --git a/packages/linux/linux-openzaurus-2.6.17/defconfig-spitz b/packages/linux/linux-rp-2.6.17/defconfig-spitz
index 824fd57aaa..824fd57aaa 100644
--- a/packages/linux/linux-openzaurus-2.6.17/defconfig-spitz
+++ b/packages/linux/linux-rp-2.6.17/defconfig-spitz
diff --git a/packages/linux/linux-openzaurus-2.6.17/defconfig-tosa b/packages/linux/linux-rp-2.6.17/defconfig-tosa
index 4144e5cf38..4144e5cf38 100644
--- a/packages/linux/linux-openzaurus-2.6.17/defconfig-tosa
+++ b/packages/linux/linux-rp-2.6.17/defconfig-tosa
diff --git a/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r5.patch b/packages/linux/linux-rp-2.6.17/hrw-pcmcia-ids-r5.patch
index b5a570d38c..b5a570d38c 100644
--- a/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r5.patch
+++ b/packages/linux/linux-rp-2.6.17/hrw-pcmcia-ids-r5.patch
diff --git a/packages/linux/linux-openzaurus-2.6.17/orinoco-remove-all-which-are-in-hostap-HACK.patch b/packages/linux/linux-rp-2.6.17/orinoco-remove-all-which-are-in-hostap-HACK.patch
index 380349f809..380349f809 100644
--- a/packages/linux/linux-openzaurus-2.6.17/orinoco-remove-all-which-are-in-hostap-HACK.patch
+++ b/packages/linux/linux-rp-2.6.17/orinoco-remove-all-which-are-in-hostap-HACK.patch
diff --git a/packages/linux/linux-openzaurus-2.6.17/pxa-serial-hack.patch b/packages/linux/linux-rp-2.6.17/pxa-serial-hack.patch
index b3a7f786ea..b3a7f786ea 100644
--- a/packages/linux/linux-openzaurus-2.6.17/pxa-serial-hack.patch
+++ b/packages/linux/linux-rp-2.6.17/pxa-serial-hack.patch
diff --git a/packages/linux/linux-openzaurus-2.6.17/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch b/packages/linux/linux-rp-2.6.17/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
index 18bf4268fc..18bf4268fc 100644
--- a/packages/linux/linux-openzaurus-2.6.17/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
+++ b/packages/linux/linux-rp-2.6.17/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
diff --git a/packages/linux/linux-openzaurus-2.6.17/squashfs3.0-2.6.15.patch b/packages/linux/linux-rp-2.6.17/squashfs3.0-2.6.15.patch
index 6fec9eba03..6fec9eba03 100644
--- a/packages/linux/linux-openzaurus-2.6.17/squashfs3.0-2.6.15.patch
+++ b/packages/linux/linux-rp-2.6.17/squashfs3.0-2.6.15.patch
diff --git a/packages/linux/linux-openzaurus-2.6.17/tosa-lcdnoise-r0.patch b/packages/linux/linux-rp-2.6.17/tosa-lcdnoise-r0.patch
index cb014fb8bc..cb014fb8bc 100644
--- a/packages/linux/linux-openzaurus-2.6.17/tosa-lcdnoise-r0.patch
+++ b/packages/linux/linux-rp-2.6.17/tosa-lcdnoise-r0.patch
diff --git a/packages/linux/linux-openzaurus-2.6.17/vesafb-tng-1.0-rc2-git-20060629.patch b/packages/linux/linux-rp-2.6.17/vesafb-tng-1.0-rc2-git-20060629.patch
index 188ce6094e..188ce6094e 100644
--- a/packages/linux/linux-openzaurus-2.6.17/vesafb-tng-1.0-rc2-git-20060629.patch
+++ b/packages/linux/linux-rp-2.6.17/vesafb-tng-1.0-rc2-git-20060629.patch
diff --git a/packages/linux/linux-openzaurus-2.6.17/wm97xx-lcdnoise-r0.patch b/packages/linux/linux-rp-2.6.17/wm97xx-lcdnoise-r0.patch
index 191de3af22..191de3af22 100644
--- a/packages/linux/linux-openzaurus-2.6.17/wm97xx-lcdnoise-r0.patch
+++ b/packages/linux/linux-rp-2.6.17/wm97xx-lcdnoise-r0.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/.mtn2git_empty b/packages/linux/linux-rp-2.6.18+git/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/.mtn2git_empty
+++ b/packages/linux/linux-rp-2.6.18+git/.mtn2git_empty
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/add-oz-release-string.patch b/packages/linux/linux-rp-2.6.18+git/add-oz-release-string.patch
index a80a1d5528..a80a1d5528 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/add-oz-release-string.patch
+++ b/packages/linux/linux-rp-2.6.18+git/add-oz-release-string.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/connectplus-remove-ide-HACK.patch b/packages/linux/linux-rp-2.6.18+git/connectplus-remove-ide-HACK.patch
index 4414b21191..4414b21191 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/connectplus-remove-ide-HACK.patch
+++ b/packages/linux/linux-rp-2.6.18+git/connectplus-remove-ide-HACK.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-akita b/packages/linux/linux-rp-2.6.18+git/defconfig-akita
index 249466ac87..249466ac87 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-akita
+++ b/packages/linux/linux-rp-2.6.18+git/defconfig-akita
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-c7x0 b/packages/linux/linux-rp-2.6.18+git/defconfig-c7x0
index 1d702f60c0..1d702f60c0 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-c7x0
+++ b/packages/linux/linux-rp-2.6.18+git/defconfig-c7x0
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-collie b/packages/linux/linux-rp-2.6.18+git/defconfig-collie
index f488d42d93..f488d42d93 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-collie
+++ b/packages/linux/linux-rp-2.6.18+git/defconfig-collie
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-hx2000 b/packages/linux/linux-rp-2.6.18+git/defconfig-hx2000
index ea56989b75..ea56989b75 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-hx2000
+++ b/packages/linux/linux-rp-2.6.18+git/defconfig-hx2000
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-poodle b/packages/linux/linux-rp-2.6.18+git/defconfig-poodle
index deacd170f2..deacd170f2 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-poodle
+++ b/packages/linux/linux-rp-2.6.18+git/defconfig-poodle
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-qemuarm b/packages/linux/linux-rp-2.6.18+git/defconfig-qemuarm
index abb6726556..abb6726556 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-qemuarm
+++ b/packages/linux/linux-rp-2.6.18+git/defconfig-qemuarm
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-qemux86 b/packages/linux/linux-rp-2.6.18+git/defconfig-qemux86
index fb66874b90..fb66874b90 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-qemux86
+++ b/packages/linux/linux-rp-2.6.18+git/defconfig-qemux86
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-spitz b/packages/linux/linux-rp-2.6.18+git/defconfig-spitz
index 824fd57aaa..824fd57aaa 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-spitz
+++ b/packages/linux/linux-rp-2.6.18+git/defconfig-spitz
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-tosa b/packages/linux/linux-rp-2.6.18+git/defconfig-tosa
index 4144e5cf38..4144e5cf38 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-tosa
+++ b/packages/linux/linux-rp-2.6.18+git/defconfig-tosa
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/hrw-pcmcia-ids-r5.patch b/packages/linux/linux-rp-2.6.18+git/hrw-pcmcia-ids-r5.patch
index b5a570d38c..b5a570d38c 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/hrw-pcmcia-ids-r5.patch
+++ b/packages/linux/linux-rp-2.6.18+git/hrw-pcmcia-ids-r5.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/pxa-serial-hack.patch b/packages/linux/linux-rp-2.6.18+git/pxa-serial-hack.patch
index 9ece71331a..9ece71331a 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/pxa-serial-hack.patch
+++ b/packages/linux/linux-rp-2.6.18+git/pxa-serial-hack.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch b/packages/linux/linux-rp-2.6.18+git/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
index 18bf4268fc..18bf4268fc 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
+++ b/packages/linux/linux-rp-2.6.18+git/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/sharpsl-pm-postresume-r1.patch b/packages/linux/linux-rp-2.6.18+git/sharpsl-pm-postresume-r1.patch
index 409daf03e6..409daf03e6 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/sharpsl-pm-postresume-r1.patch
+++ b/packages/linux/linux-rp-2.6.18+git/sharpsl-pm-postresume-r1.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/squashfs3.0-2.6.15.patch b/packages/linux/linux-rp-2.6.18+git/squashfs3.0-2.6.15.patch
index 097659abad..097659abad 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/squashfs3.0-2.6.15.patch
+++ b/packages/linux/linux-rp-2.6.18+git/squashfs3.0-2.6.15.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/tmio-nand-r7.patch b/packages/linux/linux-rp-2.6.18+git/tmio-nand-r7.patch
index b6ce56eea4..b6ce56eea4 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/tmio-nand-r7.patch
+++ b/packages/linux/linux-rp-2.6.18+git/tmio-nand-r7.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/tmio-ohci-r6.patch b/packages/linux/linux-rp-2.6.18+git/tmio-ohci-r6.patch
index 9fdd2962c9..9fdd2962c9 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/tmio-ohci-r6.patch
+++ b/packages/linux/linux-rp-2.6.18+git/tmio-ohci-r6.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/tmio-tc6393-r8.patch b/packages/linux/linux-rp-2.6.18+git/tmio-tc6393-r8.patch
index 2f1b47d783..2f1b47d783 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/tmio-tc6393-r8.patch
+++ b/packages/linux/linux-rp-2.6.18+git/tmio-tc6393-r8.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/tosa-keyboard-r18.patch b/packages/linux/linux-rp-2.6.18+git/tosa-keyboard-r18.patch
index 00bac40db5..00bac40db5 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/tosa-keyboard-r18.patch
+++ b/packages/linux/linux-rp-2.6.18+git/tosa-keyboard-r18.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/tosa-lcdnoise-r1.patch b/packages/linux/linux-rp-2.6.18+git/tosa-lcdnoise-r1.patch
index 624098bc64..624098bc64 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/tosa-lcdnoise-r1.patch
+++ b/packages/linux/linux-rp-2.6.18+git/tosa-lcdnoise-r1.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/tosa-tmio-lcd-r10.patch b/packages/linux/linux-rp-2.6.18+git/tosa-tmio-lcd-r10.patch
index aef3a047c1..aef3a047c1 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/tosa-tmio-lcd-r10.patch
+++ b/packages/linux/linux-rp-2.6.18+git/tosa-tmio-lcd-r10.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/wm9712-reset-loop-r2.patch b/packages/linux/linux-rp-2.6.18+git/wm9712-reset-loop-r2.patch
index 78e81ea83a..78e81ea83a 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/wm9712-reset-loop-r2.patch
+++ b/packages/linux/linux-rp-2.6.18+git/wm9712-reset-loop-r2.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/wm9712-suspend-cold-res-r2.patch b/packages/linux/linux-rp-2.6.18+git/wm9712-suspend-cold-res-r2.patch
index 5179b47cc4..5179b47cc4 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/wm9712-suspend-cold-res-r2.patch
+++ b/packages/linux/linux-rp-2.6.18+git/wm9712-suspend-cold-res-r2.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/wm97xx-lcdnoise-r0.patch b/packages/linux/linux-rp-2.6.18+git/wm97xx-lcdnoise-r0.patch
index 191de3af22..191de3af22 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/wm97xx-lcdnoise-r0.patch
+++ b/packages/linux/linux-rp-2.6.18+git/wm97xx-lcdnoise-r0.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/.mtn2git_empty b/packages/linux/linux-rp-2.6.18/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.18/.mtn2git_empty
+++ b/packages/linux/linux-rp-2.6.18/.mtn2git_empty
diff --git a/packages/linux/linux-openzaurus-2.6.18/add-oz-release-string.patch b/packages/linux/linux-rp-2.6.18/add-oz-release-string.patch
index 44b33c2e56..44b33c2e56 100644
--- a/packages/linux/linux-openzaurus-2.6.18/add-oz-release-string.patch
+++ b/packages/linux/linux-rp-2.6.18/add-oz-release-string.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/collie-mcp-r1.patch b/packages/linux/linux-rp-2.6.18/collie-mcp-r1.patch
index a7b2342fd0..a7b2342fd0 100644
--- a/packages/linux/linux-openzaurus-2.6.18/collie-mcp-r1.patch
+++ b/packages/linux/linux-rp-2.6.18/collie-mcp-r1.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/connectplus-remove-ide-HACK.patch b/packages/linux/linux-rp-2.6.18/connectplus-remove-ide-HACK.patch
index 4414b21191..4414b21191 100644
--- a/packages/linux/linux-openzaurus-2.6.18/connectplus-remove-ide-HACK.patch
+++ b/packages/linux/linux-rp-2.6.18/connectplus-remove-ide-HACK.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/defconfig-akita b/packages/linux/linux-rp-2.6.18/defconfig-akita
index c56e81b602..c56e81b602 100644
--- a/packages/linux/linux-openzaurus-2.6.18/defconfig-akita
+++ b/packages/linux/linux-rp-2.6.18/defconfig-akita
diff --git a/packages/linux/linux-openzaurus-2.6.18/defconfig-c7x0 b/packages/linux/linux-rp-2.6.18/defconfig-c7x0
index 0cf0d20513..0cf0d20513 100644
--- a/packages/linux/linux-openzaurus-2.6.18/defconfig-c7x0
+++ b/packages/linux/linux-rp-2.6.18/defconfig-c7x0
diff --git a/packages/linux/linux-openzaurus-2.6.18/defconfig-collie b/packages/linux/linux-rp-2.6.18/defconfig-collie
index d31322c4da..d31322c4da 100644
--- a/packages/linux/linux-openzaurus-2.6.18/defconfig-collie
+++ b/packages/linux/linux-rp-2.6.18/defconfig-collie
diff --git a/packages/linux/linux-openzaurus-2.6.18/defconfig-hx2000 b/packages/linux/linux-rp-2.6.18/defconfig-hx2000
index 91ba05fb6b..91ba05fb6b 100644
--- a/packages/linux/linux-openzaurus-2.6.18/defconfig-hx2000
+++ b/packages/linux/linux-rp-2.6.18/defconfig-hx2000
diff --git a/packages/linux/linux-openzaurus-2.6.18/defconfig-poodle b/packages/linux/linux-rp-2.6.18/defconfig-poodle
index deacd170f2..deacd170f2 100644
--- a/packages/linux/linux-openzaurus-2.6.18/defconfig-poodle
+++ b/packages/linux/linux-rp-2.6.18/defconfig-poodle
diff --git a/packages/linux/linux-openzaurus-2.6.18/defconfig-qemuarm b/packages/linux/linux-rp-2.6.18/defconfig-qemuarm
index badf692a96..badf692a96 100644
--- a/packages/linux/linux-openzaurus-2.6.18/defconfig-qemuarm
+++ b/packages/linux/linux-rp-2.6.18/defconfig-qemuarm
diff --git a/packages/linux/linux-openzaurus-2.6.18/defconfig-qemux86 b/packages/linux/linux-rp-2.6.18/defconfig-qemux86
index 92ad5eca2d..92ad5eca2d 100644
--- a/packages/linux/linux-openzaurus-2.6.18/defconfig-qemux86
+++ b/packages/linux/linux-rp-2.6.18/defconfig-qemux86
diff --git a/packages/linux/linux-openzaurus-2.6.18/defconfig-spitz b/packages/linux/linux-rp-2.6.18/defconfig-spitz
index f425956323..f425956323 100644
--- a/packages/linux/linux-openzaurus-2.6.18/defconfig-spitz
+++ b/packages/linux/linux-rp-2.6.18/defconfig-spitz
diff --git a/packages/linux/linux-openzaurus-2.6.18/defconfig-tosa b/packages/linux/linux-rp-2.6.18/defconfig-tosa
index e3ca24eae9..e3ca24eae9 100644
--- a/packages/linux/linux-openzaurus-2.6.18/defconfig-tosa
+++ b/packages/linux/linux-rp-2.6.18/defconfig-tosa
diff --git a/packages/linux/linux-openzaurus-2.6.18/hrw-pcmcia-ids-r5.patch b/packages/linux/linux-rp-2.6.18/hrw-pcmcia-ids-r5.patch
index b5a570d38c..b5a570d38c 100644
--- a/packages/linux/linux-openzaurus-2.6.18/hrw-pcmcia-ids-r5.patch
+++ b/packages/linux/linux-rp-2.6.18/hrw-pcmcia-ids-r5.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/orinoco-remove-all-which-are-in-hostap-HACK.patch b/packages/linux/linux-rp-2.6.18/orinoco-remove-all-which-are-in-hostap-HACK.patch
index 380349f809..380349f809 100644
--- a/packages/linux/linux-openzaurus-2.6.18/orinoco-remove-all-which-are-in-hostap-HACK.patch
+++ b/packages/linux/linux-rp-2.6.18/orinoco-remove-all-which-are-in-hostap-HACK.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/pxa-serial-hack.patch b/packages/linux/linux-rp-2.6.18/pxa-serial-hack.patch
index 5d1b76d5e1..5d1b76d5e1 100644
--- a/packages/linux/linux-openzaurus-2.6.18/pxa-serial-hack.patch
+++ b/packages/linux/linux-rp-2.6.18/pxa-serial-hack.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch b/packages/linux/linux-rp-2.6.18/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
index 18bf4268fc..18bf4268fc 100644
--- a/packages/linux/linux-openzaurus-2.6.18/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
+++ b/packages/linux/linux-rp-2.6.18/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/squashfs3.0-2.6.15.patch b/packages/linux/linux-rp-2.6.18/squashfs3.0-2.6.15.patch
index 2a1665a383..2a1665a383 100644
--- a/packages/linux/linux-openzaurus-2.6.18/squashfs3.0-2.6.15.patch
+++ b/packages/linux/linux-rp-2.6.18/squashfs3.0-2.6.15.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/tmio-nand-r6.patch b/packages/linux/linux-rp-2.6.18/tmio-nand-r6.patch
index 0fa803b874..0fa803b874 100644
--- a/packages/linux/linux-openzaurus-2.6.18/tmio-nand-r6.patch
+++ b/packages/linux/linux-rp-2.6.18/tmio-nand-r6.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/tmio-ohci-r5.patch b/packages/linux/linux-rp-2.6.18/tmio-ohci-r5.patch
index a87469afb3..a87469afb3 100644
--- a/packages/linux/linux-openzaurus-2.6.18/tmio-ohci-r5.patch
+++ b/packages/linux/linux-rp-2.6.18/tmio-ohci-r5.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/tmio-tc6393-r7.patch b/packages/linux/linux-rp-2.6.18/tmio-tc6393-r7.patch
index 844e3757a1..844e3757a1 100644
--- a/packages/linux/linux-openzaurus-2.6.18/tmio-tc6393-r7.patch
+++ b/packages/linux/linux-rp-2.6.18/tmio-tc6393-r7.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/tosa-lcdnoise-r1.patch b/packages/linux/linux-rp-2.6.18/tosa-lcdnoise-r1.patch
index 624098bc64..624098bc64 100644
--- a/packages/linux/linux-openzaurus-2.6.18/tosa-lcdnoise-r1.patch
+++ b/packages/linux/linux-rp-2.6.18/tosa-lcdnoise-r1.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/tosa-tmio-lcd-r9.patch b/packages/linux/linux-rp-2.6.18/tosa-tmio-lcd-r9.patch
index 5887822074..5887822074 100644
--- a/packages/linux/linux-openzaurus-2.6.18/tosa-tmio-lcd-r9.patch
+++ b/packages/linux/linux-rp-2.6.18/tosa-tmio-lcd-r9.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/wm97xx-lcdnoise-r0.patch b/packages/linux/linux-rp-2.6.18/wm97xx-lcdnoise-r0.patch
index 191de3af22..191de3af22 100644
--- a/packages/linux/linux-openzaurus-2.6.18/wm97xx-lcdnoise-r0.patch
+++ b/packages/linux/linux-rp-2.6.18/wm97xx-lcdnoise-r0.patch
diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-rp.inc
index 95c5af6d1a..95c5af6d1a 100644
--- a/packages/linux/linux-openzaurus.inc
+++ b/packages/linux/linux-rp.inc
diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-rp_2.6.16.bb
index 984e5b102b..3f41dfb07c 100644
--- a/packages/linux/linux-openzaurus_2.6.16.bb
+++ b/packages/linux/linux-rp_2.6.16.bb
@@ -1,4 +1,4 @@
-require linux-openzaurus.inc
+require linux-rp.inc
 
 PR = "r47"
 
diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-rp_2.6.17.bb
index 2acc7a3070..cec88f3a71 100644
--- a/packages/linux/linux-openzaurus_2.6.17.bb
+++ b/packages/linux/linux-rp_2.6.17.bb
@@ -1,4 +1,4 @@
-require linux-openzaurus.inc
+require linux-rp.inc
 
 PR = "r31"
 
diff --git a/packages/linux/linux-openzaurus_2.6.18+git.bb b/packages/linux/linux-rp_2.6.18+git.bb
index 6232c9bf47..c8e9a58fdd 100644
--- a/packages/linux/linux-openzaurus_2.6.18+git.bb
+++ b/packages/linux/linux-rp_2.6.18+git.bb
@@ -1,4 +1,4 @@
-require linux-openzaurus.inc
+require linux-rp.inc
 
 PR = "r1"
 
diff --git a/packages/linux/linux-openzaurus_2.6.18.bb b/packages/linux/linux-rp_2.6.18.bb
index 19061f1ed4..3307bf60e8 100644
--- a/packages/linux/linux-openzaurus_2.6.18.bb
+++ b/packages/linux/linux-rp_2.6.18.bb
@@ -1,4 +1,4 @@
-require linux-openzaurus.inc
+require linux-rp.inc
 
 PR = "r5"
 
diff --git a/packages/update-rc.d/update-rc.d-0.6/.mtn2git_empty b/packages/maemo-mapper/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/update-rc.d/update-rc.d-0.6/.mtn2git_empty
+++ b/packages/maemo-mapper/files/.mtn2git_empty
diff --git a/packages/maemo-mapper/files/fix_segfault.patch b/packages/maemo-mapper/files/fix_segfault.patch
new file mode 100644
index 0000000000..23730e8c01
--- /dev/null
+++ b/packages/maemo-mapper/files/fix_segfault.patch
@@ -0,0 +1,31 @@
+ src/maemo-mapper.c |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+Index: trunk/src/maemo-mapper.c
+===================================================================
+--- trunk.orig/src/maemo-mapper.c	2006-11-28 15:11:49.000000000 +0000
++++ trunk/src/maemo-mapper.c	2006-11-28 22:40:19.000000000 +0000
+@@ -140,8 +140,8 @@
+ #define HILDON_HARDKEY_RIGHT		GDK_Right
+ #define HILDON_HARDKEY_SELECT		GDK_Return
+ #define HILDON_HARDKEY_FULLSCREEN	GDK_F10
+-#define HILDON_HARDKEY_INCREASE 	GDK_F6
+-#define HILDON_HARDKEY_DECREASE 	GDK_F5
++#define HILDON_HARDKEY_INCREASE 	GDK_plus
++#define HILDON_HARDKEY_DECREASE 	GDK_minus
+ #define HILDON_HARDKEY_ESC			GDK_Escape
+ #define HILDON_COLOR_BUTTON 		GTK_COLOR_BUTTON
+ 
+@@ -3117,9 +3117,9 @@ set_conn_state(ConnState new_conn_state)
+                 gtk_widget_destroy(_fix_banner);
+                 _fix_banner = NULL;
+             }
+-            if(!_connect_banner)
+-                _connect_banner = hildon_banner_show_animation(
+-                        _window, NULL, _("Searching for GPS receiver"));
++//            if(!_connect_banner)
++//                _connect_banner = hildon_banner_show_animation(
++//                        _window, NULL, _("Searching for GPS receiver"));
+             break;
+         case RCVR_UP:
+             if(_connect_banner)
diff --git a/packages/meta/ludeos-packages.bb b/packages/meta/ludeos-packages.bb
deleted file mode 100644
index 8607e435b4..0000000000
--- a/packages/meta/ludeos-packages.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-DEPENDS = "slugos-packages"
-COMPATIBLE_MACHINE = "nslu2"
diff --git a/packages/misc-binary-only/tda1004x-firmware.bb b/packages/misc-binary-only/tda1004x-firmware.bb
index 77e936fa9b..317a980852 100644
--- a/packages/misc-binary-only/tda1004x-firmware.bb
+++ b/packages/misc-binary-only/tda1004x-firmware.bb
@@ -23,7 +23,7 @@ python do_unpack() {
 	local = bb.data.expand(bb.fetch.localpath(src_uri, localdata), localdata)
 	# dont need any parameters for extraction, strip them off
 	local = re.sub(';.*$', '', local)
-	bindir = bb.data.getVar('STAGING_BINDIR', localdata, 1)
+	bindir = bb.data.getVar('STAGING_BINDIR_NATIVE', localdata, 1)
 	cmd = '%s/unzip %s' % (bindir, local)
 	if not os.path.exists(bb.data.getVar('S', localdata, 1)):
 		os.mkdir(bb.data.getVar('S', localdata, 1))
diff --git a/packages/mysql/mysql_4.1.18.bb b/packages/mysql/mysql_4.1.18.bb
index 79f22e8562..527629d413 100644
--- a/packages/mysql/mysql_4.1.18.bb
+++ b/packages/mysql/mysql_4.1.18.bb
@@ -23,7 +23,7 @@ INITSCRIPT_PACKAGES = "mysql-server"
 INITSCRIPT_NAME = "mysqld"
 INITSCRIPT_PARAMS = "start 45 S . stop 45 0 6 1 ."
 
-EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR}/gen_lex_hash'"
+EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'"
 EXTRA_OECONF = " --with-embedded-server --prefix=/usr --sysconfdir=/etc/mysql --localstatedir=/var/mysql --datadir=/var/mysql --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb "
 
 do_stage() {
diff --git a/packages/nonworking/bogl/libbogl_0.1.9.bb b/packages/nonworking/bogl/libbogl_0.1.9.bb
index e9198eae89..db18ee3160 100644
--- a/packages/nonworking/bogl/libbogl_0.1.9.bb
+++ b/packages/nonworking/bogl/libbogl_0.1.9.bb
@@ -8,8 +8,8 @@ SRC_URI = "${DEBIAN_MIRROR}/main/b/bogl/bogl_${PV}-${PR}.tar.gz"
 S = "${WORKDIR}/bogl"
 
 do_compile() {
-	ln -sf ${STAGING_BINDIR}/bdftobogl .
-	ln -sf ${STAGING_BINDIR}/pngtobogl .
+	ln -sf ${STAGING_BINDIR_NATIVE}/bdftobogl .
+	ln -sf ${STAGING_BINDIR_NATIVE}/pngtobogl .
 	oe_runmake libbogl.so.0.1 libbogl.a
 }
 
diff --git a/packages/nonworking/e17/evidence b/packages/nonworking/e17/evidence
index d1e8bd5065..84a47ff570 100644
--- a/packages/nonworking/e17/evidence
+++ b/packages/nonworking/e17/evidence
@@ -10,7 +10,7 @@ inherit e
 SRC_URI = "cvs://anonymous@evidence.cvs.sourceforge.net/cvsroot/evidence;module=evidence;date=${PV}"
 S = "${WORKDIR}/evidence"
 
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
 	--enable-ecore \
 	--enable-ecore-ipc \
 	--enable-canvas-evas2 \
diff --git a/packages/nonworking/lzma/lzma_0.01.bb b/packages/nonworking/lzma/lzma_0.01.bb
index 2530dc4211..ec710c45fa 100644
--- a/packages/nonworking/lzma/lzma_0.01.bb
+++ b/packages/nonworking/lzma/lzma_0.01.bb
@@ -10,7 +10,7 @@ S = "${WORKDIR}/"
 inherit qmake
 
 do_configure_prepend() {
-	${STAGING_BINDIR}/qmake -project -o lzma.pro
+	${STAGING_BINDIR_NATIVE}/qmake -project -o lzma.pro
 }
 
 do_install_append () {
diff --git a/packages/nonworking/qtella/qtella_0.6.5.bb b/packages/nonworking/qtella/qtella_0.6.5.bb
index 80e975b578..0ef738a16a 100644
--- a/packages/nonworking/qtella/qtella_0.6.5.bb
+++ b/packages/nonworking/qtella/qtella_0.6.5.bb
@@ -6,6 +6,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/qtella/qtella-${PV}.tar.gz"
 
 inherit autotools
 
-EXTRA_OECONF = "--with-qt-dir=${STAGING_LIBDIR}/.. --with-qt-moc=${STAGING_BINDIR}/moc --with-qt-uic=${STAGING_BINDIR}/uic \
+EXTRA_OECONF = "--with-qt-dir=${STAGING_LIBDIR}/.. --with-qt-moc=${STAGING_BINDIR_NATIVE}/moc --with-qt-uic=${STAGING_BINDIR_NATIVE}/uic \
 		--with-qt-includes=${STAGING_INCDIR}/ --with-qt-libs=${STAGING_LIBDIR}/ --with-kde=no --enable-sharp"
 
diff --git a/packages/nonworking/r/r_2.0.0.bb b/packages/nonworking/r/r_2.0.0.bb
index a7286fef1b..4a0004fb55 100644
--- a/packages/nonworking/r/r_2.0.0.bb
+++ b/packages/nonworking/r/r_2.0.0.bb
@@ -40,5 +40,5 @@ do_compile_prepend () {
 }
 
 do_compile() {
-	oe_runmake 'R_EXE_NATIVE = ${STAGING_BINDIR}/R'
+	oe_runmake 'R_EXE_NATIVE = ${STAGING_BINDIR_NATIVE}/R'
 }
diff --git a/packages/nonworking/zethereal/zethereal_1.0.0.bb b/packages/nonworking/zethereal/zethereal_1.0.0.bb
index aaa3a34c36..de4830cb64 100644
--- a/packages/nonworking/zethereal/zethereal_1.0.0.bb
+++ b/packages/nonworking/zethereal/zethereal_1.0.0.bb
@@ -23,7 +23,7 @@ EXTRA_OECONF = "--disable-ethereal \
                 --with-zlib=${STAGING_LIBDIR}/.. \
                 --without-x"
 
-export GLIB_CONFIG = "${STAGING_BINDIR}/glib-config"
+export GLIB_CONFIG = "${STAGING_BINDIR_CROSS}/glib-config"
 
 CFLAGS += "-I${STAGING_INCDIR}/glib-1.2"
 LIBS += "-lglib-1.2"
diff --git a/packages/omniorb/omniorb_4.0.7.bb b/packages/omniorb/omniorb_4.0.7.bb
index d475b22791..4909faaa1f 100644
--- a/packages/omniorb/omniorb_4.0.7.bb
+++ b/packages/omniorb/omniorb_4.0.7.bb
@@ -19,7 +19,7 @@ inherit autotools pkgconfig
 
 do_compile () {
         export EmbeddedSystem=1
-        export TOOLBINDIR=${STAGING_BINDIR}
+        export TOOLBINDIR=${STAGING_BINDIR_NATIVE}
         oe_runmake
 }
 do_install () {
diff --git a/packages/pango/pango_1.14.8.bb b/packages/pango/pango_1.14.8.bb
new file mode 100644
index 0000000000..dd2afb09d4
--- /dev/null
+++ b/packages/pango/pango_1.14.8.bb
@@ -0,0 +1,49 @@
+LICENSE = "LGPL"
+SECTION = "x11/libs"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft gtk-doc cairo"
+DESCRIPTION = "The goal of the Pango project is to provide an \
+Open Source framework for the layout and rendering of \
+internationalized text."
+PR = "r0"
+
+PACKAGES_DYNAMIC = "pango-module-*"
+
+RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" 
+
+# seems to go wrong with default cflags
+FULL_OPTIMIZATION_arm = "-O2"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/pango/1.14/pango-${PV}.tar.bz2 \
+	   file://no-tests.patch;patch=1 \
+		"
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-glibtest \
+		--enable-explicit-deps=no \
+	        --disable-debug"
+
+LEAD_SONAME = "libpango-1.0*"
+LIBV = "1.5.0"
+
+FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*"
+FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
+FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
+
+do_stage () {
+	autotools_stage_all
+}
+
+postinst_prologue() {
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+}
+
+python populate_packages_prepend () {
+	prologue = bb.data.getVar("postinst_prologue", d, 1)
+
+	modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d)
+
+	do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules')
+}
diff --git a/packages/perl/perl.inc b/packages/perl/perl.inc
index 8c7064b3ce..4f42d78ded 100644
--- a/packages/perl/perl.inc
+++ b/packages/perl/perl.inc
@@ -14,10 +14,10 @@ SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
 	file://config.sh-mipsel-linux \
 	file://config.sh-i686-linux"
 
-HOSTPERL="${STAGING_BINDIR}/perl${PV}"
+HOSTPERL="${STAGING_BINDIR_NATIVE}/perl${PV}"
 
 do_configure() {
-	ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl 
+	ln -sf ${HOSTPERL} ${STAGING_BINDIR_NATIVE}/hostperl 
 	cp ${HOSTPERL} hostperl
 	cd Cross
 	rm -f Makefile.SH.patch
diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb
index 35384e03f4..7e1ef2edf2 100644
--- a/packages/perl/perl_5.8.7.bb
+++ b/packages/perl/perl_5.8.7.bb
@@ -26,7 +26,7 @@ PARALLEL_MAKE = ""
 PR = "r21"
 
 do_configure() {
-	ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl
+	ln -sf ${HOSTPERL} ${STAGING_BINDIR_NATIVE}/hostperl
 	cp ${HOSTPERL} hostperl
 	cd Cross
 	rm -f Makefile.SH.patch
diff --git a/packages/php/php.inc b/packages/php/php.inc
index da2e928528..6e2c26585a 100644
--- a/packages/php/php.inc
+++ b/packages/php/php.inc
@@ -17,7 +17,7 @@ EXTRA_OECONF = "--with-cgi --enable-sockets --enable-pcntl \
 
 EXTRA_OECONF += " --without-pear"
 # Uncomment the following two lines, and comment the above to enable PEAR
-#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR}/php"
+#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR_NATIVE}/php"
 #DEPENDS += " php-native"
 
 acpaths = ""
diff --git a/packages/php/php_5.1.4.bb b/packages/php/php_5.1.4.bb
index da116fbf7f..025f112dcd 100644
--- a/packages/php/php_5.1.4.bb
+++ b/packages/php/php_5.1.4.bb
@@ -22,7 +22,7 @@ EXTRA_OECONF = "--without-iconv \
 
 EXTRA_OECONF += " --without-pear"
 # Uncomment the following two lines, and comment the above to enable PEAR
-#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR}/php"
+#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR_NATIVE}/php"
 #DEPENDS += " php-native"
 
 acpaths = ""
diff --git a/packages/postfix/postfix_2.0.20.bb b/packages/postfix/postfix_2.0.20.bb
index 97bc253aff..c64afeea03 100644
--- a/packages/postfix/postfix_2.0.20.bb
+++ b/packages/postfix/postfix_2.0.20.bb
@@ -29,7 +29,7 @@ export SYSLIBS = "-lpcre -ldb ${LIBBDB_EXTRA} -lnsl -lresolv ${LDFLAGS}"
 export EXPORT = "AUXLIBS='-lpcre' CCARGS='-DHAS_PCRE ${CFLAGS}' OPT='' DEBUG='-g'"
 export CC_append = " -DHAS_PCRE ${CFLAGS}"
 export EXTRA_OEMAKE = "-e"
-export POSTCONF = "${STAGING_BINDIR}/postconf"
+export POSTCONF = "${STAGING_BINDIR_NATIVE}/postconf"
 
 do_compile () {
 	unset CFLAGS CPPFLAGS CXXFLAGS
diff --git a/packages/puzzles/puzzles_r6915.bb b/packages/puzzles/puzzles_r6915.bb
index f8ffcb7d01..2c1d17dca8 100644
--- a/packages/puzzles/puzzles_r6915.bb
+++ b/packages/puzzles/puzzles_r6915.bb
@@ -6,8 +6,8 @@ SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar
            file://game.png"
 
 do_compile_prepend = " \
-        export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR}/pkg-config gtk+-2.0 --libs`'; \
-	export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR}/pkg-config gtk+-2.0 --cflags`'; "
+        export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --libs`'; \
+	export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --cflags`'; "
 
 FILES_${PN} = "${prefix}/games/* ${datadir}/applications/* ${datadir}/pixmaps"
 FILES_${PN}-dbg += "${prefix}/games/.debug"
diff --git a/packages/python/python-pygtk2_2.10.3.bb b/packages/python/python-pygtk2_2.10.3.bb
index e6d1ae2438..d040299a0e 100644
--- a/packages/python/python-pygtk2_2.10.3.bb
+++ b/packages/python/python-pygtk2_2.10.3.bb
@@ -23,7 +23,7 @@ do_configure_prepend() {
 do_stage() {
 	autotools_stage_includes
         sed -i s:/usr/share:${STAGING_DATADIR}: codegen/pygtk-codegen-2.0
-        install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR}/
+        install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR_NATIVE}/
 	install -d ${STAGING_DATADIR}/pygtk/2.0/codegen
 	install -d ${STAGING_DATADIR}/pygtk/2.0/defs/
 	cp -pPr codegen/*.py* ${STAGING_DATADIR}/pygtk/2.0/codegen/
diff --git a/packages/python/python-pygtk2_2.8.6.bb b/packages/python/python-pygtk2_2.8.6.bb
index d1f65ea3ce..ab571bdfd9 100644
--- a/packages/python/python-pygtk2_2.8.6.bb
+++ b/packages/python/python-pygtk2_2.8.6.bb
@@ -19,5 +19,5 @@ do_configure_prepend() {
 
 do_stage() {
 	autotools_stage_includes
-	install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR}/
+	install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR_NATIVE}/
 }
diff --git a/packages/python/python-pyqt4_4.0.bb b/packages/python/python-pyqt4_4.0.bb
index fad858d203..64a9a71f68 100644
--- a/packages/python/python-pyqt4_4.0.bb
+++ b/packages/python/python-pyqt4_4.0.bb
@@ -25,8 +25,8 @@ SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml"
 EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/Qt \
                          INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR}"
 
-#EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR}/uic \
-#                         QMAKE_MOC=${STAGING_BINDIR}/moc \
+#EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR_NATIVE}/uic \
+#                         QMAKE_MOC=${STAGING_BINDIR_NATIVE}/moc \
 #                         QMAKE_RPATH=-Wl,-rpath-link, \
 #                         DESTDIR= \
 #                         VERSION=1.0.0 \
diff --git a/packages/python/python-pyqt_3.13.bb b/packages/python/python-pyqt_3.13.bb
index 5e5f0b7256..00d8f32fe3 100644
--- a/packages/python/python-pyqt_3.13.bb
+++ b/packages/python/python-pyqt_3.13.bb
@@ -22,8 +22,8 @@ SIP_MODULES = "qt qtcanvas qttable qtpe"
 SIP_FEATURES = "${WORKDIR}/features"
 EXTRA_OEMAKE = " MAKEFLAGS= "
 
-EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR}/uic \
-                         QMAKE_MOC=${STAGING_BINDIR}/moc \
+EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR_NATIVE}/uic \
+                         QMAKE_MOC=${STAGING_BINDIR_NATIVE}/moc \
                          QMAKE_RPATH=-Wl,-rpath-link, \
                          DESTDIR= \
                          VERSION=1.0.0 \
diff --git a/packages/python/python_2.4.3.bb b/packages/python/python_2.4.3.bb
index 44732d933a..dfa828bcd9 100644
--- a/packages/python/python_2.4.3.bb
+++ b/packages/python/python_2.4.3.bb
@@ -39,8 +39,8 @@ do_compile_prepend() {
 }
 
 do_compile() {
-	oe_runmake HOSTPGEN=${STAGING_BINDIR}/pgen \
-		   HOSTPYTHON=${STAGING_BINDIR}/python \
+	oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
+		   HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
 		   STAGING_LIBDIR=${STAGING_LIBDIR} \
 		   STAGING_INCDIR=${STAGING_INCDIR} \
 		   BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
@@ -54,8 +54,8 @@ do_stage() {
 
 do_install() {
 	install -m 0644 Makefile.orig Makefile
-        oe_runmake HOSTPGEN=${STAGING_BINDIR}/pgen \
-                   HOSTPYTHON=${STAGING_BINDIR}/python \
+        oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
+                   HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
                    STAGING_LIBDIR=${STAGING_LIBDIR} \
                    STAGING_INCDIR=${STAGING_INCDIR} \
 		   BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
diff --git a/packages/qt/qt-x11-free-native_3.3.5.bb b/packages/qt/qt-x11-free-native_3.3.5.bb
index e6340da14a..bd1c8e2598 100644
--- a/packages/qt/qt-x11-free-native_3.3.5.bb
+++ b/packages/qt/qt-x11-free-native_3.3.5.bb
@@ -36,7 +36,7 @@ do_configure() {
 
 do_compile() {
 	LD_LIBRARY_PATH=${S}/lib oe_runmake \
-		QMAKE="${STAGING_BINDIR}/qmake -after INCLUDEPATH+=${STAGING_INCDIR} LIBS+=-I${STAGING_LIBDIR}" \
+		QMAKE="${STAGING_BINDIR_NATIVE}/qmake -after INCLUDEPATH+=${STAGING_INCDIR} LIBS+=-I${STAGING_LIBDIR}" \
 		QMAKESPEC="${THIS_QMAKESPEC}"
 }
 
diff --git a/packages/qt/qt-x11-free_3.3.6.bb b/packages/qt/qt-x11-free_3.3.6.bb
index f7acbec82f..5a1c014e6d 100644
--- a/packages/qt/qt-x11-free_3.3.6.bb
+++ b/packages/qt/qt-x11-free_3.3.6.bb
@@ -23,11 +23,11 @@ EXTRA_OEMAKE = "-e"
 QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -no-gif -no-xinerama \
                    -no-tablet -no-xkb -no-dlopen-opengl -no-nis -no-cups -thread -plugin-sql-mysql -verbose"
 
-EXTRA_ENV = 'QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} \
+EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake -after INCPATH+=${STAGING_INCDIR} \
              INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
              QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
              AR="${TARGET_PREFIX}ar cqs" \
-             MOC="${STAGING_BINDIR}/moc3" UIC="${STAGING_BINDIR}/uic3" MAKE="make -e"'
+             MOC="${STAGING_BINDIR_NATIVE}/moc3" UIC="${STAGING_BINDIR_NATIVE}/uic3" MAKE="make -e"'
 
 do_configure() {
 	echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -fast \
@@ -53,9 +53,9 @@ do_compile() {
 
 do_stage() {
 	install -d ${STAGING_QT_DIR}/bin
-	ln -sf ${STAGING_BINDIR}/moc3 ${STAGING_QT_DIR}/bin/moc
-	ln -sf ${STAGING_BINDIR}/uic3 ${STAGING_QT_DIR}/bin/uic
-	ln -sf ${STAGING_BINDIR}/qmake ${STAGING_QT_DIR}/bin/qmake
+	ln -sf ${STAGING_BINDIR_NATIVE}/moc3 ${STAGING_QT_DIR}/bin/moc
+	ln -sf ${STAGING_BINDIR_NATIVE}/uic3 ${STAGING_QT_DIR}/bin/uic
+	ln -sf ${STAGING_BINDIR_NATIVE}/qmake ${STAGING_QT_DIR}/bin/qmake
 	install -d ${STAGING_QT_DIR}/lib
 	oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_QT_DIR}/lib
 	install -d ${STAGING_QT_DIR}/include/private
diff --git a/packages/qt/qt4-x11-free_4.1.2.bb b/packages/qt/qt4-x11-free_4.1.2.bb
index 60f7f3fa66..dfefd444b7 100644
--- a/packages/qt/qt4-x11-free_4.1.2.bb
+++ b/packages/qt/qt4-x11-free_4.1.2.bb
@@ -1,4 +1,3 @@
-DESCRIPTION = "Qt/X11 Version ${PV}"
 SECTION = "x11/libs"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
@@ -49,17 +48,17 @@ QT_CONFIG_FLAGS = "-release -shared -qt-zlib -system-libjpeg -no-nas-sound -no-s
                    -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \
                    -verbose -stl -no-accessibility"
 
-EXTRA_ENV = 'QMAKE="${STAGING_BINDIR}/qmake2 -after DEFINES+=QT_NO_XIM INCPATH+=${STAGING_INCDIR} \
+EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after DEFINES+=QT_NO_XIM INCPATH+=${STAGING_INCDIR} \
              INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
              QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
              AR="${TARGET_PREFIX}ar cqs" \
-             MOC="${STAGING_BINDIR}/moc4" UIC="${STAGING_BINDIR}/uic4" MAKE="make -e"'
+             MOC="${STAGING_BINDIR_NATIVE}/moc4" UIC="${STAGING_BINDIR_NATIVE}/uic4" MAKE="make -e"'
 
 do_configure() {
 	echo "DEFINES -= QT_NO_CAST_TO_ASCII" >>src/qbase.pri
 	echo "DEFINES += QT_NO_XIM" >>src/qbase.pri
 	unset QMAKESPEC
-	ln -sf ${STAGING_BINDIR}/qmake2 bin/qmake
+	ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake
 	ln -sf ./linux-g++ mkspecs/linux-gnueabi-g++
 	#export QMAKESPEC="linux-oe-g++" 
 	#rm -rf ./mkspecs
@@ -71,9 +70,9 @@ do_configure() {
 # FIXME: Might want to compile the cross tools for the -dev packages as well...
 do_compile() {
 	unset CFLAGS CXXFLAGS
-	install -m 0755 ${STAGING_BINDIR}/rcc4 ${S}/bin/rcc
-	install -m 0755 ${STAGING_BINDIR}/moc4 ${S}/bin/moc
-	install -m 0755 ${STAGING_BINDIR}/uic4 ${S}/bin/uic
+	install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
+	install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
+	install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
 
 	oe_runmake ${EXTRA_ENV}
 }
@@ -82,9 +81,9 @@ PARTS = "3Support Core Designer DesignerComponents Gui Network Sql Svg Test Xml"
 
 do_stage() {
 	oe_runmake install INSTALL_ROOT=/
-	install -m 0755 ${STAGING_BINDIR}/rcc4 ${STAGING_QT_DIR}/bin/rcc
-	install -m 0755 ${STAGING_BINDIR}/moc4 ${STAGING_QT_DIR}/bin/moc
-	install -m 0755 ${STAGING_BINDIR}/uic4 ${STAGING_QT_DIR}/bin/uic
+	install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${STAGING_QT_DIR}/bin/rcc
+	install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${STAGING_QT_DIR}/bin/moc
+	install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${STAGING_QT_DIR}/bin/uic
 
 }
 
diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc
index 27a1a45928..e22f211dc3 100644
--- a/packages/qte/qte-common_2.3.10.inc
+++ b/packages/qte/qte-common_2.3.10.inc
@@ -140,16 +140,16 @@ export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -frtti -DNO_D
 #export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -frtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI"
 export SYSCONF_LFLAGS = "${LDFLAGS} -lts"
 export SYSCONF_LFLAGS_mnci = "${LDFLAGS}"
-export SYSCONF_MOC = "${STAGING_BINDIR}/moc"
-export SYSCONF_UIC = "${STAGING_BINDIR}/uic"
+export SYSCONF_MOC = "${STAGING_BINDIR_NATIVE}/moc"
+export SYSCONF_UIC = "${STAGING_BINDIR_NATIVE}/uic"
 
 do_configure_prepend_mnci() {
 	chmod -R a+w ${S}/src/kernel
 	cp ${WORKDIR}/qkeyboard_qws.h ${S}/src/kernel
 	cp ${WORKDIR}/qkeyboard_qws.cpp ${S}/src/kernel
 	mkdir bin
-	ln -sf ${STAGING_BINDIR}/moc bin/moc
-	ln -sf ${STAGING_BINDIR}/uic bin/uic
+	ln -sf ${STAGING_BINDIR_NATIVE}/moc bin/moc
+	ln -sf ${STAGING_BINDIR_NATIVE}/uic bin/uic
 }
 
 # generate uclibc and eabi configurations
diff --git a/packages/quake/quake1_0.0.1.bb b/packages/quake/quake1_0.0.1.bb
index 9cd3be9d36..c28052df0c 100644
--- a/packages/quake/quake1_0.0.1.bb
+++ b/packages/quake/quake1_0.0.1.bb
@@ -20,7 +20,7 @@ EXTRA_OEMAKE = "-e"
 
 export CFLAG = "-DHAVE_ZLIB -DNO_DEBUG -finline-function"
 export CXXFLAGS = "-DHAVE_ZLIB -DNO_DEBUG -finline-function"
-export LIBS = "-L${STAGING_LIBDIR} -lz -lm -lX11 -lXext -lXau `${STAGING_BINDIR}/sdl-config --libs`"
+export LIBS = "-L${STAGING_LIBDIR} -lz -lm -lX11 -lXext -lXau `${STAGING_BINDIR_CROSS}/sdl-config --libs`"
 
 do_install() {
 	install -d ${D}${bindir}
diff --git a/packages/rdiff-backup/rdiff-backup.inc b/packages/rdiff-backup/rdiff-backup.inc
index 73d2f7db72..d268736df8 100644
--- a/packages/rdiff-backup/rdiff-backup.inc
+++ b/packages/rdiff-backup/rdiff-backup.inc
@@ -24,7 +24,7 @@ inherit distutils
 #
 do_compile() {
 	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-	  ${STAGING_BINDIR}/python setup.py build --executable=${bindir}/python || \
+	  ${STAGING_BINDIR_NATIVE}/python setup.py build --executable=${bindir}/python || \
 	  oefatal "python setup.py build execution failed."
 }
 
@@ -36,6 +36,6 @@ do_compile() {
 #
 do_install() {
 	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-	  ${STAGING_BINDIR}/python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${prefix} || \
+	  ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${prefix} || \
 	  oefatal "python setup.py install execution failed."
 }
diff --git a/packages/regina-rexx/files/use-proper-host-tools.patch b/packages/regina-rexx/files/use-proper-host-tools.patch
index 6032ef08a3..cd0dafcab8 100644
--- a/packages/regina-rexx/files/use-proper-host-tools.patch
+++ b/packages/regina-rexx/files/use-proper-host-tools.patch
@@ -11,8 +11,8 @@
  $(MTBFILES): msgcmp$(EXE) $(MTSSRC)
 -	./msgcmp $(MTSSRC)
 -	./rexx $(srcdir)/checkmts.rexx $(srcdir)
-+	$(STAGING_BINDIR)/msgcmp-multi-input $(MTSSRC)
-+	$(STAGING_BINDIR)/rexx $(srcdir)/checkmts.rexx $(srcdir)
++	$(STAGING_BINDIR_NATIVE)/msgcmp-multi-input $(MTSSRC)
++	$(STAGING_BINDIR_NATIVE)/rexx $(srcdir)/checkmts.rexx $(srcdir)
  
  msgcmp$(EXE): msgcmp.$(OBJ)
  	$(PURIFY) $(CC) $(LINKOPT) -o msgcmp$(EXE) msgcmp.$(OBJ)
@@ -21,28 +21,28 @@
  	$(INSTALL) -m 644 -c ./es.mtb $(sharedir)/es.mtb
  	$(INSTALL) -m 644 -c ./pl.mtb $(sharedir)/pl.mtb
 -	$(bindir)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/rexxcps.rexx  $(sharedir)/rexxcps.rexx
-+	$(STAGING_BINDIR)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/rexxcps.rexx  $(sharedir)/rexxcps.rexx
++	$(STAGING_BINDIR_NATIVE)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/rexxcps.rexx  $(sharedir)/rexxcps.rexx
  	-chmod 755 $(sharedir)/rexxcps.rexx
 -	$(bindir)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/animal.rexx   $(sharedir)/animal.rexx
-+	$(STAGING_BINDIR)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/animal.rexx   $(sharedir)/animal.rexx
++	$(STAGING_BINDIR_NATIVE)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/animal.rexx   $(sharedir)/animal.rexx
  	-chmod 755 $(sharedir)/animal.rexx
 -	$(bindir)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/block.rexx    $(sharedir)/block.rexx
-+	$(STAGING_BINDIR)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/block.rexx    $(sharedir)/block.rexx
++	$(STAGING_BINDIR_NATIVE)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/block.rexx    $(sharedir)/block.rexx
  	-chmod 755 $(sharedir)/block.rexx
 -	$(bindir)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/dateconv.rexx $(sharedir)/dateconv.rexx
-+	$(STAGING_BINDIR)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/dateconv.rexx $(sharedir)/dateconv.rexx
++	$(STAGING_BINDIR_NATIVE)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/dateconv.rexx $(sharedir)/dateconv.rexx
  	-chmod 755 $(sharedir)/dateconv.rexx
 -	$(bindir)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/timeconv.rexx $(sharedir)/timeconv.rexx
-+	$(STAGING_BINDIR)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/timeconv.rexx $(sharedir)/timeconv.rexx
++	$(STAGING_BINDIR_NATIVE)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/timeconv.rexx $(sharedir)/timeconv.rexx
  	-chmod 755 $(sharedir)/timeconv.rexx
 -	$(bindir)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/newstr.rexx   $(sharedir)/newstr.rexx
-+	$(STAGING_BINDIR)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/newstr.rexx   $(sharedir)/newstr.rexx
++	$(STAGING_BINDIR_NATIVE)/rexx $(srcdir)/preinst.rexx $(bindir)/rexx $(srcdir)/demo/newstr.rexx   $(sharedir)/newstr.rexx
  	-chmod 755 $(sharedir)/newstr.rexx
  
  installregina:
  	$(INSTALL) -m 755 -c ./regina$(EXE) $(bindir)/regina$(EXE)
 -	$(bindir)/rexx $(srcdir)/preinst.rexx $(bindir)/regina $(srcdir)/demo/dynfunc.rexx  $(sharedir)/dynfunc.rexx
-+	$(STAGING_BINDIR)/rexx $(srcdir)/preinst.rexx $(bindir)/regina $(srcdir)/demo/dynfunc.rexx  $(sharedir)/dynfunc.rexx
++	$(STAGING_BINDIR_NATIVE)/rexx $(srcdir)/preinst.rexx $(bindir)/regina $(srcdir)/demo/dynfunc.rexx  $(sharedir)/dynfunc.rexx
  	-chmod 755 $(sharedir)/dynfunc.rexx
  
  installlib: installregina
diff --git a/packages/regina-rexx/regina-rexx_3.3.bb b/packages/regina-rexx/regina-rexx_3.3.bb
index 66adc5948a..8634c7f89b 100644
--- a/packages/regina-rexx/regina-rexx_3.3.bb
+++ b/packages/regina-rexx/regina-rexx_3.3.bb
@@ -19,13 +19,13 @@ do_configure() {
 }
 
 do_compile() {
-	oe_runmake STAGING_BINDIR="${STAGING_BINDIR}"
+	oe_runmake STAGING_BINDIR_NATIVE="${STAGING_BINDIR_NATIVE}"
 }
 
 do_install() {
 	oe_runmake install bindir="${D}${bindir}" libdir="${D}${libdir}" includedir="${D}${includedir}" \
                            sharedir="${D}${datadir}" mandir="${D}${mandir}" sysconfdir="${D}${sysconfdir}" \
-                           STAGING_BINDIR="${STAGING_BINDIR}"
+                           STAGING_BINDIR_NATIVE="${STAGING_BINDIR_NATIVE}"
 }
 
 FILES_${PN} += "${datadir}"
diff --git a/packages/skippy/skippy-xd_0.5.0.bb b/packages/skippy/skippy-xd_0.5.0.bb
index 5dfcf0db75..a27670da76 100644
--- a/packages/skippy/skippy-xd_0.5.0.bb
+++ b/packages/skippy/skippy-xd_0.5.0.bb
@@ -9,7 +9,7 @@ SRC_URI = "http://thegraveyard.org/files/${PN}-${PV}.tar.bz2 \
            file://fix-makefile.patch;patch=1 \
            file://event_base.patch;patch=1"
 
-EXTRA_OEMAKE = "X11PREFIX='${STAGING_DIR}/${TARGET_SYS}' PKG_CONFIG='${STAGING_BINDIR}/pkg-config'"
+EXTRA_OEMAKE = "X11PREFIX='${STAGING_DIR}/${TARGET_SYS}' PKG_CONFIG='${STAGING_BINDIR_NATIVE}/pkg-config'"
 CFLAGS_append = " -I${STAGING_DIR}/${TARGET_SYS}/include/X11"
 LDFLAGS_append = " -L${STAGING_DIR}/${TARGET_SYS}/lib/X11"
 
diff --git a/packages/slugimage/slugimage.bb b/packages/slugimage/slugimage.bb
index a28fe206d1..16873d8d24 100644
--- a/packages/slugimage/slugimage.bb
+++ b/packages/slugimage/slugimage.bb
@@ -3,11 +3,11 @@ SECTION = "console/utils"
 LICENSE = "BSD"
 DESCRIPTION = "Slugimage is a small app to disassemble and reassemble \
 flash images for the Linksys NSLU2 device. It also has jffs2 support"
-PR = "r8"
+PR = "r10"
 
 RDEPENDS = "perl"
 
-SLUGIMAGE_SVN_REV  ?= "78"
+SLUGIMAGE_SVN_REV  ?= "82"
 SLUGIMAGE_SVN_REPO ?= "http://svn.nslu2-linux.org/svnroot/slugimage/trunk"
 
 addtask svnfetch before do_configure after do_patch
diff --git a/packages/subversion/subversion_1.3.1.bb b/packages/subversion/subversion_1.3.1.bb
index 8a5b18e109..e49ebb5549 100644
--- a/packages/subversion/subversion_1.3.1.bb
+++ b/packages/subversion/subversion_1.3.1.bb
@@ -11,8 +11,8 @@ SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
 
 EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${BUILD_SYS} \
                 --without-berkeley-db --without-apxs --without-apache \
-                --without-swig --with-apr=${STAGING_BINDIR} \
-                --with-apr-util=${STAGING_BINDIR}"
+                --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
+                --with-apr-util=${STAGING_BINDIR_CROSS}"
 
 inherit autotools
 
diff --git a/packages/subversion/subversion_1.4.0.bb b/packages/subversion/subversion_1.4.0.bb
index be55366fd0..ac0b821d35 100644
--- a/packages/subversion/subversion_1.4.0.bb
+++ b/packages/subversion/subversion_1.4.0.bb
@@ -12,8 +12,8 @@ SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
 
 EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${BUILD_SYS} \
                 --without-berkeley-db --without-apxs --without-apache \
-                --without-swig --with-apr=${STAGING_BINDIR} \
-                --with-apr-util=${STAGING_BINDIR}"
+                --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
+                --with-apr-util=${STAGING_BINDIR_CROSS}"
 
 inherit autotools
 
diff --git a/packages/supertux/supertux_0.1.2.bb b/packages/supertux/supertux_0.1.2.bb
index 2a8797634e..59acb5767b 100644
--- a/packages/supertux/supertux_0.1.2.bb
+++ b/packages/supertux/supertux_0.1.2.bb
@@ -9,7 +9,7 @@ PR = "r1"
 SRC_URI = "${SOURCEFORGE_MIRROR}/super-tux/supertux-${PV}.tar.bz2 \
            http://ssel.vub.ac.be/Members/DennisWagelaar/download/zaurus/supertux-0.1.2-fp.patch.gz;patch=1"
 
-export SDL_CONFIG = "${STAGING_BINDIR}/sdl-config"
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
 
 inherit autotools 
 
diff --git a/packages/swig/swig_1.3.24.bb b/packages/swig/swig_1.3.24.bb
index 10313fb405..74bbb633f1 100644
--- a/packages/swig/swig_1.3.24.bb
+++ b/packages/swig/swig_1.3.24.bb
@@ -8,7 +8,7 @@ S = "${WORKDIR}/SWIG-${PV}"
 
 inherit autotools
 
-EXTRA_OECONF = "--with-python=${STAGING_BINDIR} --with-swiglibdir=${STAGING_DIR}/${BUILD_SYS}/swig"
+EXTRA_OECONF = "--with-python=${STAGING_BINDIR_NATIVE} --with-swiglibdir=${STAGING_DIR}/${BUILD_SYS}/swig"
 
 do_configure() {
 	oe_runconf
diff --git a/packages/swig/swig_1.3.29.bb b/packages/swig/swig_1.3.29.bb
index a36c7b9934..c8f595be07 100644
--- a/packages/swig/swig_1.3.29.bb
+++ b/packages/swig/swig_1.3.29.bb
@@ -8,7 +8,7 @@ S = "${WORKDIR}/swig-${PV}"
 
 inherit autotools
 
-EXTRA_OECONF = "--with-python=${STAGING_BINDIR} --with-swiglibdir=${STAGING_DIR}/${BUILD_SYS}/swig"
+EXTRA_OECONF = "--with-python=${STAGING_BINDIR_NATIVE} --with-swiglibdir=${STAGING_DIR}/${BUILD_SYS}/swig"
 
 do_configure() {
 	oe_runconf
diff --git a/packages/syslog-ng/syslog-ng_1.6.11.bb b/packages/syslog-ng/syslog-ng_1.6.11.bb
index 07e9ed14df..794ad5335c 100644
--- a/packages/syslog-ng/syslog-ng_1.6.11.bb
+++ b/packages/syslog-ng/syslog-ng_1.6.11.bb
@@ -10,7 +10,7 @@ S = "${WORKDIR}/${PN}-${PV}"
 
 inherit autotools update-rc.d
 
-EXTRA_OECONF = "--with-libol=${STAGING_BINDIR}/"
+EXTRA_OECONF = "--with-libol=${STAGING_BINDIR_CROSS}/"
 
 do_install_append() {
         install -d ${D}/${sysconfdir}/${PN}
diff --git a/packages/syslog-ng/syslog-ng_1.6.8.bb b/packages/syslog-ng/syslog-ng_1.6.8.bb
index af7a9b4502..d8e02d0da2 100644
--- a/packages/syslog-ng/syslog-ng_1.6.8.bb
+++ b/packages/syslog-ng/syslog-ng_1.6.8.bb
@@ -9,7 +9,7 @@ SRC_URI = "http://www.balabit.com/downloads/syslog-ng/1.6/src/${PN}-${PV}.tar.gz
 S = "${WORKDIR}/${PN}-${PV}"
 inherit autotools update-rc.d
 
-EXTRA_OECONF = "--with-libol=${STAGING_BINDIR}/"
+EXTRA_OECONF = "--with-libol=${STAGING_BINDIR_CROSS}/"
 CONFFILES_${PN} = "${sysconfdir}/${PN}/syslog-ng.conf"
 INITSCRIPT_NAME = "syslog-ng"
 INITSCRIPT_PARAMS = "defaults 05"
diff --git a/packages/tasks/task-proper-tools.bb b/packages/tasks/task-proper-tools.bb
new file mode 100644
index 0000000000..5520864c82
--- /dev/null
+++ b/packages/tasks/task-proper-tools.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Proper tools for busybox haters"
+PR = "r1"
+
+ALLOW_EMPTY_${PN} = "1"
+
+RDEPENDS = "\
+            coreutils \
+	    findutils \
+	    util-linux \
+	    gawk \
+	    sed \
+	    wget \
+	    patch \
+	    diffutils \
+            less \
+            vim \
+	    e2fsprogs \
+            binutils-symlinks \
+            module-init-tools \
+	    "
+
+
diff --git a/packages/tcltk/tcl_8.4.11.bb b/packages/tcltk/tcl_8.4.11.bb
index f2eed37667..d6d6fe7487 100644
--- a/packages/tcltk/tcl_8.4.11.bb
+++ b/packages/tcltk/tcl_8.4.11.bb
@@ -27,7 +27,7 @@ do_stage() {
 	oe_libinstall -a libtclstub8.4 ${STAGING_LIBDIR}
 	oe_libinstall -so libtcl8.4 ${STAGING_LIBDIR}
 	sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh
-	install -m 0755 tclConfig.sh ${STAGING_BINDIR}
+	install -m 0755 tclConfig.sh ${STAGING_BINDIR_CROSS}
 	cd ..
 	for dir in compat generic unix
 	do
diff --git a/packages/tcltk/tk_8.4.11.bb b/packages/tcltk/tk_8.4.11.bb
index e70db703e9..85b5124173 100644
--- a/packages/tcltk/tk_8.4.11.bb
+++ b/packages/tcltk/tk_8.4.11.bb
@@ -15,7 +15,7 @@ S = "${WORKDIR}/tk${PV}/unix"
 
 inherit autotools
 
-EXTRA_OECONF = "--enable-threads --with-tcl=${STAGING_BINDIR} \
+EXTRA_OECONF = "--enable-threads --with-tcl=${STAGING_BINDIR_CROSS} \
 		--x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}"
 
 do_configure() {
@@ -27,7 +27,7 @@ do_stage() {
         oe_libinstall -a libtkstub8.4 ${STAGING_LIBDIR}
         oe_libinstall -so libtk8.4 ${STAGING_LIBDIR}
         sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tkConfig.sh
-        install -m 0755 tkConfig.sh ${STAGING_BINDIR}
+        install -m 0755 tkConfig.sh ${STAGING_BINDIR_CROSS}
 	cd ..
 	#for dir in compat generic unix
 	#do
diff --git a/packages/tetex/tetex_3.0.bb b/packages/tetex/tetex_3.0.bb
index ffdfae792a..f38bab7c10 100644
--- a/packages/tetex/tetex_3.0.bb
+++ b/packages/tetex/tetex_3.0.bb
@@ -43,8 +43,8 @@ do_configure() {
         find . -name libtool|xargs rm -f
         rm -rf ${S}/utils/texinfo/tools/info
         rm -rf ${S}/utils/texinfo/tools/makeinfo
-        ln -sf ${STAGING_BINDIR} ${S}/utils/texinfo/tools/info
-        ln -sf ${STAGING_BINDIR} ${S}/utils/texinfo/tools/makeinfo
+        ln -sf ${STAGING_BINDIR_NATIVE} ${S}/utils/texinfo/tools/info
+        ln -sf ${STAGING_BINDIR_NATIVE} ${S}/utils/texinfo/tools/makeinfo
         cat >${S}/utils/texinfo/tools/Makefile <<EOF
 install:
 	echo "mickey _is_ cool - he tamed the tetex buildsystem"
@@ -54,7 +54,7 @@ EOF
 }
 # NOTE: Make sure it is using _our_ libtool and nothing else :/
 do_compile() {
-	LIBTOOL="${STAGING_BINDIR}/${HOST_SYS}-libtool" oe_runmake MAKE="${MAKE} LIBTOOL=${STAGING_BINDIR}/${HOST_SYS}-libtool"
+	LIBTOOL="${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool" oe_runmake MAKE="${MAKE} LIBTOOL=${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool"
 }
 
 # NOTE: This is really ugly. Unfortunately the teTeX people seem not to know about PREFIX...
@@ -81,7 +81,7 @@ do_install() {
 	web2cdir="${D}${datadir}" \
 	kpathsea="${D}${libdir}/libkpathsea.la" \
 	DESTDIR="" \
-	LIBTOOL="${STAGING_BINDIR}/${HOST_SYS}-libtool"
+	LIBTOOL="${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool"
 	MAKE="make -e" oe_runmake -e install
 }
 
diff --git a/packages/tmake/tmake_1.11.bb b/packages/tmake/tmake_1.11.bb
index 23147a98c7..a0f7222904 100644
--- a/packages/tmake/tmake_1.11.bb
+++ b/packages/tmake/tmake_1.11.bb
@@ -7,8 +7,9 @@ PRIORITY = "optional"
 
 S = "${WORKDIR}/tmake-${PV}"
 
+# Ick. This .bb file should really have a -native version doing this, even if it is a perl script... RP
 do_stage() {
-	install -m 0755 bin/tmake bin/progen ${STAGING_BINDIR}/
+	install -m 0755 bin/tmake bin/progen ${STAGING_BINDIR_NATIVE}/
 
 	install -d ${STAGING_DATADIR}/tmake
 	cp -R lib/* ${STAGING_DATADIR}/tmake/
diff --git a/packages/uboot/u-boot_1.1.2.bb b/packages/uboot/u-boot_1.1.2.bb
index f0752aa664..6b87cf9c05 100644
--- a/packages/uboot/u-boot_1.1.2.bb
+++ b/packages/uboot/u-boot_1.1.2.bb
@@ -29,7 +29,7 @@ do_compile () {
 }
 
 do_stage() {
-	install -m755 tools/mkimage ${STAGING_BINDIR}
+	install -m755 tools/mkimage ${STAGING_BINDIR_NATIVE}
 }
 
 do_deploy () {
diff --git a/packages/uboot/u-boot_1.1.4.bb b/packages/uboot/u-boot_1.1.4.bb
index 448dff38fa..f5751db204 100644
--- a/packages/uboot/u-boot_1.1.4.bb
+++ b/packages/uboot/u-boot_1.1.4.bb
@@ -49,7 +49,7 @@ do_compile () {
 }
 
 do_stage() {
-	install -m755 tools/mkimage ${STAGING_BINDIR}
+	install -m755 tools/mkimage ${STAGING_BINDIR_NATIVE}
 }
 
 do_deploy () {
diff --git a/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb b/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb
index 5bf12bcaa0..361d9c876b 100644
--- a/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb
+++ b/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb
@@ -35,7 +35,7 @@ do_compile () {
 }
 
 do_stage() {
-	install -m755 tools/mkimage ${STAGING_BINDIR}
+	install -m755 tools/mkimage ${STAGING_BINDIR_NATIVE}
 }
 
 do_deploy () {
diff --git a/packages/update-rc.d/update-rc.d-0.6/copyright.patch b/packages/update-rc.d/update-rc.d-0.6/copyright.patch
deleted file mode 100644
index bfe9cb8181..0000000000
--- a/packages/update-rc.d/update-rc.d-0.6/copyright.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: update-rc.d
-===================================================================
-RCS file: /cvs/apps/update-rc.d/update-rc.d,v
-retrieving revision 1.6
-retrieving revision 1.7
-diff -u -r1.6 -r1.7
---- update-rc.d/update-rc.d	31 Dec 2004 12:21:40 -0000	1.6
-+++ update-rc.d/update-rc.d	31 Dec 2004 16:39:09 -0000	1.7
-@@ -2,8 +2,17 @@
- #
- # update-rc.d	Update the links in /etc/rc[0-9S].d/
- #
--# Phil Blundell <pb@handhelds.org> 2003-06-26
-+# (c) 2003, 2004 Phil Blundell <pb@handhelds.org>
- #
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
- 
- initd="/etc/init.d"
- etcd="/etc/rc"
diff --git a/packages/update-rc.d/update-rc.d_0.6.bb b/packages/update-rc.d/update-rc.d_0.6.bb
deleted file mode 100644
index 38b4c218f5..0000000000
--- a/packages/update-rc.d/update-rc.d_0.6.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-SECTION = "base"
-PRIORITY = "standard"
-DESCRIPTION = "Manage symlinks in /etc/rcN.d"
-LICENSE = "GPL"
-S = "${WORKDIR}/update-rc.d"
-PR = "r1"
-
-SRC_URI = "${HANDHELDS_CVS};module=apps/update-rc.d;tag=r0_6 \
-	file://copyright.patch;patch=1"
-
-do_compile() {
-}
-
-do_stage() {
-	install -m 0755 ${S}/update-rc.d ${STAGING_BINDIR}/
-}
-
-do_install() {
-	install -d ${D}${sbindir}
-	install -m 0755 ${S}/update-rc.d ${D}${sbindir}/update-rc.d
-}
diff --git a/packages/update-rc.d/update-rc.d_0.7.bb b/packages/update-rc.d/update-rc.d_0.7.bb
index 87d1aef9d8..8070197b82 100644
--- a/packages/update-rc.d/update-rc.d_0.7.bb
+++ b/packages/update-rc.d/update-rc.d_0.7.bb
@@ -7,11 +7,13 @@ PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};module=apps/update-rc.d;tag=r0_7"
 
+PACKAGE_ARCH = "all"
+
 do_compile() {
 }
 
 do_stage() {
-	install -m 0755 ${S}/update-rc.d ${STAGING_BINDIR}/
+	install -m 0755 ${S}/update-rc.d ${STAGING_BINDIR_NATIVE}/
 }
 
 do_install() {
diff --git a/packages/wxbase/wxbase_2.6.2.bb b/packages/wxbase/wxbase_2.6.2.bb
index 748d738c1c..d1a054f1b6 100644
--- a/packages/wxbase/wxbase_2.6.2.bb
+++ b/packages/wxbase/wxbase_2.6.2.bb
@@ -28,7 +28,7 @@ do_stage() {
        cp -pR lib/wx     ${STAGING_LIBDIR}
        cp -pR build/bakefiles/wxpresets/presets  ${STAGING_DATADIR}/bakefile
        cp -pR wxwin.m4                           ${STAGING_DATADIR}/aclocal		
-       ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${STAGING_BINDIR}/wx-config
+       ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${STAGING_BINDIR_CROSS}/wx-config
        sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
            -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
            -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
diff --git a/packages/wxbase/wxbase_2.7+cvs.bb b/packages/wxbase/wxbase_2.7+cvs.bb
index 05aeb6c08e..79dcc46b6e 100644
--- a/packages/wxbase/wxbase_2.7+cvs.bb
+++ b/packages/wxbase/wxbase_2.7+cvs.bb
@@ -29,7 +29,7 @@ do_stage() {
        cp -pR lib/wx     ${STAGING_LIBDIR}
        cp -pR build/bakefiles/wxpresets/presets  ${STAGING_DATADIR}/bakefile
        cp -pR wxwin.m4                           ${STAGING_DATADIR}/aclocal
-       ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${STAGING_BINDIR}/wx-config
+       ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${STAGING_BINDIR_CROSS}/wx-config
        sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
            -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
            -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
diff --git a/packages/xmms/xmms-mad_0.10.bb b/packages/xmms/xmms-mad_0.10.bb
index 476b72c657..f54dc16720 100644
--- a/packages/xmms/xmms-mad_0.10.bb
+++ b/packages/xmms/xmms-mad_0.10.bb
@@ -7,7 +7,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/xmms-mad/xmms-mad-${PV}.tar.bz2"
 
 inherit autotools
 
-export XMMS_CONFIG = "${STAGING_BINDIR}/xmms-config"
+export XMMS_CONFIG = "${STAGING_BINDIR_CROSS}/xmms-config"
 
 FILES_${PN} = "${libdir}/xmms/Input/libxmmsmad.so"
 FILES_${PN}-dbg = "${libdir}/xmms/Input/.debug/libxmmsmad.so"
diff --git a/packages/xqt/xqt_0.0.9.bb b/packages/xqt/xqt_0.0.9.bb
index 0c7a77e7f9..d1b5f7ff0f 100644
--- a/packages/xqt/xqt_0.0.9.bb
+++ b/packages/xqt/xqt_0.0.9.bb
@@ -29,7 +29,7 @@ do_configure() {
 	echo "#define QtCmnDefs -fno-exceptions -fno-rtti" >> config/cf/host.def
 	echo "#define QtDir ${QTDIR}" >> config/cf/host.def
 	echo "#define QtLibs -lqpe -lqte -lm -lpng -ljpeg -lts -lsupc++" >> config/cf/host.def
-	echo "#define MocBin ${STAGING_BINDIR}/moc" >> config/cf/host.def
+	echo "#define MocBin ${STAGING_BINDIR_NATIVE}/moc" >> config/cf/host.def
 	echo "#define QtDefs -DQWS -DOPIE_NEW_MALLOC -DOPIE_NO_ERASE_RECT_HACKFIX  QtCmnDefs" >> config/cf/host.def
 	
 	# Build these XServers
diff --git a/packages/xqt2/xqt2_20060509.bb b/packages/xqt2/xqt2_20060509.bb
index cde82c3f4a..ec6c6a176b 100644
--- a/packages/xqt2/xqt2_20060509.bb
+++ b/packages/xqt2/xqt2_20060509.bb
@@ -45,7 +45,7 @@ do_configure() {
 	echo "#define QtCmnDefs -fno-exceptions -fno-rtti" >> config/cf/host.def
 	echo "#define QtDir ${QTDIR}" >> config/cf/host.def
 	echo "#define QtLibs -lqpe -l${QT_LIBRARY} -lm -lpng -ljpeg -lts -lsupc++" >> config/cf/host.def
-	echo "#define MocBin ${STAGING_BINDIR}/moc" >> config/cf/host.def
+	echo "#define MocBin ${STAGING_BINDIR_NATIVE}/moc" >> config/cf/host.def
 	echo "#define QtDefs -DQWS -DOPIE_NEW_MALLOC -DOPIE_NO_ERASE_RECT_HACKFIX  QtCmnDefs" >> config/cf/host.def
 	
 	# Build these XServers
diff --git a/packages/zope/zope_2.7.1.bb b/packages/zope/zope_2.7.1.bb
index 37e2dff716..efda9d2e6b 100644
--- a/packages/zope/zope_2.7.1.bb
+++ b/packages/zope/zope_2.7.1.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://zope.org/Products/Zope/${PV}/Zope-${PV}.tgz"
 S = "${WORKDIR}/Zope-${PV}-0"
 
 do_configure() {
-	./configure --with-python=${STAGING_BINDIR}/python --prefix=${prefix} --optimize --ignore-zlib
+	./configure --with-python=${STAGING_BINDIR_NATIVE}/python --prefix=${prefix} --optimize --ignore-zlib
 }
 
 do_compile() {
diff --git a/packages/zope/zope_2.9.2.bb b/packages/zope/zope_2.9.2.bb
index e1409aed24..12254375db 100644
--- a/packages/zope/zope_2.9.2.bb
+++ b/packages/zope/zope_2.9.2.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://zope.org/Products/Zope/${PV}/Zope-${PV}.tgz"
 S = "${WORKDIR}/Zope-${PV}"
 
 do_configure() {
-	./configure --with-python=${STAGING_BINDIR}/python --prefix=${prefix} --force
+	./configure --with-python=${STAGING_BINDIR_NATIVE}/python --prefix=${prefix} --force
 }
 
 do_compile() {
diff --git a/removal.txt b/removal.txt
index 1433b63f58..0e669b896f 100644
--- a/removal.txt
+++ b/removal.txt
@@ -47,3 +47,14 @@ Maintainer:     None
 Reason:         Not fetchable, all search results points to OE related infos
 Proposed by:    Marcin 'Hrw' Juszkiewicz
  
+Package Name:   nsqld
+Removal Date:   2006-12-12
+Maintainer:     None
+Reason:		Never used
+Proposed by:    Florian Boor
+
+Package Name:   gpe-mileage
+Removal Date:   2006-12-12
+Maintainer:     None
+Reason:         Unfinished, no development progress
+Proposed by:    Florian Boor