merge of '6c2d621bdfd446c13552a5e4b126ef9c5dd20106'

     and 'f8d54cc4c0dfc594e55d38708db17f5d5c68846a'

56 files changed, 102 insertions, 173 deletions

diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index 9ef2f09fe0..08b077a1e1 100644
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -162,11 +162,6 @@ python check_sanity_eventhandler() {
     from bb import note, error, data, __version__
     from bb.event import getName
 
-    try:
-        from distutils.version import LooseVersion
-    except ImportError:
-        def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1
-
     if getName(e) == "ConfigParsed":
         check_sanity(e)
 
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 4caa55c0b6..d0aa47a143 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -228,6 +228,7 @@ STAGING_BINDIR = "${STAGING_DIR_HOST}${layout_bindir}"
 STAGING_LIBDIR = "${STAGING_DIR_HOST}${layout_libdir}"
 STAGING_INCDIR = "${STAGING_DIR_HOST}${layout_includedir}"
 STAGING_DATADIR = "${STAGING_DIR_HOST}${layout_datadir}"
+STAGING_EXECPREFIXDIR = "${STAGING_DIR_HOST}${layout_exec_prefix}"
 STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader"
 STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware"
 STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 3784303d19..34c0717543 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -7,6 +7,10 @@
 
 # this is alphabetical!
 
+# yes, really!
+
+# you know what that means? like... a, b, c, d, e, f, g...
+
 SRCREV_pn-aircrack-ng ?= "802"
 SRCREV_pn-bfin-uclibc ?= "1857"
 SRCREV_pn-contact ?= "1410"
@@ -41,6 +45,7 @@ SRCREV_pn-libmokogsmd2 ?= "3663"
 SRCREV_pn-libmokojournal2 ?= "3217"
 SRCREV_pn-libmokopanelui2 ?= "3349"
 SRCREV_pn-libmokoui2 ?= "3688"
+SRCREV_pn-libw100 ?= "47"
 SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-lightmediascanner ?= "68"
@@ -57,7 +62,10 @@ SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-moko-gtk-engine ?= "3405"
 SRCREV_pn-mpd-alsa ?= "6952"
+SRCREV_pn-mplayer ?= "24587"
 SRCREV_pn-neod ?= "3421"
+SRCREV_pn-networkmanager ?= "2887"
+SRCREV_pn-networkmanager-applet ?= "200"
 SRCREV_pn-oh-puzzles ?= "22"
 SRCREV_pn-osb-browser ?= "125"
 SRCREV_pn-osb-jscore ?= "117"
@@ -132,14 +140,12 @@ SRCREV_pn-settings-daemon ?= "1755"
 SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "45"
 SRCREV_pn-tmut ?= "60"
+SRCREV_pn-u-boot-openmoko ?= "4100"
+SRCREV_pn-usbpath ?= "3108"
+SRCREV_pn-usbpath-native ?= "3108"
 SRCREV_pn-webkit-gtk ?= "28656"
 SRCREV_pn-webkit-qt ?= "28656"
 SRCREV_pn-webkit-qtopia ?= "28656"
 SRCREV_pn-wesnoth ?= "22021"
 SRCREV_pn-xoo ?= "1623"
-SRCREV_pn-mplayer ?= "24587"
-SRCREV_pn-networkmanager ?= "2887"
-SRCREV_pn-networkmanager-applet ?= "200"
-SRCREV_pn-libw100 ?= "47"
-SRCREV_pn-usbpath ?= "3108"
-SRCREV_pn-usbpath-native ?= "3108"
+
diff --git a/packages/asterisk/asterisk_1.4.10.bb b/packages/asterisk/asterisk_1.4.10.bb
index 4110f01930..416495a0b8 100644
--- a/packages/asterisk/asterisk_1.4.10.bb
+++ b/packages/asterisk/asterisk_1.4.10.bb
@@ -30,17 +30,17 @@ INITSCRIPT_PARAMS = "defaults 60"
 
 inherit autotools update-rc.d
 
-EXTRA_OECONF =  "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\
-			--with-z=${STAGING_DIR}/${TARGET_SYS}\
-			--with-curl=${STAGING_DIR}/${TARGET_SYS}\
-			--with-termcap=${STAGING_DIR}/${TARGET_SYS}\
-			--with-ogg=${STAGING_DIR}/${TARGET_SYS}\
-			--with-vorbis=${STAGING_DIR}/${TARGET_SYS}\
-			--with-sqlite=${STAGING_DIR}/${TARGET_SYS}\
-			--with-popt=${STAGING_DIR}/${TARGET_SYS}\
-			--with-gnutls=${STAGING_DIR}/${TARGET_SYS}\
+EXTRA_OECONF =  "--with-ssl=${STAGING_EXECPREFIXDIR} \
+			--with-z=${STAGING_EXECPREFIXDIR} \
+			--with-curl=${STAGING_EXECPREFIXDIR} \
+			--with-termcap=${STAGING_EXECPREFIXDIR} \
+			--with-ogg=${STAGING_EXECPREFIXDIR} \
+			--with-vorbis=${STAGING_EXECPREFIXDIR} \
+			--with-sqlite=${STAGING_EXECPREFIXDIR} \
+			--with-popt=${STAGING_EXECPREFIXDIR} \
+			--with-gnutls=${STAGING_EXECPREFIXDIR} \
 			--without-curses\
-			--with-ncurses=${STAGING_DIR}/${TARGET_SYS}\
+			--with-ncurses=${STAGING_EXECPREFIXDIR} \
 			--without-imap\
 			--without-netsnmp\
 			--without-odbc\
diff --git a/packages/asterisk/asterisk_1.4.11.bb b/packages/asterisk/asterisk_1.4.11.bb
index 0d4f30aef9..2f116864e4 100644
--- a/packages/asterisk/asterisk_1.4.11.bb
+++ b/packages/asterisk/asterisk_1.4.11.bb
@@ -32,17 +32,17 @@ INITSCRIPT_PARAMS = "defaults 60"
 
 inherit autotools update-rc.d
 
-EXTRA_OECONF =  "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\
-			--with-z=${STAGING_DIR}/${TARGET_SYS}\
-			--with-curl=${STAGING_DIR}/${TARGET_SYS}\
-			--with-termcap=${STAGING_DIR}/${TARGET_SYS}\
-			--with-ogg=${STAGING_DIR}/${TARGET_SYS}\
-			--with-vorbis=${STAGING_DIR}/${TARGET_SYS}\
-			--with-sqlite=${STAGING_DIR}/${TARGET_SYS}\
-			--with-popt=${STAGING_DIR}/${TARGET_SYS}\
-			--with-gnutls=${STAGING_DIR}/${TARGET_SYS}\
+EXTRA_OECONF =  "--with-ssl=${STAGING_EXECPREFIXDIR}\
+			--with-z=${STAGING_EXECPREFIXDIR}\
+			--with-curl=${STAGING_EXECPREFIXDIR}\
+			--with-termcap=${STAGING_EXECPREFIXDIR}\
+			--with-ogg=${STAGING_EXECPREFIXDIR}\
+			--with-vorbis=${STAGING_EXECPREFIXDIR}\
+			--with-sqlite=${STAGING_EXECPREFIXDIR}\
+			--with-popt=${STAGING_EXECPREFIXDIR}\
+			--with-gnutls=${STAGING_EXECPREFIXDIR}\
 			--without-curses\
-			--with-ncurses=${STAGING_DIR}/${TARGET_SYS}\
+			--with-ncurses=${STAGING_EXECPREFIXDIR}\
 			--without-imap\
 			--without-netsnmp\
 			--without-odbc\
diff --git a/packages/asterisk/asterisk_1.4.17.bb b/packages/asterisk/asterisk_1.4.17.bb
index fb64581364..cecb403262 100644
--- a/packages/asterisk/asterisk_1.4.17.bb
+++ b/packages/asterisk/asterisk_1.4.17.bb
@@ -31,17 +31,17 @@ INITSCRIPT_PARAMS = "defaults 60"
 
 inherit autotools update-rc.d
 
-EXTRA_OECONF =  "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\
-			--with-z=${STAGING_DIR}/${TARGET_SYS}\
-			--with-curl=${STAGING_DIR}/${TARGET_SYS}\
-			--with-termcap=${STAGING_DIR}/${TARGET_SYS}\
-			--with-ogg=${STAGING_DIR}/${TARGET_SYS}\
-			--with-vorbis=${STAGING_DIR}/${TARGET_SYS}\
-			--with-sqlite=${STAGING_DIR}/${TARGET_SYS}\
-			--with-popt=${STAGING_DIR}/${TARGET_SYS}\
-			--with-gnutls=${STAGING_DIR}/${TARGET_SYS}\
+EXTRA_OECONF =  "--with-ssl=${STAGING_EXECPREFIXDIR} \
+			--with-z=${STAGING_EXECPREFIXDIR} \
+			--with-curl=${STAGING_EXECPREFIXDIR} \
+			--with-termcap=${STAGING_EXECPREFIXDIR} \
+			--with-ogg=${STAGING_EXECPREFIXDIR} \
+			--with-vorbis=${STAGING_EXECPREFIXDIR} \
+			--with-sqlite=${STAGING_EXECPREFIXDIR} \
+			--with-popt=${STAGING_EXECPREFIXDIR} \
+			--with-gnutls=${STAGING_EXECPREFIXDIR} \
 			--without-curses\
-			--with-ncurses=${STAGING_DIR}/${TARGET_SYS}\
+			--with-ncurses=${STAGING_EXECPREFIXDIR} \
 			--without-imap\
 			--without-netsnmp\
 			--without-odbc\
diff --git a/packages/libxine/libxine-fb_1.0.bb b/packages/libxine/libxine-fb_1.0.bb
index d0f58303fa..a51dc83896 100644
--- a/packages/libxine/libxine-fb_1.0.bb
+++ b/packages/libxine/libxine-fb_1.0.bb
@@ -26,10 +26,10 @@ S = "${WORKDIR}/xine-lib-${PV}"
 
 SOV = "1.0.7"
 
-EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
-	--with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \
+EXTRA_OECONF="-with-zlib-path=${STAGING_EXECPREFIXDIR} \
+	--with-vorbis-prefix=${STAGING_EXECPREFIXDIR} \
 	--disable-oggtest \
-	--with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \
+	--with-ogg-prefix=${STAGING_EXECPREFIXDIR} \
 	--disable-altivec --disable-vis --disable-mlib \
 	--enable-shared --disable-static \
 	--disable-fb --disable-alsa --disable-vcd \
diff --git a/packages/libxine/libxine-x11_1.0.bb b/packages/libxine/libxine-x11_1.0.bb
index db0d725aac..806f8fd4b7 100644
--- a/packages/libxine/libxine-x11_1.0.bb
+++ b/packages/libxine/libxine-x11_1.0.bb
@@ -27,10 +27,10 @@ S = "${WORKDIR}/xine-lib-${PV}"
 
 SOV = "1.0.7"
 
-EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
-	--with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \
+EXTRA_OECONF="-with-zlib-path=${STAGING_EXECPREFIXDIR} \
+	--with-vorbis-prefix=${STAGING_EXECPREFIXDIR} \
 	--disable-oggtest \
-	--with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \
+	--with-ogg-prefix=${STAGING_EXECPREFIXDIR} \
 	--disable-altivec --disable-vis --disable-mlib \
 	--disable-fb --disable-alsa --disable-vcd \
 	--disable-asf --disable-faad --disable-iconv \
diff --git a/packages/libxine/libxine_1.1.0.bb b/packages/libxine/libxine_1.1.0.bb
index 7732eb813e..9219e5fdcd 100644
--- a/packages/libxine/libxine_1.1.0.bb
+++ b/packages/libxine/libxine_1.1.0.bb
@@ -31,10 +31,10 @@ S = "${WORKDIR}/xine-lib-${PV}"
 
 SOV = "1.0.7"
 
-EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
-	--with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \
+EXTRA_OECONF="-with-zlib-path=${STAGING_EXECPREFIXDIR} \
+	--with-vorbis-prefix=${STAGING_EXECPREFIXDIR} \
 	--disable-oggtest \
-	--with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \
+	--with-ogg-prefix=${STAGING_EXECPREFIXDIR} \
 	--disable-altivec --disable-vis --disable-mlib \
 	--disable-fb --disable-alsa --disable-vcd \
 	--disable-asf --disable-faad --disable-iconv \
diff --git a/packages/mozilla/firefox.inc b/packages/mozilla/firefox.inc
index bd0322334d..f5e020dc68 100644
--- a/packages/mozilla/firefox.inc
+++ b/packages/mozilla/firefox.inc
@@ -1,4 +1,5 @@
 SRC_URI += "file://mozilla-firefox.png file://mozilla-firefox.desktop"
+
 PACKAGES =+ "firefox-inspector"
 
 FILES_firefox-inspector = "	${libdir}/firefox-${PV}/chrome/inspector* \
@@ -27,3 +28,11 @@ pkg_postinst_firefox() {
 	# work around requirement for root access on first startup
 	chmod -R a+w ${libdir}/firefox*
 }
