Merge branch 'org.openembedded.dev' of git+ssh://git.openembedded.net/openembedded into org.openembedded.dev

15 files changed, 34 insertions, 285 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index b941b904e2..2193553ab4 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -300,6 +300,7 @@ STAGING_DIR = "${TMPDIR}/staging"
 STAGING_DIR_JAVA = "${STAGING_DIR}/java"
 STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}"
 STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}"
+STAGING_SBINDIR_NATIVE = "${STAGING_DIR_NATIVE}${sbindir_native}"
 STAGING_BINDIR_CROSS  = "${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}"
 STAGING_BINDIR_CROSS_BASEPKG = "${STAGING_DIR_NATIVE}${bindir_native}/${BASEPKG_TARGET_SYS}"
 STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir_native}"
@@ -414,7 +415,7 @@ EXTRA_IMAGEDEPENDS = ""
 
 CROSS_DIR = "${TMPDIR}/cross/${BASE_PACKAGE_ARCH}"
 CROSS_DATADIR = "${CROSS_DIR}/share"
-PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_BINDIR_CROSS_BASEPKG}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/${bindir_cross}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}${base_bindir_native}:"
+PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_BINDIR_CROSS_BASEPKG}:${STAGING_SBINDIR_NATIVE}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/${bindir_cross}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}${base_bindir_native}:"
 export PATH
 
 ##################################################################
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 7b1549f329..50546a49d7 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -21850,14 +21850,6 @@ sha256=a2d8473577c2b3b51ebf29e2c6cb31463158676a5d5b44438ff0db18e8aab949
 md5=1d5e267c57b126038689ce3bf26eea24
 sha256=468f25a70ef2dac90088caa6599c41ade6768e0cdc328dc3e82ab578903e69d4
 
