merge of '7460b51ee9cc9d17b403416ed3a84895ac86e667'

     and 'cad8e5a9c094705cd6895a456eac5da6d41967bb'

6 files changed, 37 insertions, 10 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 4caa55c0b6..858e411d8c 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -176,14 +176,14 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
                 ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
 SECTION_${PN}-dev = "devel"
 ALLOW_EMPTY_${PN}-dev = "1"
-RDEPENDS_${PN}-dev = "${@['', '${PN} (= ${DEBPV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}"
+RDEPENDS_${PN}-dev = "${PN} (= ${DEBPV})"
 
 FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \
             ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug ${libdir}/${PN}/.debug \
             ${libdir}/matchbox-panel/.debug"
 SECTION_${PN}-dbg = "devel"
 ALLOW_EMPTY_${PN}-dbg = "1"
-RRECOMMENDS_${PN}-dbg = "${@['', '${PN} (= ${DEBPV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}"
+RRECOMMENDS_${PN}-dbg = "${PN} (= ${DEBPV})"
 
 FILES_${PN}-locale = "${datadir}/locale"
 
@@ -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/checksums.ini b/conf/checksums.ini
index 36b7a8f4bf..596674eca0 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -3306,6 +3306,10 @@ sha256=6f36ca624a12dce03cdea59c9eb900eda49ea2f463b329737eb9f2a8f3ac144d
 md5=fca5d26c8efea4e6e547c81c801bf67c
 sha256=bd6767cc7c8d9551df0fb3e6d40706746723f6daa0ecd4a78facffc40f9d8a97
 
+[http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-2.14.4.tar.bz2]
+md5=7ee7874108cbe9ea7fff1f4ab3389ce8
+sha256=10e6ebecc2cbd07f193a5d26b88c3bf2107e32b2a4d024f10f77f59a98d579ff
+
 [http://ftp.gnome.org/pub/gnome/sources/glib/2.2/glib-2.2.3.tar.bz2]
 md5=aa214a10d873b68ddd67cd9de2ccae55
 sha256=af1456e075954c122bda008736437b048d5336d0b426847c627e607eb35e59e5
@@ -12846,6 +12850,10 @@ sha256=652f579171e6e8f73c13ab6b060d2447ae35ebfbd39a6002b7c05a1dfc0f7eb8
 md5=bb196907ea1e182dcb396eb22f7d2c1a
 sha256=e1a3c4986f16a5fbca611d0547cc7499a1fa47ca2096593644037e2609363085
 
+[http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.0.4.tar.bz2]
+md5=8b36cdf08df12be96615e3d550236626
+sha256=765219fa822edeffb0650e93458e4ebf63c23176e58fce06806fb251fbfe7d8c
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/xtrans-X11R7.0-1.0.0.tar.bz2]
 md5=153642136a003871a9093c8103d6ac5a
 sha256=c9a049b4367318b53cbad02bc7e3c4450778e3237400a515b2a6272405b8b912
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 3784303d19..1c6d81023a 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,13 +45,14 @@ 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"
 SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1039"
-SRCREV_pn-linux-openmoko ?= "4079"
+SRCREV_pn-linux-openmoko ?= "4102"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-maemo-mapper ?= "118"
@@ -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/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index f6968cee00..55237c89b8 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -19,7 +19,7 @@ OVERRIDES = "local:${MACHINE}:openmoko:angstrom:${TARGET_OS}:${TARGET_ARCH}:buil
 
 CVS_TARBALL_STASH = "http://downloads.openmoko.org/sources/"
 
-PREMIRRORS = "(ftp|https?)$://.*/.*/ http://downloads.openmoko.org/sources/"
+PREMIRRORS = "(ftp|https?)$://.*/.* http://downloads.openmoko.org/sources/"
 
 FEED_URIS = "\
   snapshot-all##http://buildhost.openmoko.org/snapshots/2007.08/ipk/all \
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index 3fbe79e354..0e130a2fd7 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -38,6 +38,7 @@ PREFERRED_PROVIDER_virtual/arm-linux-binutils = "sharprom-toolchain-native"
 PREFERRED_PROVIDER_virtual/libc = "sharprom-toolchain-native"
 PREFERRED_PROVIDER_virtual/arm-linux-gcc = "sharprom-toolchain-native" 
 PREFERRED_PROVIDER_virtual/linux-libc-headers = "linux-libc-headers"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native"
 
 PREFERRED_VERSION_glibc = "2.2.5"
@@ -52,6 +53,7 @@ PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
 QTE_VERSION = "2.3.10"
 OPIE_VERSION = "1.2.2"
 PALMTOP_USE_MULTITHREADED_QT = "no"
+export palmtopdir = "/opt/QtPalmtop"
 require conf/distro/include/preferred-opie-versions.inc
 
 #
diff --git a/conf/sanity.conf b/conf/sanity.conf
index 0d494f1409..4af4454e2e 100644
--- a/conf/sanity.conf
+++ b/conf/sanity.conf
@@ -4,5 +4,15 @@
 #
 # Expert users can confirm their sanity with "touch conf/sanity.conf"
 BB_MIN_VERSION = "1.8.10"
+
+#
+# SANITY_ABI allows us to notify users when the format of TMPDIR changes in 
+# an incompatible way. Such changes should usually be detailed in the commit
+# that breaks the format and have been previously discussed on the mailing list 
+# with general agreement from the core team.
+#
+SANITY_ABI = "0"
+SANITY_ABIFILE = "${TMPDIR}/abi_version"
+
 INHERIT += "sanity"