+
+do_stage() {
+	autotools_stage_all
+
+
+
+}
+
diff --git a/packages/mozilla/firefox_1.0.7.bb b/packages/mozilla/firefox_1.0.7.bb
index dd4d734f89..b82dbda91e 100644
--- a/packages/mozilla/firefox_1.0.7.bb
+++ b/packages/mozilla/firefox_1.0.7.bb
@@ -1,4 +1,5 @@
-PR = "r0"
+PR = "r2"
+
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://xptcstubs.patch;patch=1 \
 	file://no-xmb.patch;patch=1 \
@@ -8,11 +9,10 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/
 	file://firefox-1.0-gcc4-compile.patch;patch=1;pnum=0 \
 	file://xptcinvoke-arm.patch;patch=1 \
 	file://mozilla-eabi.patch;patch=1"
-
 S = "${WORKDIR}/mozilla"
 
-inherit mozilla
-
+inherit autotools mozilla
+	
 require firefox.inc
 
 EXTRA_OECONF += " --with-gssapi=${STAGINGLIBDIR}/../"
@@ -20,4 +20,3 @@ EXTRA_OECONF += " --with-gssapi=${STAGINGLIBDIR}/../"
 do_compile_prepend() {
 	cp ${WORKDIR}/jsautocfg.h ${S}/js/src/
 }