-[http://projects.openmoko.org/frs/download.php/937/pisi-src-0.4.10.tar.gz]
-md5=5311ff9ddbca49ab751ad6f526c53e8f
-sha256=540a363188a51387e5296fdb3f7b885f9a0a116d106d578c14e738075e7edf42
-
-[http://projects.openmoko.org/frs/download.php/907/pisi-src-0.4.7.tar.gz]
-md5=8d47a6a2926c635cb4eb633e3ee063ce
-sha256=fd4d89c138ef2d1a6f9458cb85363581a205d1c1b69578fe7e0f856668a7fe9a
-
 [http://xorg.freedesktop.org/releases/individual/lib/pixman-0.10.0.tar.bz2]
 md5=fb23e17a8a0308e8fad6dc153753ba9a
 sha256=2b841f49b245948b8739e55f1b663687d5b33eb2767833574f9a1f0904a1d1e4
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 93b805263f..dcab24b18a 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -8,13 +8,13 @@ PREFERRED_VERSION_cairo		= "1.8.10"
 PREFERRED_VERSION_dbus 		= "1.2.22"
 PREFERRED_VERSION_dropbear      = "0.51"
 PREFERRED_VERSION_fontconfig	= "2.8.0"
-PREFERRED_VERSION_glib-2.0 	= "2.23.6"
-PREFERRED_VERSION_glib-2.0-native = "2.23.6"
-PREFERRED_VERSION_glibmm = "2.22.1"
+PREFERRED_VERSION_glib-2.0 	= "2.24.0"
+PREFERRED_VERSION_glib-2.0-native = "2.24.0"
+PREFERRED_VERSION_glibmm = "2.24.0"
 PREFERRED_VERSION_gst-pulse 	= "0.9.7"
-PREFERRED_VERSION_gtk+		= "2.18.6"
-PREFERRED_VERSION_gtk+-native	= "2.18.6"
-PREFERRED_VERSION_gtkmm		= "2.18.1"
+PREFERRED_VERSION_gtk+		= "2.20.0"
+PREFERRED_VERSION_gtk+-native	= "2.20.0"
+PREFERRED_VERSION_gtkmm		= "2.20.0"
 PREFERRED_VERSION_hal		= "0.5.14"
 PREFERRED_VERSION_libgemwidget	= "1.0"
 PREFERRED_VERSION_libgpephone	= "0.4"
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index 20c03fef15..7a795f38c1 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -9,7 +9,7 @@ PREFERRED_VERSION_automake-native = "1.11.1"
 PREFERRED_VERSION_libmikmod = "3.2.0-beta2"
 PREFERRED_VERSION_mtd-utils-native = "1.2.0+git"
 PREFERRED_VERSION_strace = "4.5.15"
-PREFERRED_VERSION_mesa-dri     = "7.7.999"
+PREFERRED_VERSION_mesa-dri     = "7.8"
 
 # We need this for jamvm
 PREFERRED_VERSION_classpath = "0.98"
@@ -28,8 +28,8 @@ PREFERRED_VERSION_linux-libc-headers = "2.6.32"
 PREFERRED_VERSION_openssh = "5.2p1"
 
 # upgrades used in Angstrom
-PREFERRED_VERSION_gtk+          = "2.18.6"
-PREFERRED_VERSION_gtk+-native   = "2.18.6"
+PREFERRED_VERSION_gtk+          = "2.20.0"
+PREFERRED_VERSION_gtk+-native   = "2.20.0"
 PREFERRED_VERSION_hal           = "0.5.13"
 PREFERRED_VERSION_libtool       = "2.2.6b"
 PREFERRED_VERSION_libtool-native = "2.2.6b"
@@ -38,8 +38,8 @@ PREFERRED_VERSION_libtool-sdk   = "2.2.6b"
 PREFERRED_VERSION_udev          = "151"
 PREFERRED_VERSION_usbutils      = "0.86"
 PREFERRED_VERSION_wpa-supplicant = "0.6.9"
-PREFERRED_VERSION_glib-2.0      = "2.22.4"
-PREFERRED_VERSION_glib-2.0-native = "2.22.4"
+PREFERRED_VERSION_glib-2.0      = "2.24.0"
+PREFERRED_VERSION_glib-2.0-native = "2.24.0"
 UDEV_GE_141 = "1"
 
 ANGSTROM_QT_VERSION ?= "4.6.2"
diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc
index 2749c39ce8..6ea8c90a8f 100644
--- a/conf/distro/include/preferred-slugos-versions.inc
+++ b/conf/distro/include/preferred-slugos-versions.inc
@@ -20,9 +20,7 @@ PREFERRED_VERSION_linux-ixp4xx = "2.6.27.8+svnr${SRCREV}"
 # be removed as soon as opkg starts to work correctly again as newer opkg
 # versions fix a number of bugs and add some desireable features.
 #
-SRCREV_pn-opkg        = "160"
-SRCREV_pn-opkg-native = "160"
-SRCREV_pn-opkg-sdk    = "160"
+OPKG_SRCREV = "160"
 #
 #===============================================================================#
 #===============================================================================#
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc
index 5a391aa45a..6db9d92f71 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc
@@ -339,9 +339,3 @@ PREFERRED_VERSION_util-macros-native = "X11R7.0-1.0.1"
 PREFERRED_VERSION_util-macros = "X11R7.0-1.0.1"
 PREFERRED_VERSION_xorg-cf-files = "X11R7.0-1.0.1"
 PREFERRED_VERSION_xserver-xorg = "X11R7.0-1.0.1"
-
-# Unreleased Packages
-SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
-PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
-SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
-PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc
index c387161577..782549589d 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc
@@ -183,9 +183,3 @@ PREFERRED_VERSION_util-macros ?= "X11R7.1-1.0.2"
 PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2"
 PREFERRED_VERSION_xserver-kdrive ?= "X11R7.1-1.1.0"
 PREFERRED_VERSION_xserver-xorg ?= "X11R7.1-1.1.0"
-
-# Unreleased packages
-SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
-PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
-SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
-PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc
index dc34a99340..0fefcc849b 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc
@@ -268,9 +268,3 @@ PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2"
 # xserver
 PREFERRED_VERSION_xserver-kdrive ?= "1.2.0"
 PREFERRED_VERSION_xserver-xorg ?= "1.2.0"
-
-# Unreleased packages
-SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
-PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
-SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
-PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
index 648472e9b6..3bccd411bb 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
@@ -279,9 +279,3 @@ PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
 # xserver
 PREFERRED_VERSION_xserver-kdrive ?= "1.4"
 PREFERRED_VERSION_xserver-xorg ?= "1.4"
-
-# Unreleased packages
-SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
-PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
-SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
-PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
index 11640d5cdc..1c8f438635 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
@@ -254,9 +254,3 @@ PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
 # xserver
 PREFERRED_VERSION_xserver-kdrive ?= "1.4"
 PREFERRED_VERSION_xserver-xorg ?= "1.5.1"
-
-# Unreleased packages
-SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
-PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
-SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
-PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
index 368f766a5b..eeb3bf93d4 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
@@ -282,10 +282,4 @@ PREFERRED_VERSION_util-macros-native ?= "1.3.0"
 # xserver
 PREFERRED_VERSION_xserver-xorg ?= "1.7.1"
 
-# Unreleased packages
-SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
-PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
-SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
-PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
-
 require conf/distro/include/preferred-xorg-versions-X11R7.5-latest.inc
diff --git a/conf/distro/include/preferred-xorg-versions.inc b/conf/distro/include/preferred-xorg-versions.inc
index ea99842fd6..61a01bc291 100644
--- a/conf/distro/include/preferred-xorg-versions.inc
+++ b/conf/distro/include/preferred-xorg-versions.inc
@@ -109,7 +109,3 @@ PREFERRED_VERSION_xtrans ?= "1.0.3"
 PREFERRED_VERSION_xtrans-native ?= "1.0.3"
 PREFERRED_VERSION_xinit ?= "1.0.4"
 PREFERRED_VERSION_xev ?= "1.0.2"
-SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
-PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}"
-SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
-PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}"
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index 45fd0e2118..20f00d86cb 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -25,7 +25,6 @@ SRCREV_pn-mterm2 ?= "${FSO_CORNUCOPIA_SRCREV}"
 # FSO Projects -- Misc
 SRCREV_pn-dbus-hlid ?= "5df7f49fe8881804aaab544a569fd164c3e93afb"
 SRCREV_pn-frameworkd ?= "f751f2724eea23d0ca050bdf2672f9011ae09517"
-SRCREV_pn-frameworkd-config-shr_FSO_REV ?= ${SRCREV_pn-frameworkd}
 SRCREV_pn-fso-gpsd ?= "39e810899110a9bb302cf2064e1c0f73541fb4e6"
 SRCREV_pn-fso-gsm0710muxd ?= "1d69fb5b666ac2a9e54e46978c7afa8fe5dfc3c9"
 SRCREV_pn-fso-monitord ?= "b4ae1e9b10e710042624c2cf1a15b91a7d5b1d44"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 34673c35ca..403e63d9e5 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -1,43 +1,16 @@
-# Generated with 
-# bitbake -s | grep svnr  | awk '{print "SRCREV_pn-" $1 "=" $2}' | \
-# sed -e s:\+:\=:g -e s:svnr::g| awk -F "=" '{print $1 " ?=\" " $3}' | \
-# awk -F "-r" '{print $1"\""}'
-
-# This will miss recipes that have skippackage set (e.g. uclibc)
-
 # this is alphabetical!
+# only SRCREVs included in more recipes should be here, otherwise put sane SRCREV to recipe directly
 
-# yes, really!
-
-# you know what that means? like... a, b, c, d, e, f, g...
-
-SRCREV_pn-accelges ?= "206"
 SRCREV_pn-advancedcaching ?= "9c3661f5573d2dd712437f1590070153d12e4c02"
-SRCREV_pn-aircrack-ng ?= "802"
 SRCREV_pn-alsa-scenario ?= "8bd7f83d847424eb44704cf1649974b2fda8d8f1"
 SRCREV_pn-aufs2-util ?= "f35ba2292fe40aa94aa83713e0b2719f35a25768"
-SRCREV_pn-bfin-uclibc ?= "1857"
 SRCREV_pn-blipomoko ?= "93295f36f7b45c691df247cb2a65227facf13654"
-SRCREV_pn-bootchart-lite ?= "4"
 SRCREV_pn-bt-configure ?= "9654c88ff74bca89cf747937cbec67421d2f1cbc"
-SRCREV_pn-bubble-keyboard ?= "194"
 SRCREV_pn-calc ?= "cff7c833d4fce0d39de0812bfc9ed9e0eb8fac09"
-SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
-SRCREV_pn-cdparanoia ?= "16684"
-SRCREV_pn-clutter ?= "3240"
-SRCREV_pn-clutter-box2d ?= "3197"
-SRCREV_pn-clutter-cairo ?= "3210"
-SRCREV_pn-clutter-gst ?= "3188"
 SRCREV_pn-clutter-gtk ?= "70f4b0cbd568dfa265484a03be3bd08ad15ed12e"
 SRCREV_pn-clutter-gtk-0.6 ?= "2ba362a1a223c2b28541030a80aa11191615340a"
 SRCREV_pn-clutter-gtk-0.8 ?= "7d3c3230376e731c06c21afa9d8c1d44dbea27cd"
-SRCREV_pn-comic-reader ?= "54"
-SRCREV_pn-contact ?= "1410"
-SRCREV_pn-dasher-gpe ?= "1251"
-SRCREV_pn-dbus-c++ ?= "13131"
-SRCREV_pn-dbus-c++-native ?= "13131"
 SRCREV_pn-disko ?= "f52597b8d5d584811cbe8f9e0bf25ea372526953"
-SRCREV_pn-e-wm-config-illume-shr ?= "bbcec18f0ebd47e4f6eea88b9b774edf7400e752"
 SRCREV_pn-e-wm-illume-dict-pl ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-e-wm-menu-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-e-wm-sysactions-shr ?= "bbcec18f0ebd47e4f6eea88b9b774edf7400e752"
@@ -45,143 +18,53 @@ SRCREV_pn-e-wm-theme-illume-gry ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-e-wm-theme-illume-niebiee ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-e-wm-theme-illume-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-e-wm-theme-illume-sixteen ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-SRCREV_pn-ebrainy ?= "21"
-SRCREV_pn-eds-dbus ?= "736"
 SRCREV_pn-elementary-theme-gry ?= "2b62d1c9b02da047071105a7b5695acd6c6dbcca"
 SRCREV_pn-elementary-theme-niebiee ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
 SRCREV_pn-elementary-theme-sixteen ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
-SRCREV_pn-elf2flt ?= "1786"
-SRCREV_pn-epdfview ?= "346"
-SRCREV_pn-epiphany ?= "7837"
-SRCREV_pn-essential-dialer ?= "194"
-SRCREV_pn-ezx-boot-usb-native ?= "2512"
-SRCREV_pn-ezx-gen-blob ?= "2517"
-SRCREV_pn-ezxd ?= "2513"
-SRCREV_pn-fbgrab-viewer-native ?= "1943"
-SRCREV_pn-flashrom ?= "3682"
-SRCREV_pn-frameworkd-config-shr ?= "cdf5b5f3d8f37d6d91e1eb8d9cf07d034291df87"
-SRCREV_pn-frameworkd-config-shr_SHR_REV ?= ${SRCREV_pn-frameworkd-config-shr}
 SRCREV_pn-fsod ?= "2a33e5ffe96c611e6a6b8b6c33d2a83ba656f55b"
-SRCREV_pn-fstests ?= "204"
-SRCREV_pn-gabriel ?= "38"
-SRCREV_pn-gabriel-native ?= "38"
-SRCREV_pn-gconf-dbus ?= "641"
 SRCREV_pn-glamo-dri-tests ?= "080b8db3d9dbfae38ebb00439887b5535ab1d380"
-SRCREV_pn-gnet ?= "495"
-SRCREV_pn-gpe-conf ?= "9900"
-SRCREV_pn-gpe-contacts ?= "9312"
-SRCREV_pn-gpe-gallery ?= "9376"
-SRCREV_pn-gpe-mini-browser2 ?= "9900"
-SRCREV_pn-gpe-sketchbook ?= "9547"
-SRCREV_pn-gridpad ?= "194"
-SRCREV_pn-gtkhtml2 ?= "1158"
-SRCREV_pn-gypsy ?= "134"
-SRCREV_pn-hildon-1 ?= "14429"
-SRCREV_pn-illume-keyboards-shr ?= "7bcdd55dc0cf6f3b50fd0226345592f538301b8a"
 SRCREV_pn-illume-theme-freesmartphone ?= "b1b0f6adc59e6f72a3929771058e3750bf181bc5"
-SRCREV_pn-intuition ?= "194"
-SRCREV_pn-kismet ?= "2285"
-SRCREV_pn-kismet-newcore ?= "2285"
-SRCREV_pn-libcalenabler2 ?= "1410"
-SRCREV_pn-libefso ?= "194"
-SRCREV_pn-libfakekey ?= "1455"
 SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f"
 SRCREV_pn-libgee ?= "a86abd4240622ec377bbc5773850a4593e13f7eb"
 SRCREV_pn-libgee-native ?= "a86abd4240622ec377bbc5773850a4593e13f7eb"
-SRCREV_pn-libgsmd ?= "4505"
-SRCREV_pn-libiac ?= "1590"
 SRCREV_pn-libmodulo ?= "7d2f657d248bd86377e66c329aa6826459d406da"
 SRCREV_pn-libnl2 ?= "8808743839b0f459394ecd00cb0f7c1896c0ab7a"
-SRCREV_pn-libowl ?= "277"
-SRCREV_pn-libphone-ui ?= "97fda168d8d5f4771267305ea0672b4bc7756957"
-SRCREV_pn-libphone-ui-shr ?= "46c991d348419f504775df2d602158a7dfdc9bf1"
-SRCREV_pn-librfid ?= "2094"
-SRCREV_pn-libsnmp-perl ?= "17367"
+SRCREV_pn-libphone-ui ?= "08ccc9710b1f33c93cc8f1c20be9c658ef5040dd"
+SRCREV_pn-libphone-ui-shr ?= "2106165a2be62053f9d0019d50813823a84b8421"
 SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb"
-SRCREV_pn-libw100 ?= "47"
-SRCREV_pn-libxcalibrate ?= "209d83af61ed38a002c8096377deac292b3e396c"
-SRCREV_pn-libxosd ?= "627"
-SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-eten ?= "ab2d414f4f13816af0ec0401b608133ca946624a"
-SRCREV_pn-linux-hackndev-2.6 ?= "1308"
-SRCREV_pn-linux-ixp4xx ?= "1089"
 SRCREV_pn-linux-sgh-i900 ?= "7e5f8bd3864485e5fc66cb946e09f18b5a32cebc"
-SRCREV_pn-llvm-gcc4 ?= "374"
-SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-madbutterfly ?= "ecd1842714b5e982f3138cbdd358517d57be6aa3"
-SRCREV_pn-maemo-mapper ?= "118"
 SRCREV_pn-mamona-input-methods ?= "4a8f11973021b8b4f157f5743e00f9f9a3c4802b"
 SRCREV_pn-mamonaim-e-applet ?= "a1ba7e8a388ffce3cca92bad059cd801e7733a7a"
-SRCREV_pn-matchbox-config-gtk ?= "1614"
-SRCREV_pn-matchbox-desktop-2 ?= "2096"
-SRCREV_pn-matchbox-keyboard ?= "1910"
-SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910"
-SRCREV_pn-matchbox-panel-2 ?= "2098"
-SRCREV_pn-matchbox-panel-2-icon-themes ?= "1907"
-SRCREV_pn-matchbox-stroke ?= "1820"
-SRCREV_pn-matchbox-terminal ?= "1612"
-SRCREV_pn-matchbox-wm-2 ?= "2087"
 SRCREV_pn-midori ?= "400139644371c0b675723f9a986ddab4445a8794"
 SRCREV_pn-mobile-broadband-provider-info ?= "bc536218490377ccbd09c4e5858d37c91c2f03f7"
 SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
-SRCREV_pn-mpd-alsa ?= "6952"
-SRCREV_pn-mplayer-maemo ?= "342"
 SRCREV_pn-msn-pecan ?= "e795b33b29d792f19fcf699275eb966dc68be257"
-SRCREV_pn-multitap-pad ?= "373"
 SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
-SRCREV_pn-net-snmp ?= "17367"
-SRCREV_pn-netsurf ?= "3859"
-SRCREV_pn-oh-puzzles ?= "22"
 SRCREV_pn-ohm ?= "edfe25d49d67884bf004de7ae0724c162bb5e65e"
 SRCREV_pn-ologicd ?= "4a32af91a9479ebd4d1d39057354ac9904d74cbb"
 SRCREV_pn-om-locations ?= "942e88a1b689ffe3f11a2d982cce389cc965b2ec"
 SRCREV_pn-openbsc ?= "5e68183a201ab92f29cd2467df5209f7b351a66d"
 SRCREV_pn-openbsc-onwaves ?= "0d9ed87d5c7d5b6e21dc3bbb282e215068742566"
 SRCREV_pn-openezx-kernel ?= "b390bb1ee708277297fdfd38e26d955b17d81c2e"
-SRCREV_pn-openmoko-footer ?= "2354"
-SRCREV_pn-openmoko-terminal2 ?= "4782"
 SRCREV_pn-openmoocow ?= "39648419825cddfea1cb1321e552a12b71fede14"
-SRCREV_pn-openocd ?= "517"
-SRCREV_pn-openocd-native ?= "517"
 SRCREV_pn-opimd-utils ?= "1872cdebe1209123710259e25cb8c8b47a627112"
-SRCREV_pn-opkg ?= "527"
-SRCREV_pn-opkg-native ?= "526"
-SRCREV_pn-opkg-sdk ?= "526"
-SRCREV_pn-opkg-utils ?= "4578"
-SRCREV_pn-opkg-utils-native ?= "4595"
-SRCREV_pn-oprofileui ?= "173"
-SRCREV_pn-osb-browser ?= "125"
-SRCREV_pn-osb-jscore ?= "117"
-SRCREV_pn-osb-nrcit ?= "125"
-SRCREV_pn-osb-nrcore ?= "126"
 SRCREV_pn-packagekit ?= "96823118e98515dd41748e8c7bdb9cf7b1d4a95f"
 SRCREV_pn-paroli ?= "bb9fb1969acdfbaa48b55902675a6d8949014c6d"
-SRCREV_pn-phonefsod ?= "692a5b6b8a7d2cf6af6c4bc93e97cf041b4d805c"
+SRCREV_pn-phonefsod ?= "de3eab1df1682cb41abfd105bb6767fedfbbf7b4"
 SRCREV_pn-phoneui-apps ?= "d349e764400d7a4eaaa12f359d6c64b3ca55faaf"
-SRCREV_pn-phoneuid ?= "a466c58560222c6b7ab7c9554c8c5b66ed017bd7"
-SRCREV_pn-portaudio-v19 ?= "1387"
-SRCREV_pn-psplash ?= "249"
+SRCREV_pn-phoneuid ?= "30e063783b4b3fe5a411e7739d76dc85129452aa"
 SRCREV_pn-pty-forward-native ?= "4662b55fdba528bb5b3349f83055bf236af5d63b"
 SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
 SRCREV_pn-pyphonelog ?= "d631b6242b75ce49e2fe8c4e50fec46d5d80bc97"
-SRCREV_pn-pythm ?= "19"
-SRCREV_pn-python-coherence ?= "1161"
-SRCREV_pn-python-connexion ?= "1439"
-SRCREV_pn-python-formencode ?= "3148"
-SRCREV_pn-python-gsmd ?= "148"
 SRCREV_pn-python-pycrypto ?= "d087280d7e9643a3e3f68f209932119fe6738b3c"
-SRCREV_pn-python-pyyaml ?= "344"
-QEMUSRCREV ?= "4242"
-SRCREV_pn-qemu ?= "${QEMUSRCREV}"
-SRCREV_pn-qemu-native ?= "${QEMUSRCREV}"
-SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}"
 SRCREV_pn-qtwebkit-performance-utilities ?= "27a630a74518ebb7810ed5886182e676b36c07a5"
 SRCREV_pn-qtwebkit-performance-utilities-e ?= "27a630a74518ebb7810ed5886182e676b36c07a5"
 SRCREV_pn-serial-forward ?= "50cf4ff2198589a8db369789fc038604a892a54d"
-SRCREV_pn-settings-daemon ?= "2006"
 SRCREV_pn-shr-config ?= "37dd7ac950e2bfd438801faf34c29fccfdbbaccf"
 SRCREV_pn-shr-installer ?= "8608816ea1a1ac14b6e9faaa3685dd2b6450e889"
-SRCREV_pn-shr-settings ?= "c0315c80f3236f1a9ddf23f38520bc88ed173ffd"
+SRCREV_pn-shr-settings ?= "b6aed65934cf047f1abd3d8f630d87f900422c38"
 SRCREV_pn-shr-specs ?= "d8f0dc85f1a7a6c0c6d24755f3770a55229621ae"
 SRCREV_pn-shr-splash ?= "0375bf2b66a053dd490774004c56b5d949f02ac8"
 SRCREV_pn-shr-splash-theme-dontpanic ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
@@ -194,107 +77,15 @@ SRCREV_pn-shr-theme ?= "730da87ad75c814c16c856ca138605d985b6efdb"
 SRCREV_pn-shr-theme-gtk-e17lookalike ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-shr-today ?= "7b69649a9df0e85f0c0f7985fd1d93543c3b11e2"
 SRCREV_pn-shr-wizard ?= "24450cba257e7057045ad576530f158a03bd0f8b"
-SRCREV_pn-socketcan-modules ?= "917"
-SRCREV_pn-socketcan-utils-test ?= "917"
-SRCREV_pn-sphyrna-python ?= "45"
-SRCREV_pn-starling ?= "9574"
 SRCREV_pn-stopwatch ?= "89644b91e02151fc72989755f20c1ffb144ef5e2"