-
diff --git a/packages/mozilla/firefox_2.0.0.3.bb b/packages/mozilla/firefox_2.0.0.3.bb
index e1fb5a996d..72c42bc074 100644
--- a/packages/mozilla/firefox_2.0.0.3.bb
+++ b/packages/mozilla/firefox_2.0.0.3.bb
@@ -6,38 +6,36 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/
 	file://no-xmb.patch;patch=1 \
 	file://jsautocfg.h \
 	file://extensions-hack.patch;patch=1 \
-        file://security-cross.patch;patch=1 \
-        file://jsautocfg-dontoverwrite.patch;patch=1 \
-        file://xptcinvoke-arm.patch;patch=1 \
-        file://eabi-fix.patch;patch=1 \
-        file://eabi-fix2.patch;patch=1 \
-        file://eabi-fix3.patch;patch=1 \
-        file://linkage-problem.patch;patch=1 \
-       "
+	file://security-cross.patch;patch=1 \
+	file://jsautocfg-dontoverwrite.patch;patch=1 \
+	file://xptcinvoke-arm.patch;patch=1 \
+	file://eabi-fix.patch;patch=1 \
+	file://eabi-fix2.patch;patch=1 \
+	file://eabi-fix3.patch;patch=1 \
+	file://linkage-problem.patch;patch=1 \
+"
 
 S = "${WORKDIR}/mozilla"
 
 DEFAULT_PREFERENCE = "-1"
 
 inherit mozilla
-
 require firefox.inc
 
 do_compile_prepend() {
 	cp ${WORKDIR}/jsautocfg.h ${S}/js/src/
-
 	sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk
 }
 
 do_stage() {
-
-        install -d ${STAGING_INCDIR}/${P}
+        install -d ${STAGING_INCDIR}/firefox-${PV}
         cd dist/sdk/include
+		rm -rf obsolete
         headers=`find . -name "*.h"`
         for f in $headers
         do
-                install -D -m 0644 $f ${STAGING_INCDIR}/${P}/$f
+                install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/
         done
         # removes 2 lines that call absent headers
-        sed -e '178,179d' ${STAGING_INCDIR}/${P}/nsIServiceManager.h
+        sed -e '178,179d' ${STAGING_INCDIR}/firefox-${PV}/nsIServiceManager.h
 }
diff --git a/packages/compositeext/.mtn2git_empty b/packages/obsolete/compositeext/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/compositeext/.mtn2git_empty
+++ b/packages/obsolete/compositeext/.mtn2git_empty
diff --git a/packages/compositeext/compositeext_2.0.bb b/packages/obsolete/compositeext/compositeext_2.0.bb
index b9b634d391..b9b634d391 100644
--- a/packages/compositeext/compositeext_2.0.bb
+++ b/packages/obsolete/compositeext/compositeext_2.0.bb
diff --git a/packages/compositeext/compositeext_cvs.bb b/packages/obsolete/compositeext/compositeext_cvs.bb
index 8f0f4f9f46..8f0f4f9f46 100644
--- a/packages/compositeext/compositeext_cvs.bb
+++ b/packages/obsolete/compositeext/compositeext_cvs.bb
diff --git a/packages/damageext/.mtn2git_empty b/packages/obsolete/damageext/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/damageext/.mtn2git_empty
+++ b/packages/obsolete/damageext/.mtn2git_empty
diff --git a/packages/damageext/damageext-1.0/.mtn2git_empty b/packages/obsolete/damageext/damageext-1.0/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/damageext/damageext-1.0/.mtn2git_empty
+++ b/packages/obsolete/damageext/damageext-1.0/.mtn2git_empty
diff --git a/packages/damageext/damageext-1.0/autofoo.patch b/packages/obsolete/damageext/damageext-1.0/autofoo.patch
index e36fb1d74b..e36fb1d74b 100644
--- a/packages/damageext/damageext-1.0/autofoo.patch
+++ b/packages/obsolete/damageext/damageext-1.0/autofoo.patch
diff --git a/packages/damageext/damageext_1.0.bb b/packages/obsolete/damageext/damageext_1.0.bb
index 3b431a8688..3b431a8688 100644
--- a/packages/damageext/damageext_1.0.bb
+++ b/packages/obsolete/damageext/damageext_1.0.bb
diff --git a/packages/damageext/damageext_cvs.bb b/packages/obsolete/damageext/damageext_cvs.bb
index e9ffa7d2b1..e9ffa7d2b1 100644
--- a/packages/damageext/damageext_cvs.bb
+++ b/packages/obsolete/damageext/damageext_cvs.bb
diff --git a/packages/damageext/files/.mtn2git_empty b/packages/obsolete/damageext/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/damageext/files/.mtn2git_empty
+++ b/packages/obsolete/damageext/files/.mtn2git_empty
diff --git a/packages/damageext/files/autofoo.patch b/packages/obsolete/damageext/files/autofoo.patch
index 48c05cd836..48c05cd836 100644
--- a/packages/damageext/files/autofoo.patch
+++ b/packages/obsolete/damageext/files/autofoo.patch
diff --git a/packages/fixesext/.mtn2git_empty b/packages/obsolete/fixesext/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/fixesext/.mtn2git_empty
+++ b/packages/obsolete/fixesext/.mtn2git_empty
diff --git a/packages/fixesext/fixesext_2.0.1.bb b/packages/obsolete/fixesext/fixesext_2.0.1.bb
index feb53d60eb..feb53d60eb 100644
--- a/packages/fixesext/fixesext_2.0.1.bb
+++ b/packages/obsolete/fixesext/fixesext_2.0.1.bb
diff --git a/packages/fixesext/fixesext_cvs.bb b/packages/obsolete/fixesext/fixesext_cvs.bb
index 4ddbc96c64..4ddbc96c64 100644
--- a/packages/fixesext/fixesext_cvs.bb
+++ b/packages/obsolete/fixesext/fixesext_cvs.bb
diff --git a/packages/panoramixext/.mtn2git_empty b/packages/obsolete/panoramixext/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/panoramixext/.mtn2git_empty
+++ b/packages/obsolete/panoramixext/.mtn2git_empty
diff --git a/packages/panoramixext/panoramixext_1.1.bb b/packages/obsolete/panoramixext/panoramixext_1.1.bb
index 2da504779f..2da504779f 100644
--- a/packages/panoramixext/panoramixext_1.1.bb
+++ b/packages/obsolete/panoramixext/panoramixext_1.1.bb
diff --git a/packages/panoramixext/panoramixext_cvs.bb b/packages/obsolete/panoramixext/panoramixext_cvs.bb
index 08cc0cc51e..08cc0cc51e 100644
--- a/packages/panoramixext/panoramixext_cvs.bb
+++ b/packages/obsolete/panoramixext/panoramixext_cvs.bb
diff --git a/packages/randrext/.mtn2git_empty b/packages/obsolete/resourceext/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/randrext/.mtn2git_empty
+++ b/packages/obsolete/resourceext/.mtn2git_empty
diff --git a/packages/resourceext/resourceext_1.0.bb b/packages/obsolete/resourceext/resourceext_1.0.bb
index 55780b1d22..55780b1d22 100644
--- a/packages/resourceext/resourceext_1.0.bb
+++ b/packages/obsolete/resourceext/resourceext_1.0.bb
diff --git a/packages/resourceext/resourceext_cvs.bb b/packages/obsolete/resourceext/resourceext_cvs.bb
index b0fe23392e..b0fe23392e 100644
--- a/packages/resourceext/resourceext_cvs.bb
+++ b/packages/obsolete/resourceext/resourceext_cvs.bb
diff --git a/packages/recordext/.mtn2git_empty b/packages/obsolete/xxf86dgaext/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/recordext/.mtn2git_empty
+++ b/packages/obsolete/xxf86dgaext/.mtn2git_empty
diff --git a/packages/xxf86dgaext/xxf86dgaext_cvs.bb b/packages/obsolete/xxf86dgaext/xxf86dgaext_cvs.bb
index 30788049c7..30788049c7 100644
--- a/packages/xxf86dgaext/xxf86dgaext_cvs.bb
+++ b/packages/obsolete/xxf86dgaext/xxf86dgaext_cvs.bb
diff --git a/packages/renderext/.mtn2git_empty b/packages/obsolete/xxf86vmext/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/renderext/.mtn2git_empty
+++ b/packages/obsolete/xxf86vmext/.mtn2git_empty
diff --git a/packages/xxf86vmext/xxf86vmext_cvs.bb b/packages/obsolete/xxf86vmext/xxf86vmext_cvs.bb
index 06145e2905..06145e2905 100644
--- a/packages/xxf86vmext/xxf86vmext_cvs.bb
+++ b/packages/obsolete/xxf86vmext/xxf86vmext_cvs.bb
diff --git a/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb b/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
index 7b60122445..22309f9203 100644
--- a/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
+++ b/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
@@ -20,12 +20,12 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
 		--x-libraries=${STAGING_LIBDIR} \