-SRCREV_pn-table ?= "2191"
 SRCREV_pn-tichy ?= "ab68d849502009cf3214df48ffa8075a10cc2177"
-SRCREV_pn-tmut ?= "60"
 SRCREV_pn-toscoterm ?= "f02add76f365a2fecd2dbefc230ceaab20244f96"
-SRCREV_pn-tslib ?= "77"
-SRCREV_pn-u-boot-bug ?= "8674"
 SRCREV_pn-u-boot-openmoko ?= "650149a53dbdd48bf6dfef90930c8ab182adb512"
 SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
-SRCREV_pn-usbpath ?= "3172"
-SRCREV_pn-usbpath-native ?= "3172"
 SRCREV_pn-webkit-efl ?= "3a5ee77664c898ed51a2b2d5759822f8c0a06472"
-SRCREV_pn-wesnoth ?= "39828"
-SRCREV_pn-wlan-ng-modules ?= "1859"
-SRCREV_pn-wlan-ng-utils ?= "1859"
-SRCREV_pn-xoo ?= "1971"
 SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52"
 
-# Enlightenment Foundation Libraries
-# Caution: This is not alphabetically, but (roughly) dependency-sorted.
-# Please leave it like that.
-EFL_SRCREV ?= "47555"
-SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
-SRCREV_pn-edb ?= "${EFL_SRCREV}"
-SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
-SRCREV_pn-eina ?= "${EFL_SRCREV}"
-SRCREV_pn-eet-native ?= "${EFL_SRCREV}"
-SRCREV_pn-eet ?= "${EFL_SRCREV}"
-SRCREV_pn-evas-native ?= "${EFL_SRCREV}"
-SRCREV_pn-evas ?= "${EFL_SRCREV}"
-SRCREV_pn-ecore-native ?= "${EFL_SRCREV}"
-SRCREV_pn-ecore ?= "${EFL_SRCREV}"
-SRCREV_pn-edbus ?= "${EFL_SRCREV}"
-SRCREV_pn-embryo-native ?= "${EFL_SRCREV}"
-SRCREV_pn-embryo ?= "${EFL_SRCREV}"
-SRCREV_pn-edje-native ?= "${EFL_SRCREV}"
-SRCREV_pn-edje-sdk ?= "${EFL_SRCREV}"
-SRCREV_pn-edje ?= "${EFL_SRCREV}"
-SRCREV_pn-elementary ?= "${EFL_SRCREV}"
-SRCREV_pn-emotion ?= "${EFL_SRCREV}"
-SRCREV_pn-ewl ?= "${EFL_SRCREV}"
-SRCREV_pn-epeg ?= "${EFL_SRCREV}"
-SRCREV_pn-epdf ?= "${EFL_SRCREV}"
-SRCREV_pn-esmart ?= "${EFL_SRCREV}"
-SRCREV_pn-efreet ?= "${EFL_SRCREV}"
-SRCREV_pn-exml ?= "${EFL_SRCREV}"
-SRCREV_pn-enhance ?= "${EFL_SRCREV}"
-SRCREV_pn-engrave ?= "${EFL_SRCREV}"
-SRCREV_pn-evolve-native ?= "${EFL_SRCREV}"
-SRCREV_pn-evolve ?= "${EFL_SRCREV}"
-SRCREV_pn-gevas2 ?= "${EFL_SRCREV}"
-SRCREV_pn-imlib2 ?= "${EFL_SRCREV}"
-SRCREV_pn-libeweather ?= "${EFL_SRCREV}"
-
-# Enlightenment Bindings
-SRCREV_pn-libeflvala ?= "${EFL_SRCREV}"
-SRCREV_pn-eflpp ?= "${EFL_SRCREV}"
-SRCREV_pn-python-evas ?= "${EFL_SRCREV}"
-SRCREV_pn-python-ecore ?= "${EFL_SRCREV}"
-SRCREV_pn-python-edje ?= "${EFL_SRCREV}"
-SRCREV_pn-python-elementary ?= "${EFL_SRCREV}"
-SRCREV_pn-python-edbus ?= "${EFL_SRCREV}"
-SRCREV_pn-python-emotion ?= "${EFL_SRCREV}"
-SRCREV_pn-python-ewl ?= "${EFL_SRCREV}"
-
-# Enlightenment Applications
-SRCREV_pn-edje-editor ?= "${EFL_SRCREV}"
-SRCREV_pn-edje-player ?= "${EFL_SRCREV}"
-SRCREV_pn-edje-viewer ?= "${EFL_SRCREV}"
-SRCREV_pn-elementary-alarm ?= "${EFL_SRCREV}"
-SRCREV_pn-elementary-sms ?= "${EFL_SRCREV}"
-SRCREV_pn-elmdentica ?= "${EFL_SRCREV}"
-SRCREV_pn-emphasis ?= "${EFL_SRCREV}"
-SRCREV_pn-ephoto ?= "${EFL_SRCREV}"
-SRCREV_pn-eve ?= "${EFL_SRCREV}"
-SRCREV_pn-examine ?= "${EFL_SRCREV}"
-SRCREV_pn-exhibit ?= "${EFL_SRCREV}"
-SRCREV_pn-expedite ?= "${EFL_SRCREV}"
-SRCREV_pn-elitaire ?= "${EFL_SRCREV}"
-SRCREV_pn-entice ?= "${EFL_SRCREV}"
-SRCREV_pn-entrance ?= "${EFL_SRCREV}"
-SRCREV_pn-e-utils ?= "${EFL_SRCREV}"
-SRCREV_pn-e-wm ?= "${EFL_SRCREV}"
-SRCREV_pn-enna ?= "${EFL_SRCREV}"
-SRCREV_pn-exquisite ?= "${EFL_SRCREV}"
-SRCREV_pn-exquisite-theme-illume ?= "${EFL_SRCREV}"
-SRCREV_pn-rage ?= "${EFL_SRCREV}"
-SRCREV_pn-illume ?= "${EFL_SRCREV}"
-SRCREV_pn-illume-theme-illume ?= "${EFL_SRCREV}"
-SRCREV_pn-waker ?= "${EFL_SRCREV}"
-
-#illume default keyboards
-SRCREV_pn-illume-keyboard-default ?= "${EFL_SRCREV}"
-
-#exalt
-SRCREV_pn-exalt ?= "${EFL_SRCREV}"
-SRCREV_pn-exalt-client ?= "${EFL_SRCREV}"
-
+OPKG_SRCREV ?= "527"
+EFL_SRCREV ?= "47642"
 
 require conf/distro/include/sane-srcrevs-fso.inc