-		--with-libgps=${STAGING_DIR}/${HOST_SYS} \
-		--with-libpcap=${STAGING_DIR}/${HOST_SYS} \
+		--with-libgps=${STAGING_EXECPREFIXDIR} \
+		--with-libpcap=${STAGING_EXECPREFIXDIR} \
 		--with-sqlite-includes=${STAGING_INCDIR} \
 		--with-sqlite-libs=${STAGING_LIBDIR} \
 		--without-athena --enable-dbus \
-                --with-libiw=${STAGING_DIR}/${HOST_SYS}"
+                --with-libiw=${STAGING_EXECPREFIXDIR}"
 
 CFLAGS =+ "-I${S}/include"
 LDFLAGS += "-lz"
diff --git a/packages/prismstumbler/prismstumbler_0.7.3.bb b/packages/prismstumbler/prismstumbler_0.7.3.bb
index 29a112d95a..5bddcf31b6 100644
--- a/packages/prismstumbler/prismstumbler_0.7.3.bb
+++ b/packages/prismstumbler/prismstumbler_0.7.3.bb
@@ -17,7 +17,7 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
 		--x-libraries=${STAGING_LIBDIR} \
-		--with-libpcap=${STAGING_DIR}/${HOST_SYS} \
+		--with-libpcap=${STAGING_EXECPREFIXDIR} \
 		--with-sqlite-includes=${STAGING_INCDIR} \
 		--with-sqlite-libs=${STAGING_LIBDIR} \
 		--without-athena \