diff --git a/conf/machine/include/tune-cortexa8.inc b/conf/machine/include/tune-cortexa8.inc
index a2ce7def1a..096c219511 100644
--- a/conf/machine/include/tune-cortexa8.inc
+++ b/conf/machine/include/tune-cortexa8.inc
@@ -3,7 +3,15 @@
 # [2] http://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html 
 # [3] https://support.codesourcery.com/GNUToolchain/kbentry29
 
-TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp"
-FEED_ARCH = "armv7a"
-PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6 armv7 armv7a"
-BASE_PACKAGE_ARCH = "armv7a"
+# Can be 'softfp' or 'hardfp'
+ARM_FP_MODE ?= "softfp"
+
+ARM_FP_OPT = "${@['-mfloat-abi=softfp', '-mfloat-abi=hardfp'][bb.data.getVar('ARM_FP_MODE', d, 1) == 'hardfp']}"
+ARM_FP_PACKAGESUFFIX = "${@['', '-hardfp'][bb.data.getVar('ARM_FP_MODE', d, 1) == 'hardfp']}"
+
+TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon ${ARM_FP_OPT}"
+
+FEED_ARCH = "armv7a${ARM_FP_PACKAGESUFFIX}"
+BASE_PACKAGE_ARCH = "armv7a${ARM_FP_PACKAGESUFFIX}"
+
+PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6 armv7 armv7a${ARM_FP_PACKAGESUFFIX}"