diff --git a/packages/randrext/randrext_1.0.bb b/packages/randrext/randrext_1.0.bb
deleted file mode 100644
index 3fe6a442ac..0000000000
--- a/packages/randrext/randrext_1.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SECTION = "libs"
-LICENSE= "BSD-X"
-DESCRIPTION = "X Resize and Rotate extension headers"
-
-SRC_URI = "${XLIBS_MIRROR}/randrext-${PV}.tar.bz2"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/packages/randrext/randrext_cvs.bb b/packages/randrext/randrext_cvs.bb
deleted file mode 100644
index 29cff38373..0000000000
--- a/packages/randrext/randrext_cvs.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "BSD-X"
-SECTION = "libs"
-DESCRIPTION = "X Resize and Rotate extension headers"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Randr"
-S = "${WORKDIR}/Randr"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/packages/rdesktop/rdesktop_1.3.1.bb b/packages/rdesktop/rdesktop_1.3.1.bb
index 12ff1c5bcd..f54c675314 100644
--- a/packages/rdesktop/rdesktop_1.3.1.bb
+++ b/packages/rdesktop/rdesktop_1.3.1.bb
@@ -22,8 +22,8 @@ do_configure() {
 	--bindir=${bindir} \
 	--mandir=${mandir} \
 	--sharedir=${datadir} \
-	--with-x=${STAGING_DIR}/${HOST_SYS} \
-	--with-openssl=${STAGING_DIR}/${HOST_SYS} \
+	--with-x=${STAGING_EXECPREFIXDIR} \
+	--with-openssl=${STAGING_EXECPREFIXDIR} \
 	--with-oss \
 	--without-debug
 }
diff --git a/packages/rdesktop/rdesktop_1.4.1.bb b/packages/rdesktop/rdesktop_1.4.1.bb
index 7581647a57..da1794b190 100644
--- a/packages/rdesktop/rdesktop_1.4.1.bb
+++ b/packages/rdesktop/rdesktop_1.4.1.bb
@@ -11,4 +11,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz \
 
 inherit autotools
 
-EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. "
+EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} "
diff --git a/packages/rdesktop/rdesktop_1.5.0.bb b/packages/rdesktop/rdesktop_1.5.0.bb
index de270e1025..12385c127f 100644
--- a/packages/rdesktop/rdesktop_1.5.0.bb
+++ b/packages/rdesktop/rdesktop_1.5.0.bb
@@ -10,4 +10,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz"
 
 inherit autotools
 
-EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. "
+EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} "
diff --git a/packages/recordext/recordext_cvs.bb b/packages/recordext/recordext_cvs.bb
deleted file mode 100644
index eeaae24762..0000000000
--- a/packages/recordext/recordext_cvs.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "BSD-X"
-SECTION = "libs"
-DESCRIPTION = "XRecord extension protocol bits"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=RecordExt"
-S = "${WORKDIR}/RecordExt"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/packages/renderext/renderext_0.8.bb b/packages/renderext/renderext_0.8.bb
deleted file mode 100644
index a12f7c0da5..0000000000
--- a/packages/renderext/renderext_0.8.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SECTION = "libs"
-LICENSE = "MIT-X"
-DESCRIPTION = "X Render extension headers"
-
-SRC_URI = "${XLIBS_MIRROR}/renderext-${PV}.tar.bz2"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/packages/renderext/renderext_cvs.bb b/packages/renderext/renderext_cvs.bb
deleted file mode 100644
index 08053d95b9..0000000000
--- a/packages/renderext/renderext_cvs.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT-X"
-SECTION = "libs"
-DESCRIPTION = "X Render extension headers"
-DEFAULT_PREFERENCE = "1"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Render"
-S = "${WORKDIR}/Render"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR}
-}
diff --git a/packages/resourceext/.mtn2git_empty b/packages/resourceext/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/resourceext/.mtn2git_empty
+++ /dev/null
diff --git a/packages/subversion/subversion_1.3.1.bb b/packages/subversion/subversion_1.3.1.bb
index 1e40cd7a55..79e5e67d7b 100644
--- a/packages/subversion/subversion_1.3.1.bb
+++ b/packages/subversion/subversion_1.3.1.bb
@@ -9,7 +9,7 @@ SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
            file://disable-revision-install.patch;patch=1 \
            file://apr-regex.patch;patch=1"
 
-EXTRA_OECONF = "--with-neon=${STAGING_DIR_NATIVE}${layout_exec_prefix} \
+EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \
                 --without-berkeley-db --without-apxs --without-apache \
                 --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
                 --with-apr-util=${STAGING_BINDIR_CROSS}"
diff --git a/packages/subversion/subversion_1.4.0.bb b/packages/subversion/subversion_1.4.0.bb
index 59f42b8c66..305b13c6a4 100644
--- a/packages/subversion/subversion_1.4.0.bb
+++ b/packages/subversion/subversion_1.4.0.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
            file://disable-revision-install.patch;patch=1 \
 	   file://neon-detection.patch;patch=1"
 
-EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${TARGET_SYS} \
+EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \
                 --without-berkeley-db --without-apxs --without-apache \
                 --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
                 --with-apr-util=${STAGING_BINDIR_CROSS}"
diff --git a/packages/subversion/subversion_1.4.3.bb b/packages/subversion/subversion_1.4.3.bb
index 9674329f6c..4871674cc8 100644
--- a/packages/subversion/subversion_1.4.3.bb
+++ b/packages/subversion/subversion_1.4.3.bb
@@ -11,7 +11,7 @@ SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
            file://disable-revision-install.patch;patch=1 \
 	   file://neon-detection.patch;patch=1"
 
-EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${TARGET_SYS} \
+EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \
                 --without-berkeley-db --without-apxs --without-apache \
                 --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
                 --with-apr-util=${STAGING_BINDIR_CROSS}"
diff --git a/packages/subversion/subversion_1.4.5.bb b/packages/subversion/subversion_1.4.5.bb
index 1daf45bd0c..5c15d67daf 100644
--- a/packages/subversion/subversion_1.4.5.bb
+++ b/packages/subversion/subversion_1.4.5.bb
@@ -11,7 +11,7 @@ SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
            file://disable-revision-install.patch;patch=1 \
 	   file://neon-detection.patch;patch=1"
 
-EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${TARGET_SYS} \
+EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \
                 --without-berkeley-db --without-apxs --without-apache \
                 --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
                 --with-apr-util=${STAGING_BINDIR_CROSS}"
diff --git a/packages/u-boot/u-boot-openmoko_svn.bb b/packages/u-boot/u-boot-openmoko_svn.bb
index 3ec97f2a77..ca21f54f8a 100644
--- a/packages/u-boot/u-boot-openmoko_svn.bb
+++ b/packages/u-boot/u-boot-openmoko_svn.bb
@@ -14,8 +14,11 @@ UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v1 gta02v2 gta02v3 gta02v4"
 
 DEFAULT_PREFERENCE = "-1"
 
+BLESSED_GIT_REV = "928d1d77f8623c120d8763e20e1ca58df9c5c4c6"
+
 SRC_URI = "\
-  git://www.denx.de/git/u-boot.git/;protocol=git;name=upstream;tag=3afac79ec27b91df185f090b31dad9620779f440 \
+  
+git://www.denx.de/git/u-boot.git/;protocol=git;name=upstream;tag=${BLESSED_GIT_REV} \
   svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http;name=patches \
   file://uboot-eabi-fix-HACK.patch;patch=1;maxrev=3773 \
   file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
diff --git a/packages/uclibc/elf2flt_svn.bb b/packages/uclibc/elf2flt_svn.bb
index 0fac49d468..3af893a7a8 100644
--- a/packages/uclibc/elf2flt_svn.bb
+++ b/packages/uclibc/elf2flt_svn.bb
@@ -9,7 +9,7 @@ SRC_URI = "svn://sources.blackfin.uclinux.org/toolchain/trunk;module=${PN}"
 
 S = "${WORKDIR}/${PN}"
 
-EXTRA_OECONF = " --with-libbfd=${STAGING_DIR}/${TARGET_SYS}/lib/libbfd.a \
-                 --with-libiberty=${STAGING_DIR}/${TARGET_SYS}/lib/libiberty.a \
-                 --with-bfd-include-dir=${STAGING_DIR}/${TARGET_SYS}/include \
+EXTRA_OECONF = " --with-libbfd=${STAGING_LIBDIR}/libbfd.a \
+                 --with-libiberty=${STAGING_LIBDIR}/libiberty.a \
+                 --with-bfd-include-dir=${STAGING_INCDIR} \
                "
diff --git a/packages/xmms-embedded/xmms-embedded_20040327.bb b/packages/xmms-embedded/xmms-embedded_20040327.bb
index c525f6299c..4d5ea6a12b 100644
--- a/packages/xmms-embedded/xmms-embedded_20040327.bb
+++ b/packages/xmms-embedded/xmms-embedded_20040327.bb
@@ -31,7 +31,7 @@ do_configure_prepend() {
 }
 
 do_compile() {
-	oe_runmake "STAGING_DIR=${STAGING_DIR}/${HOST_SYS}"
+	oe_runmake "STAGING_DIR=${STAGING_EXECPREFIXDIR}"
 }
 
 do_install() {
diff --git a/packages/xorg-app/mkbold-mkitalic-native_0.11.bb b/packages/xorg-app/mkbold-mkitalic-native_0.11.bb
index 40082ec816..24ff14e01a 100644
--- a/packages/xorg-app/mkbold-mkitalic-native_0.11.bb
+++ b/packages/xorg-app/mkbold-mkitalic-native_0.11.bb
@@ -12,10 +12,10 @@ S = "${WORKDIR}/mkbold-mkitalic-${PV}"
 inherit native
 
 do_stage() {
-	install -d ${STAGING_DIR}/${BUILD_ARCH}-${BUILD_OS}/bin
-	install -m 755 mkbold ${STAGING_DIR}/${BUILD_ARCH}-${BUILD_OS}/bin/
-	install -m 755 mkitalic ${STAGING_DIR}/${BUILD_ARCH}-${BUILD_OS}/bin/
-	install -m 755 mkbolditalic ${STAGING_DIR}/${BUILD_ARCH}-${BUILD_OS}/bin/
-	install -m 755 ${WORKDIR}/makebifonts ${STAGING_DIR}/${BUILD_ARCH}-${BUILD_OS}/bin/
+	install -d ${STAGING_BINDIR_NATIVE}
+	install -m 755 mkbold ${STAGING_BINDIR_NATIVE}/
+	install -m 755 mkitalic ${STAGING_BINDIR_NATIVE}/
+	install -m 755 mkbolditalic ${STAGING_BINDIR_NATIVE}/
+	install -m 755 ${WORKDIR}/makebifonts ${STAGING_BINDIR_NATIVE}/
 }
 
diff --git a/packages/xxf86dgaext/.mtn2git_empty b/packages/xxf86dgaext/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xxf86dgaext/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xxf86vmext/.mtn2git_empty b/packages/xxf86vmext/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xxf86vmext/.mtn2git_empty
+++ /dev/null