Merge commit 'origin/org.openembedded.dev' into org.openembedded.dev

17 files changed, 449 insertions, 359 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 96e7799d2a..120fbbe3d6 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -8,31 +8,31 @@ BBMASK = "/(nonworking|obsolete)/"
 ##################################################################
 
 # Path prefixes
-layout_prefix = "/usr"
-layout_exec_prefix = "/usr"
-layout_base_prefix = ""
+layout_prefix = "${prefix}"
+layout_exec_prefix = "${exec_prefix}"
+layout_base_prefix = "${base_prefix}"
 
 # Base paths
-layout_base_bindir = "${layout_base_prefix}/bin"
-layout_base_sbindir = "${layout_base_prefix}/sbin"
-layout_base_libdir = "${layout_base_prefix}/lib"
+layout_base_bindir = "${base_bindir}"
+layout_base_sbindir = "${base_sbindir}"
+layout_base_libdir = "${base_libdir}"
 
 # Architecture independent paths
-layout_sysconfdir = "${layout_base_prefix}/etc"
-layout_localstatedir = "${layout_base_prefix}/var"
-layout_servicedir = "${layout_base_prefix}/srv"
-layout_sharedstatedir = "${layout_prefix}/com"
-layout_datadir = "${layout_prefix}/share"
-layout_infodir = "${layout_datadir}/info"
-layout_mandir = "${layout_datadir}/man"
-layout_docdir = "${layout_datadir}/doc"
+layout_sysconfdir = "${sysconfdir}"
+layout_localstatedir = "${localstatedir}"
+layout_servicedir = "${servicedir}"
+layout_sharedstatedir = "${sharedstatedir}"
+layout_datadir = "${datadir}"
+layout_infodir = "${infodir}"
+layout_mandir = "${mandir}"
+layout_docdir = "${docdir}"
 
 # Architecture dependent paths
-layout_bindir = "${layout_exec_prefix}/bin"
-layout_sbindir = "${layout_exec_prefix}/sbin"
-layout_libdir = "${layout_exec_prefix}/lib"
-layout_includedir = "${layout_exec_prefix}/include"
-layout_libexecdir = "${layout_exec_prefix}/libexec"
+layout_bindir = "${bindir}"
+layout_sbindir = "${sbindir}"
+layout_libdir = "${libdir}"
+layout_includedir = "${includedir}"
+layout_libexecdir = "${libexecdir}"
 
 ##################################################################
 # Standard target filesystem paths.
@@ -40,31 +40,51 @@ layout_libexecdir = "${layout_exec_prefix}/libexec"
 
 # Path prefixes
 export base_prefix = ""
-export prefix = "${layout_prefix}"
-export exec_prefix = "${layout_exec_prefix}"
+export prefix = "/usr"
+export exec_prefix = "/usr"
 
 # Base paths
-export base_bindir = "${layout_base_bindir}"
-export base_sbindir = "${layout_base_sbindir}"
-export base_libdir = "${layout_base_libdir}"
+export base_bindir = "${base_prefix}/bin"
+export base_sbindir = "${base_prefix}/sbin"
+export base_libdir = "${base_prefix}/lib"
 
 # Architecture independent paths
-export datadir = "${layout_datadir}"
-export sysconfdir = "${layout_sysconfdir}"
-export sharedstatedir = "${layout_sharedstatedir}"
-export localstatedir = "${layout_localstatedir}"
-export infodir = "${layout_infodir}"
-export mandir = "${layout_mandir}"
-export docdir = "${layout_docdir}"
-export servicedir = "${layout_servicedir}"
+export datadir = "${prefix}/share"
+export sysconfdir = "${base_prefix}/etc"
+export servicedir = "${base_prefix}/srv"
+export sharedstatedir = "${base_prefix}/com"
+export localstatedir = "${base_prefix}/var"
+export infodir = "${datadir}/info"
+export mandir = "${datadir}/man"
+export docdir = "${datadir}/doc"
 
 # Architecture dependent paths
-export bindir = "${layout_bindir}"
-export sbindir = "${layout_sbindir}"
-export libexecdir = "${layout_libexecdir}"
-export libdir = "${layout_libdir}"
-export includedir = "${layout_includedir}"
-export oldincludedir = "${layout_includedir}"
+export bindir = "${exec_prefix}/bin"
+export sbindir = "${exec_prefix}/sbin"
+export libexecdir = "${exec_prefix}/libexec"
+export libdir = "${exec_prefix}/lib"
+export includedir = "${exec_prefix}/include"
+export oldincludedir = "${exec_prefix}/include"
+
+#
+# These must match the various bbclass layout definitions
+#
+base_bindir_native = "/bin"
+base_sbindir_native = "/sbin"
+sysconfdir_native = "/etc"
+prefix_native = "/usr"
+bindir_native = "${prefix_native}/bin"
+sbindir_native = "${prefix_native}/sbin"
+includedir_native = "${prefix_native}/include"
+libdir_native = "${prefix_native}/lib"
+datadir_native = "${prefix_native}/share"
+bindir_cross = "/bin"
+
+#
+# Cross recipes need to know about the target layout
+# := is used carefully here
+#
+target_datadir := "${datadir}"
 
 ##################################################################
 # Architecture-dependent build variables.
@@ -108,7 +128,7 @@ EXEEXT = "${HOST_EXEEXT}"
 BASE_PACKAGE_ARCH = "${HOST_ARCH}"
 PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
 PACKAGE_EXTRA_ARCHS ?= ""
-MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}"
+MACHINE_ARCH = "${@[bb.data.getVar('BASE_PACKAGE_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}"
 PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}"
 
 MULTIMACH_ARCH = "${PACKAGE_ARCH}"
@@ -170,7 +190,8 @@ MACHINE_KERNEL_PR = ""
 # Base package name
 # Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial"
 # otherwise it is the same as PN and P
-BPN = "${@base_package_name(d)}"
+SPECIAL_PKGSUFFIX = "-native -cross -initial -intermediate -nativesdk -crosssdk -cross-canadian -sdk"
+BPN = "${@base_prune_suffix(bb.data.getVar('PN', d, True), bb.data.getVar('SPECIAL_PKGSUFFIX', d, True).split(), d)}"
 BP = "${BPN}-${PV}"
 
 # Package info.
@@ -277,22 +298,22 @@ B = "${S}"
 STAGING_DIR = "${TMPDIR}/staging"
 
 STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}"
-STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_bindir}"
-STAGING_BINDIR_CROSS  = "${STAGING_DIR_NATIVE}${layout_bindir}/${MULTIMACH_HOST_SYS}"
-STAGING_BINDIR_CROSS_BASEPKG = "${STAGING_DIR_NATIVE}${layout_bindir}/${BASEPKG_TARGET_SYS}"
-STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_libdir}"
-STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_includedir}"
-STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_sysconfdir}"
-STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_datadir}"
+STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_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}"
+STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}"
+STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}"
+STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadir_native}"
 
 # This should really be MULTIMACH_HOST_SYS but that breaks "all" and machine 
 # specific packages - hack around it for now.
 STAGING_DIR_HOST = "${STAGING_DIR}/${BASEPKG_HOST_SYS}"
-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_BINDIR = "${STAGING_DIR_HOST}${bindir}"
+STAGING_LIBDIR = "${STAGING_DIR_HOST}${libdir}"
+STAGING_INCDIR = "${STAGING_DIR_HOST}${includedir}"
+STAGING_DATADIR = "${STAGING_DIR_HOST}${datadir}"
+STAGING_EXECPREFIXDIR = "${STAGING_DIR_HOST}${exec_prefix}"
 STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader"
 STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware"
 STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4"
@@ -388,7 +409,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}${layout_sbindir}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/bin:${STAGING_DIR_NATIVE}${layout_base_sbindir}:${STAGING_DIR_NATIVE}${layout_base_bindir}:"
+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}:"
 export PATH
 
 ##################################################################
@@ -440,8 +461,8 @@ PATCHRESOLVE = 'noop'
 
 export BUILD_CPPFLAGS = "-isystem${STAGING_INCDIR_NATIVE}"
 export CPPFLAGS = "${TARGET_CPPFLAGS}"
-export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}${layout_includedir}"
-export SDK_CPPFLAGS = "-isystem${STAGING_DIR_SDK}${layout_includedir} -isystem${STAGING_DIR_HOST}${layout_includedir}"
+export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}${includedir}"
+export SDK_CPPFLAGS = "-isystem${STAGING_DIR_SDK}${includedir} -isystem${STAGING_DIR_HOST}${includedir}"
 
 export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}"
 export CFLAGS = "${TARGET_CFLAGS}"
@@ -458,12 +479,12 @@ export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \
                         -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-O1"
 
 export LDFLAGS = "${TARGET_LDFLAGS}"
-export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \
-                         -Wl,-rpath-link,${STAGING_DIR_TARGET}${layout_libdir} \
+export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${libdir} \
+                         -Wl,-rpath-link,${STAGING_DIR_TARGET}${libdir} \
                          -Wl,-O1 \
                          ${TARGET_LINK_HASH_STYLE}"
-export SDK_LDFLAGS = "-L${STAGING_DIR_SDK}${layout_libdir} \
-                         -Wl,-rpath-link,${STAGING_DIR_SDK}${layout_libdir} \
+export SDK_LDFLAGS = "-L${STAGING_DIR_SDK}${libdir} \
+                         -Wl,-rpath-link,${STAGING_DIR_SDK}${libdir} \
                          -Wl,-O1"
 
 # Which flags to leave by strip-flags() in bin/build/oebuild.sh ?
@@ -599,7 +620,7 @@ SLOT = "0"
 
 # Other
 
-export PKG_CONFIG_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}${layout_libdir}/pkgconfig"
+export PKG_CONFIG_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}${libdir}/pkgconfig"
 export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig"
 export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
 export PKG_CONFIG_DISABLE_UNINSTALLED = "yes"
diff --git a/conf/checksums.ini b/conf/checksums.ini
index ec2651aca4..06409ca590 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -334,6 +334,10 @@ sha256=fb707b2026de62c1de6ce7fb67e9f82d586211ac09c70e81b83631e77cb47fd1
 md5=02c22a93ec9efb8e457764114ce24eb4
 sha256=e098bfb3a50b0629434011a9b56314c9045c09fac7e5d06bf57d43ffd53c1918
 
+[http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/ExtUtils-MakeMaker-6.54.tar.gz]
+md5=003c04b33e8c8eed693f5001fe52b647
+sha256=1d3dd3aafe027d6b3743a7a4bde2609111f8d4157b3643dc1fcd1393c9900c01
+
 [http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/ExtUtils-ParseXS-2.16.tar.gz]
 md5=c64fddf17ee2b27d8a90ceb455c3e570
 sha256=1f8504c7f08d2d59c71a70915fc834a285b99587444ee33e23ee3f135c071da0
@@ -414,6 +418,10 @@ sha256=0f1365a546e8c54faf5e17c5d011d0b9db8784568fb6b03522ab558ad39d9a63
 md5=d2bfa18fe1904df7f683e96611e87437
 sha256=adb17dac9e36cd011f5243881c9739417fd102fce760f8de4e9be4c7131108e2
 
+[http://search.cpan.org/CPAN/authors/id/P/PE/PETEK/HTML-Tree-3.23.tar.gz]
+md5=6352f50be402301f79b580dd235d7762
+sha256=f5175acf262f3710dce899796ea3e353049939400b100706d03df2f08803c8de
+
 [http://gallium.prg.dtu.dk/HVSC/random/HVSC_45-all-of-them.rar]
 md5=5394dac412dbe34d2dfe63cb91bdce8d
 sha256=6068499eeb3aad19d2f860390c65496cf38c5f5e5b54422db6ec2f67abbb8d10
@@ -1046,6 +1054,10 @@ sha256=a8222a274778ff16d0e3ee49a30db27a48a4d357169a915fc599a764e405e0b6
 md5=a9eb8750e920829ff41dbe7555850156
 sha256=557910a4a3aeed6d10238e26b5a39b19247115a1b352580082bb15dc02ae4b8d
 
+[http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.10.tar.gz]
+md5=a357558552436b0b5ea0333b3e2327df
+sha256=75c4520cde3b1d10ae7846983bde66d114fea9479f6acef352850dae92a1100c
+
 [http://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.5.tar.gz]
 md5=e45b1048d2747480dcc65ece4130a920
 sha256=397dee6b7ac13dea70dd3dd2ae6044f45a632a1ba156da178c96df66fb8ccdcb
@@ -5178,6 +5190,10 @@ sha256=043dea4144a93b26358ed73cd8fab79be76834a719f13fbb4344a26e8288fc38
 md5=04800a111521e7442749b2ce883f962b
 sha256=21a6e0476fb880e704e0c3cfe7b2bc6a97f6b2b0654db10b38bdd317f511a03a
 
+[ftp://ftp.isc.org/isc/dhcp/dhcp-3.1-history/dhcp-3.1.2p1.tar.gz]
+md5=787b2924a1965f0d8558521b36dca73d
+sha256=e0cb405e0fef0ecebec7aaed294032a06178ff28be87498596e6069ccda4341e
+
 [http://savannah.nongnu.org/download/dhcp-fwd/dhcp-forwarder-0.6.tar.bz2]
 md5=cbe60c8c904394a8e38e12ac42c02284
 sha256=45b708fb49a9fab10d814eb1e340a0960dac91f92800b3d39ddf0245ac913e30
@@ -8702,6 +8718,10 @@ sha256=1fe541521d7f5b9039c672f90d2fd8e412cbcc7ee9c1c6bbd7b805b75fd66657
 md5=855be1b668ceaec3320c702212c95638
 sha256=442026315d172309884686fe45721a4451d7439f2f05647159f06b9bde3575f8
 
+[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.10.1.tar.bz2]
+md5=ee71dedf724dc775e4efec9b823ed3be
+sha256=cbad3e637eab613184405a87a2bf08a41991a0e512a3ced60d120effc73de667
+
 [ftp://ftp.gnu.org/gnu/glibc/glibc-2.2.5.tar.gz]
 md5=e4c3eb8343b5df346ceaaec23459f1dc
 sha256=58dc8df59aed1e4d9d50eef9e4c4c0789fa283b50f7a093932d0f467424484ee
@@ -8770,6 +8790,10 @@ sha256=098baa84c74af5b21d27ec6e8ba6f1a393de88327cefbcd9e90c9b4edda9a36c
 md5=c89aac92d100761a767b9d5619fe582f
 sha256=3033d84fd9a62d20a8cb0d42645d7cd5a28d2d108afcb4cc2d89db3dc1e328df
 
+[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-2.10.1.tar.bz2]
+md5=8ef88560ec608d5923ee05eb5f0e15ea
+sha256=0fa72d1dd06a30642d3bb20a659f4ed0f4af54a205d7102896b68169b38676dc
+
 [ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-2.4.tar.bz2]
 md5=e2d892b40d654c523ab26a26b7dd86a1
 sha256=2f29ec2b2b2f75f787a1eed8fdea20aff212dc3bad97651ca376914c49181977
@@ -8810,6 +8834,10 @@ sha256=6c3bc4a247d1e5308fb14f81956802f09095d3683219859fcad5795aa3aea638
 md5=dc31c9e01df62cba9457af7e9b9c968e
 sha256=a69760ed0ea54b66c31d58cb32c7b23185a6b1d16f38dab8380ec4f2183b122d
 
+[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-2.10.1.tar.bz2]
+md5=816b2d48a95ddc23b27fea03a1996443
+sha256=b1f1ec9720036a3a33598b8478eef102535444a083d5b5813a6981ed74ab4071
+
 [ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-2.4.tar.bz2]
 md5=7bb1b35654e94994925e66676acabd4e
 sha256=2fbbcaad8a9f8560485c398a9066959fe2713c8bc7e653ec476fb56fed21d19a
@@ -11854,6 +11882,14 @@ sha256=1361f4f0b92d7e6bdac25a4b7ee138a7ee83b5a9368820f5aa518051ca82862b
 md5=4afc961fa709167e1b434682897991f9
 sha256=1361f4f0b92d7e6bdac25a4b7ee138a7ee83b5a9368820f5aa518051ca82862b
 
+[http://apache.mirrors.tds.net/httpd/httpd-2.2.14.tar.bz2]
+md5=a5226203aaf97e5b941c41a71c112704
+sha256=b2deab8a5e797fde7a04fb4a5ebfa9c80f767d064dd19dcd2857c94838ae3ac6
+
+[http://www.apache.org/dist/httpd/httpd-2.2.14.tar.bz2]
+md5=a5226203aaf97e5b941c41a71c112704
+sha256=b2deab8a5e797fde7a04fb4a5ebfa9c80f767d064dd19dcd2857c94838ae3ac6
+
 [http://apache.mirrors.tds.net/httpd/httpd-2.2.3.tar.bz2]
 md5=887bf4a85505e97babe1d90635361c0d
 sha256=dd86e8221f9efb85497c46229d0f04237d4e66d293fabe98eb0745166aaf4b6c
@@ -14286,6 +14322,10 @@ sha256=76866075a54aa04f4f18f2cf09cf19c84dee4ed22c45b741dc4067f5e224430d
 md5=10ee733c70e96e8e9f01d3de2cc0c78c
 sha256=46f0a85f340e099e9010c8eb9a28d727830aedb32be48fe0a2f0cd081e0623fd
 
+[http://users.musicbrainz.org/~matt/libdiscid-0.2.2.tar.gz]
+md5=ee21ddbe696a3c60e14827a75f3bcf5b
+sha256=974b5d5ab23fb45910a4fe171045a22a749cd8cb9833168f7178839993a58402
+
 [http://gpe.linuxtogo.org/download/source/libdisplaymigration-0.28.tar.gz]
 md5=f976234f9dfd6a8e1288710b49d29964
 sha256=f776abe417432b3c4ff8b063201c4b4b45479a563fb43e6fd64504b538ef4689
@@ -16970,10 +17010,6 @@ sha256=58a5ea16d499fe06f90fcbf1d687d1235d2cb9bc28bf979867bd3faadf38fc3f
 md5=7a80058a6382e5108cdb5554d1609615
 sha256=d7b9f19b92fd5c693c16cd62f441d051b699f28ec6a175d1b464e58bacd8c78f
 
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.31.4.tar.bz2]
-md5=ae7fde9fd0ae0d8ac12a1e1536d6d3ce
-sha256=e63041db1ef666ca43293762c8aaec27bd4b54b6d86aee68ebb090c1b66584f4
-
 [http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.31.tar.bz2]
 md5=84c077a37684e4cbfa67b18154390d8a
 sha256=0acd83f7b85db7ee18c2b0b7505e1ba6fd722c36f49a8870a831c851660e3512
@@ -18942,6 +18978,10 @@ sha256=6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9
 md5=32e7373c16271606007374396e6742ad
 sha256=2b0737b84e7b42c9e54c9658d23bfaee1189cd5955f26b10bdb862761d0f0432
 
+[ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22.tar.bz2]
+md5=09c8fa1058399a0c5db169a71561e985
+sha256=75c53f4b3017a9a8fcb9ff3bf7e2709a41a579b8a4e2ae1c600dc6ce6341cd31
+
 [ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22rc1.tar.bz2]
 md5=1c03d3f4ccedcd9de1c0ac2226e0031c
 sha256=f62969cd61dc9718973708b79f5e86f653f630097f5ad14f90d78fcff677c0da
@@ -18950,6 +18990,10 @@ sha256=f62969cd61dc9718973708b79f5e86f653f630097f5ad14f90d78fcff677c0da
 md5=de15246c1f59665f3960015c49138da3
 sha256=73dff22a4622f2140b49ee824f1f69d6120135d828bc38f6877a619986c99245
 
+[ftp://ftp.osuosl.org/pub/mythtv/myththemes-0.22.tar.bz2]
+md5=a5f00f152fb430a20c70aaa3bf456347
+sha256=6720a16a0bdfb9bfb95bd729b50d95f75f8494b932a7dc44ad4014f06ecd36c2
+
 [ftp://ftp.osuosl.org/pub/mythtv/myththemes-0.22rc2.tar.bz2]
 md5=7d629aa8c0f1c8cdc11310b09a929626
 sha256=39494a9c05c47b9a28c6168211a5987a8386929a3210e637ed6191e3554ee9f6
@@ -18966,6 +19010,10 @@ sha256=777ff60afa89426f0e52e49b0e7a7661ddb45b59d2ebbfdcbe07fd179e526ff3
 md5=49fc135e1cde90cd935c1229467fa37e
 sha256=33a878a8fc3efdd74519b09b4ec3d16fa9d3a0436b321c13344e5f3ab723c5e4
 
+[ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.22.tar.bz2]
+md5=e8f8b5b6a51cd7be700e215b2a1bf2c0
+sha256=bb7212bac2cfc792c59a15a80caee8bbf469e250e6f48dc6b0856a60cb07b6fb
+
 [ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.22rc1.tar.bz2]
 md5=049e93d78d5370351539c9a23b47e1af
 sha256=8e6823f4b92d88c837735322ca71199919406a2826bddae257c6e0f52d089cd7
@@ -20762,6 +20810,10 @@ sha256=ed167dcbdf52c2563a30e7c81a0f2b3d79eb04acc5728e6d484166a4fe8a39e4
 md5=02078f4231baee4f0004212f2875df2b
 sha256=bc670682ed9b81d5d3859130c600601bd72053fd738b51b2daf8ddf3f4614a66
 
+[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.31.5.bz2]
+md5=6cac5e59d5562b591cdda485941204d5
+sha256=41e7d98a205d58a62901daf4e46ecf5fb0b177e5a233a3c0ad3250a3a0abe8aa
+
 [http://www.muru.com/linux/omap/patches/patch-2.6.9-omap1.bz2]
 md5=d6249654087f0bcafaa860ac573316a4
 sha256=91806347cb386002a8bfd20ee66e536e4a7dfb01f207dd751341f2971090d9ac
@@ -21730,6 +21782,10 @@ sha256=e6129f9239235981d329de40eeffa55041e6815a93aaa994d1eae242ea7446b5
 md5=4510364eeab219fd100bd1b373b1a002
 sha256=1e8ad5b7c5cf3485bd0738c296274ff2c99d26d12a25a225dc250eddea25b9f1
 
+[http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.19.tar.gz]
+md5=02adc2b99252675f0271db3b9edd432e
+sha256=e47e27083deb79571fb2b9215874ddc26d77c3dec2a7dc8de5ecec9058e4b806
+
 [http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.5.tar.gz]
 md5=99b5d9efd4fce35cabb4ae5d0ebb230d
 sha256=cd82eabcf9fa310a64b58b621730cebe5d3edae7596a9c121155db455b1e58f6
@@ -26278,6 +26334,14 @@ sha256=e95a45db65b33be472a3134492e348c4cd6edc200d02a85654ffe62bc2e6fdcd
 md5=6ce5a6e85653afdd10c48b89b4bcc8aa
 sha256=cef1e438a2f936efe00ffbb3758c80de72ed514f210e067cb8469a8b00b8feb4
 
+[http://ftp.linux-vserver.org/pub/utils/util-vserver/util-vserver-0.30.214.tar.bz2]
+md5=8bad879e36a6a1b9b4858d0d6d3c8c76
+sha256=c88a27ccd1593f4396e1cf4aca37c715c7618a77d709ad63c7cc744ca1557c45
+
+[http://ftp.linux-vserver.org/pub/utils/util-vserver/util-vserver-0.30.215.tar.bz2]
+md5=befd9b8e5311e87395b67ee381d83649
+sha256=40686ac0652b245fcbb34e52ac8d80ae6b4ea3f73150ebc1ce7c69660ccaa35e
+
 [ftp://ftp.gnu.org/pub/gnu/uucp/uucp-1.07.tar.gz]
 md5=64c54d43787339a7cced48390eb3e1d0
 sha256=060c15bfba6cfd1171ad81f782789032113e199a5aded8f8e0c1c5bd1385b62c
@@ -26390,6 +26454,10 @@ sha256=16971189b3cb95648b9574eb7c4c7cc0dff9978458aff7f3f7c54ab823ada721
 md5=7d11fcddb2bd30b9ecbdacfaa20f2769
 sha256=ebb1afbb0a61dd8f5f8ef13512e789697e98d5ad5f98739120f3b3cc02d46d8f
 
+[http://www.freesmartphone.org/sources/vala-0.7.8.1.tar.gz]
+md5=8c70abb3ef35523a0b8cf8685b327e11
+sha256=5c59e1fa363e876b5df7d9f5fccbac776c42bcd31bb04c4fde1d41d083538888
+
 [http://download.gnome.org/sources/vala/0.7/vala-0.7.8.tar.bz2]
 md5=accd0d350c6d6de7527a0a65c40f8be2
 sha256=b2daf636d95ef66ffd5132eacf18335073b71bfaa18f7ad06f25bcf9673aa747
@@ -27058,6 +27126,10 @@ sha256=e3f8a224af7a8df4defc2c0b3567e1a697486443a2e073fa56122c4a4e439d65
 md5=30a167577f657909b3355421e14e2ddb
 sha256=fd21224ec09ca5294ba0627433e4d2cb726d389c7818d162f152374e6d693342
 
+[http://downloads.sourceforge.net/libvncserver/x11vnc-0.9.8.tar.gz]
+md5=13e41380fe9ba2581db180061d1cbd22
+sha256=235549a5dad84c20c6d4aba920d95e3b98999b91ca5347bdde22fa0326818342
+
 [http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20090127-2245.tar.bz2]
 md5=25fcaa86a53333d416d5e837fb47ba7d
 sha256=18b38aff8e019f35bfee810831535685e69dcf91283e50bc62efa82e3a8dbc21
@@ -28146,6 +28218,10 @@ sha256=5988962199d5013274f6a6952939e4f405df658bb6616ebf9954c993b1179b1b
 md5=bc28fdedaee9059180e2534f9dbcd2f6
 sha256=e7c99ed66326df5fadf6e5d875859a430fec4369415a27cde72a91109f78bb9c
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-cirrus-1.3.2.tar.bz2]
+md5=8195d03ed0be0975c03441e66a9f53b3
+sha256=529a98a42c94ba5e1b9269e6f7b32a9e76cfd2d4728df08aeba615df8b28ca1a
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-cirrus-X11R7.0-1.0.0.5.tar.bz2]
 md5=7708693ad9d73cd76d4caef7c644a46f
 sha256=29e6fdd67e8ec51c534f6123f9935a165711255d935fb9cb28cd44f9db278b3e
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
new file mode 100644
index 0000000000..769ec7c4c7
--- /dev/null
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -0,0 +1,32 @@
+# Upgraded
+# use newer version then preferred by default
+PREFERRED_VERSION_dbus ?= "1.3.0"
+PREFERRED_VERSION_autoconf = "2.63"
+PREFERRED_VERSION_autoconf-native = "2.63"
+PREFERRED_VERSION_libmikmod ?= "3.2.0-beta2"
+PREFERRED_VERSION_mtd-utils-native ?= "1.2.0+git"
+PREFERRED_VERSION_strace ?= "4.5.15"
+
+# we need new headers for libc, now OLDEST_KERNEL_linux-gnueabi = "2.6.24"
+PREFERRED_VERSION_linux-libc-headers = "2.6.29"
+
+# upgrades used in Angstrom
+PREFERRED_VERSION_gtk+          = "2.18.3"
+PREFERRED_VERSION_hal           = "0.5.13"
+PREFERRED_VERSION_libtool       = "2.2.6a"
+PREFERRED_VERSION_libtool-native = "2.2.6a"
+PREFERRED_VERSION_libtool-cross = "2.2.6a"
+PREFERRED_VERSION_libtool-sdk   = "2.2.6a"
+PREFERRED_VERSION_udev          = "141"
+PREFERRED_VERSION_usbutils = "0.82"
+PREFERRED_VERSION_wpa-supplicant = "0.6.9"
+UDEV_GE_141 = "1"
+
+# Downgraded
+# python-pygtk_2.16.0 is accessing non-existent /usr/share/pygobject/2.0/codegen/codegen.py
+PREFERRED_VERSION_python-pygtk ?= "2.10.4"
+PREFERRED_VERSION_gpe-gallery ?= "0.97"
+PREFERRED_VERSION_boost ?= "1.33.1"
+PREFERRED_VERSION_man-pages ?= "2.41"
+PREFERRED_VERSION_xchat ?= "2.8.4"
+PREFERRED_VERSION_x11vnc ?= "0.9.3"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
index d3794834b9..6f891c47fd 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
@@ -99,7 +99,7 @@ PREFERRED_VERSION_xf86-video-ark ?= "0.7.0"
 PREFERRED_VERSION_xf86-video-ast ?= "0.85.0"
 PREFERRED_VERSION_xf86-video-ati ?= "6.9.0"
 PREFERRED_VERSION_xf86-video-chips ?= "1.2.0"
-PREFERRED_VERSION_xf86-video-cirrus ?= "1.2.1"
+PREFERRED_VERSION_xf86-video-cirrus ?= "1.3.2"
 PREFERRED_VERSION_xf86-video-dummy ?= "0.3.0"
 PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.0"
 PREFERRED_VERSION_xf86-video-geode ?= "2.11.4.1"
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index b86963ff29..e8cc25057d 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -16,6 +16,7 @@ SRCREV_pn-misc-vapi ?= "${FSO_CORNUCOPIA_SRCREV}"
 # FSO Projects -- Misc
 SRCREV_pn-dbus-hlid ?= "39e804f28808247df2573788cb99897d4d765e69"
 SRCREV_pn-frameworkd ?= "a2dfde0fb46a745f5c07e6a1ab44e4b95b7dde80"
+SRCREV_pn-frameworkd-config-shr_FSO_REV = ${SRCREV_pn-frameworkd}
 SRCREV_pn-fso-abyss ?= "8ce3c6e40c4852de7dcca502f65784f6b18ca6bf"
 SRCREV_pn-fso-term ?= "e0d92222e3e5a62025089c60a625f1836c510915"
 SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index b57ea4d673..06fdf4d12b 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -12,44 +12,74 @@
 # 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-scenarii-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-alsa-scenario ?= "8bd7f83d847424eb44704cf1649974b2fda8d8f1"
 SRCREV_pn-app-restarter ?= "4552"
 SRCREV_pn-assassin ?= "268"
 SRCREV_pn-assassin-thumbnail ?= "4690"
 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 ?= "3f4382138b71b0c31d6722604399e12a37bcebe8"
 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-clutter-gtk ?= "70f4b0cbd568dfa265484a03be3bd08ad15ed12e"
-SRCREV_pn-clutter ?= "3240"
 SRCREV_pn-comic-reader ?= "54"
 SRCREV_pn-contact ?= "1410"
 SRCREV_pn-dasher-gpe ?= "1251"
-SRCREV_pn-dbus-c++-native ?= "13131"
 SRCREV_pn-dbus-c++ ?= "13131"
+SRCREV_pn-dbus-c++-native ?= "13131"
 SRCREV_pn-dfu-util ?= "4160"
 SRCREV_pn-dfu-util-native ?= "4160"
 SRCREV_pn-diversity-daemon ?= "571"
 SRCREV_pn-diversity-radar ?= "453"
+SRCREV_pn-e-tasks ?= "14"
+SRCREV_pn-e-wm-config-illume-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-e-wm-illume-dict-pl ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-e-wm-menu-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-e-wm-sysactions-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-e-wm-theme-illume-gry ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-e-wm-theme-illume-neo ?= "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 ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-elementary-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-elementary-theme-niebiee ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-elementary-theme-sixteen ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-elf2flt ?= "1786"
+SRCREV_pn-elmdentica ?= "171"
 SRCREV_pn-enlazar ?= "37"
+SRCREV_pn-enotes ?= "19"
+SRCREV_pn-epdfview ?= "345"
+SRCREV_pn-epiphany ?= "7837"
 SRCREV_pn-essential-dialer ?= "194"
+SRCREV_pn-etk-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-etk-theme-ninja ?= "5"
+SRCREV_pn-etk-theme-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-ezx-boot-usb-native ?= "2371"
 SRCREV_pn-ezx-gen-blob ?= "2426"
 SRCREV_pn-ezxd ?= "2074"
-SRCREV_pn-elf2flt ?= "1786"
-SRCREV_pn-epiphany ?= "7837"
-SRCREV_pn-etk-theme-ninja ?= "5"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
+SRCREV_pn-ffalarms ?= "67"
 SRCREV_pn-flashrom ?= "3682"
+SRCREV_pn-frameworkd-config-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-frameworkd-config-shr_SHR_REV = ${SRCREV_pn-frameworkd-config-shr}
+SRCREV_pn-fsod ?= "2a33e5ffe96c611e6a6b8b6c33d2a83ba656f55b"
+SRCREV_pn-fsoraw ?= "20"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gabriel ?= "38"
 SRCREV_pn-gabriel-native ?= "38"
@@ -60,25 +90,47 @@ SRCREV_pn-gcc-cross-initial ?= ${GCCREV}
 SRCREV_pn-gcc-cross-intermediate ?= ${GCCREV}
 SRCREV_pn-gcc-cross-sdk ?= ${GCCREV}
 SRCREV_pn-gconf-dbus ?= "641"
+SRCREV_pn-glamo-dri-tests ?= "445f370be5bd76643efb65d8ff7414b133753cfa"
 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-gpe-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-gridpad ?= "194"
-SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
+SRCREV_pn-gtk-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
+SRCREV_pn-icon-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-illume-keyboard-arabic ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboard-browse ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboard-danish ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboard-default-alt ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboard-dutch ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboard-dvorak ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboard-french ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboard-german ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboard-hebrew ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboard-numeric-alt ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboard-russian ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboard-russian-terminal ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
 SRCREV_pn-illume-theme-asu ?= "4881"
 SRCREV_pn-illume-theme-freesmartphone ?= "b1b0f6adc59e6f72a3929771058e3750bf181bc5"
+SRCREV_pn-intone ?= "66"
+SRCREV_pn-intone-video ?= "9"
 SRCREV_pn-intuition ?= "194"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
+SRCREV_pn-libdrm ?= "89cc98c0d5c1b43a883f13210c472339dde1a4cf"
+SRCREV_pn-libdrm_om-gta02 ?= "67a3eb2188a38a5000af0ad4ac3a0eba43cab574"
 SRCREV_pn-libefso ?= "194"
 SRCREV_pn-libfakekey ?= "1455"
+SRCREV_pn-libframeworkd-phonegui ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
+SRCREV_pn-libframeworkd-phonegui-efl ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
+SRCREV_pn-libframeworkd-phonegui-efl-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f"
 SRCREV_pn-libgee ?= "0bddeeefb3bd5b003d77301705dbad181cddcaf6"
 SRCREV_pn-libgee-native ?= "0bddeeefb3bd5b003d77301705dbad181cddcaf6"
@@ -89,7 +141,11 @@ SRCREV_pn-libmokogsmd2 ?= "4334"
 SRCREV_pn-libmokojournal2 ?= "3473"
 SRCREV_pn-libmokopanelui2 ?= "4568"
 SRCREV_pn-libmokoui2 ?= "4342"
+SRCREV_pn-libnl2 ?= "dc273a12da9f0116e80fa81d63beb820e632dd17"
 SRCREV_pn-libowl ?= "277"
+SRCREV_pn-libphone-ui ?= "4455bce1643fcfba0538b17242f47935b869b159"
+SRCREV_pn-libphone-ui-shr ?= "29363d678d77182bde8c617ab7c56114150d6ff9"
+SRCREV_pn-libphone-utils ?= "f1377146556da8a68a84cf10a5f516c5f7b6015b"
 SRCREV_pn-librfid ?= "2094"
 SRCREV_pn-libsnmp-perl ?= "17367"
 SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb"
@@ -97,18 +153,21 @@ 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-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
 SRCREV_pn-linux-openmoko-2.6.28 ?= "8aa6cdde17381dd8865d10ba15ee62c092ec2ba5"
+SRCREV_pn-linux-openmoko-2.6.31 ?= "4331f6c95fadc37ea89359d6afb915be838790f9"
 SRCREV_pn-linux-openmoko-devel ?= "b9aa5bf345a0b802af0d10b6cf1079738fe4fd12"
-SRCREV_pn-linux-eten ?= "ab2d414f4f13816af0ec0401b608133ca946624a"
+SRCREV_pn-linux-openmoko-shr-devel ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5"
+SRCREV_pn-linux-openmoko-shr-drm-devel ?= "c848d00bd43c47e7f11724330380e0c68ec7ae5e"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-madbutterfly ?= "ecd1842714b5e982f3138cbdd358517d57be6aa3"
 SRCREV_pn-maemo-mapper ?= "118"
-SRCREV_pn-mamonaim_e_applet ?= "51c747849f71981bd1dc9eb1807df4993ad97d04"
 SRCREV_pn-mamona_input_methods ?= "7e6a8cc947689a045d0fba90015da599275347d9"
+SRCREV_pn-mamonaim_e_applet ?= "51c747849f71981bd1dc9eb1807df4993ad97d04"
 SRCREV_pn-matchbox-config-gtk ?= "1614"
 SRCREV_pn-matchbox-desktop-2 ?= "2096"
 SRCREV_pn-matchbox-keyboard ?= "1910"
@@ -118,13 +177,15 @@ 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-mesa-dri ?= "c02cd82b463661def7842f910dc561313559df80"
+SRCREV_pn-mesa-dri_om-gta02 ?= "a8a1c12262998e5fa3a857eebf857c6d3a95f85e"
 SRCREV_pn-midori ?= "400139644371c0b675723f9a986ddab4445a8794"
 SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
 SRCREV_pn-moko-gtk-engine ?= "4734"
 SRCREV_pn-mokoko ?= "127"
+SRCREV_pn-mokonnect ?= "110"
 SRCREV_pn-mpd-alsa ?= "6952"
 SRCREV_pn-mplayer-maemo ?= "342"
-SRCREV_pn-multicat ?= "f894801916cc4d0e912e4553490dc215276c52a9"
 SRCREV_pn-multitap-pad ?= "373"
 SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
 SRCREV_pn-navit ?= "1096"
@@ -132,15 +193,15 @@ SRCREV_pn-neod ?= "4617"
 SRCREV_pn-net-snmp ?= "17367"
 SRCREV_pn-netsurf ?= "3859"
 SRCREV_pn-numptyphysics ?= "109"
+SRCREV_pn-oh-puzzles ?= "22"
 SRCREV_pn-ohm ?= "edfe25d49d67884bf004de7ae0724c162bb5e65e"
 SRCREV_pn-om-locations ?= "942e88a1b689ffe3f11a2d982cce389cc965b2ec"
+SRCREV_pn-om-neon ?= "68"
 SRCREV_pn-om-settings ?= "74"
+SRCREV_pn-omgps ?= "109"
+SRCREV_pn-omoney ?= "29"
 SRCREV_pn-ompower ?= "4727"
-SRCREV_pn-oh-puzzles ?= "22"
-SRCREV_pn-osb-browser ?= "125"
-SRCREV_pn-osb-jscore ?= "117"
-SRCREV_pn-osb-nrcit ?= "125"
-SRCREV_pn-osb-nrcore ?= "126"
+SRCREV_pn-omview ?= "34"
 SRCREV_pn-openbsc ?= "d46299da00f923b24043aa37fa2bae17ffcc1ff7"
 SRCREV_pn-openezx-kernel ?= "43b844d1d38f0343272d3f0f844f80666186c526"
 SRCREV_pn-openmoko-agpsui ?= "7"
@@ -182,32 +243,43 @@ SRCREV_pn-openmoko-today2 ?= "4168"
 SRCREV_pn-openmoko-today2-folders ?= "3704"
 SRCREV_pn-openmoko-toolchain-scripts ?= "4913"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
+SRCREV_pn-openmoocow ?= "39648419825cddfea1cb1321e552a12b71fede14"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
+SRCREV_pn-opimd-utils ?= "0e7007fff120c8cc4c579c0c7e57883798e6d23e"
 SRCREV_pn-opkg ?= "240"
 SRCREV_pn-opkg-native ?= "240"
 SRCREV_pn-opkg-sdk ?= "240"
 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 ?= "9279b50ed72a94100d7f0f49090043134302f2eb"
+SRCREV_pn-phonefsod ?= "beb2fe989bfbf6b180a58d247db302082504fa01"
+SRCREV_pn-phoneui-apps ?= "c27e620302d0ea956da777f76a4aa217ae8366c6"
+SRCREV_pn-phoneuid ?= "19f40dcc6fdb442ea9f4d7521c60d68f4042977c"
 SRCREV_pn-portaudio-v19 ?= "1387"
 SRCREV_pn-psplash ?= "249"
 SRCREV_pn-pty-forward-native ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba"
 SRCREV_pn-pyefl-sudoku ?= "49"
 SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
+SRCREV_pn-pyphonelog ?= "0355bf623b31d695e53cc3cf77fb992e58b449a5"
+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-phoneutils ?= "f1377146556da8a68a84cf10a5f516c5f7b6015b"
 SRCREV_pn-python-pycrypto ?= "d087280d7e9643a3e3f68f209932119fe6738b3c"
 SRCREV_pn-python-pyyaml ?= "344"
 QEMUSRCREV ?= "4242"
-SRCREV_pn-tslib ?= "77"
+SRCREV_pn-qemu ?= "${QEMUSRCREV}"
 SRCREV_pn-qemu-native ?= "${QEMUSRCREV}"
 SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}"
-SRCREV_pn-qemu ?= "${QEMUSRCREV}"
 SRCREV_pn-qi ?= "3b8513d8b3d9615ebda605de4bda18371aa3f359"
 SRCREV_pn-remoko ?= "121"
 SRCREV_pn-remoko-server ?= "121"
@@ -215,6 +287,21 @@ SRCREV_pn-s3c24xx-gpio ?= "4949"
 SRCREV_pn-s3c64xx-gpio ?= "4949"
 SRCREV_pn-serial-forward ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba"
 SRCREV_pn-settings-daemon ?= "2006"
+SRCREV_pn-shr-config ?= "37dd7ac950e2bfd438801faf34c29fccfdbbaccf"
+SRCREV_pn-shr-installer ?= "f17fa104639113fb0d3212b6bba366c092854cde"
+SRCREV_pn-shr-launcher ?= "87"
+SRCREV_pn-shr-settings ?= "4177f9d7ef34e3be7796585ca8c94cc2dea3f253"
+SRCREV_pn-shr-specs ?= "a881cd133439737708d4d4d150500246ceff7c7d"
+SRCREV_pn-shr-splash ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
+SRCREV_pn-shr-splash-theme-dontpanic ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-shr-splash-theme-handy ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-shr-splash-theme-logo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-shr-splash-theme-niebiee ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-shr-splash-theme-simple ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-shr-splash-theme-tux ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-shr-theme ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
+SRCREV_pn-shr-theme-gtk-e17lookalike ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-shr-today ?= "7b69649a9df0e85f0c0f7985fd1d93543c3b11e2"
 SRCREV_pn-sjf2410-linux-native ?= "4268"
 SRCREV_pn-socketcan-modules ?= "917"
 SRCREV_pn-socketcan-utils-test ?= "917"
@@ -224,6 +311,7 @@ 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"
@@ -295,6 +383,7 @@ SRCREV_pn-elementary-alarm ?= "${EFL_SRCREV}"
 SRCREV_pn-elementary-sms ?= "${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}"
diff --git a/conf/distro/include/shr-autorev-unstable.inc b/conf/distro/include/shr-autorev-unstable.inc
deleted file mode 100644
index 5e7a0ddfa3..0000000000
--- a/conf/distro/include/shr-autorev-unstable.inc
+++ /dev/null
@@ -1,128 +0,0 @@
-
-# SHR - override revs for shr-unstable
-
-
-# KERNEL
-SRCREV_pn-linux-openmoko-shr-devel = "${AUTOREV}"
-
-PREFERRED_VERSION_vala-native = "0.7.4+0.7.5-fso2"
-
-
-# FSO stuff
-SRCREV_pn-dbus-hlid = "${AUTOREV}"
-SRCREV_pn-frameworkd = "${AUTOREV}"
-SRCREV_pn-frameworkd-config-shr = "${AUTOREV}"
-SRCREV_pn-frameworkd-config-shr_FSO_REV = "${AUTOREV}"
-SRCREV_pn-frameworkd-config-shr_SHR_REV = "${AUTOREV}"
-SRCREV_pn-fsod = "${AUTOREV}"
-SRCREV_pn-fsodeviced = "${AUTOREV}"
-SRCREV_pn-fsonetworkd = "${AUTOREV}"
-SRCREV_pn-fsousaged = "${AUTOREV}"
-SRCREV_pn-fsoraw = "${AUTOREV}"
-SRCREV_pn-fso-abyss = "${AUTOREV}"
-SRCREV_pn-fso-apm = "${AUTOREV}"
-SRCREV_pn-fso-term = "${AUTOREV}"
-SRCREV_pn-fso-gsm0710muxd = "${AUTOREV}"
-SRCREV_pn-fso-gpsd = "${AUTOREV}"
-SRCREV_pn-fso-monitord = "${AUTOREV}"
-SRCREV_pn-fso-sounds = "${AUTOREV}"
-SRCREV_pn-fso-specs = "${AUTOREV}"
-SRCREV_pn-fso-term = "${AUTOREV}"
-SRCREV_pn-gsmd2 = "${AUTOREV}"
-SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}"
-SRCREV_pn-libascenario = "${AUTOREV}"
-SRCREV_pn-libfsobasics = "${AUTOREV}"
-SRCREV_pn-libfsoframework = "${AUTOREV}"
-SRCREV_pn-libfsotransport = "${AUTOREV}"
-SRCREV_pn-libframeworkd-glib = "${AUTOREV}"
-SRCREV_pn-libfso-glib = "${AUTOREV}"
-SRCREV_pn-libgsm0710 = "${AUTOREV}"
-SRCREV_pn-libgsm0710mux = "${AUTOREV}"
-SRCREV_pn-mickeydbus = "${AUTOREV}"
-SRCREV_pn-mickeyterm = "${AUTOREV}"
-SRCREV_pn-misc-vapi = "${AUTOREV}"
-SRCREV_pn-python-pytrc = "${AUTOREV}"
-SRCREV_pn-vala-dbus-binding-tool-native = "6071da6ad645e1200eb2aee88d254ada348d361b"
-SRCREV_pn-vala = "${AUTOREV}"
-SRCREV_pn-zhone = "${AUTOREV}"
-
-
-# SHR stuff
-SRCREV_pn-libhito = "${AUTOREV}"
-SRCREV_pn-neod = "${AUTOREV}"
-SRCREV_pn-shr-settings = "${AUTOREV}"
-SRCREV_pn-ophonekitd = "${AUTOREV}"
-SRCREV_pn-ophonekitd-vala = "${AUTOREV}"
-SRCREV_pn-libmodulo = "${AUTOREV}"
-SRCREV_pn-shr-messages = "${AUTOREV}"
-SRCREV_pn-shr-contacts = "${AUTOREV}"
-SRCREV_pn-shr-dialer = "${AUTOREV}"
-SRCREV_pn-libframeworkd-phonegui     = "${AUTOREV}"
-SRCREV_pn-libframeworkd-phonegui-efl = "${AUTOREV}"
-SRCREV_pn-libframeworkd-phonegui-efl2 = "${AUTOREV}"
-SRCREV_pn-libframeworkd-phonegui-gtk = "${AUTOREV}"
-SRCREV_pn-libframeworkd-phonegui-gtk2 = "${AUTOREV}"
-SRCREV_pn-opimd-utils = "${AUTOREV}"
-SRCREV_pn-pyphonelog = "${AUTOREV}"
-SRCREV_pn-shr-theme = "${AUTOREV}"
-SRCREV_pn-shr-theme-brave = "${AUTOREV}"
-SRCREV_pn-shr-theme-gtk-e17lookalike = "${AUTOREV}"
-SRCREV_pn-shr-splash = "${AUTOREV}"
-SRCREV_pn-shr-splash-theme-simple = "${AUTOREV}"
-SRCREV_pn-shr-splash-theme-dontpanic = "${AUTOREV}"
-SRCREV_pn-shr-splash-theme-handy = "${AUTOREV}"
-SRCREV_pn-shr-splash-theme-dociswatchingyou = "${AUTOREV}"
-SRCREV_pn-shr-installer = "${AUTOREV}"
-SRCREV_pn-shr-config = "${AUTOREV}"
-SRCREV_pn-alsa-scenarii-shr = "${AUTOREV}"
-SRCREV_pn-libphone-utils = "${AUTOREV}"
-SRCREV_pn-python-phoneutils = "${AUTOREV}"
-
-
-# E17 stuff
-EFL_SRCREV = "41040"
-SRCREV_pn-python-elementary = "41040"
-SRCREV_pn-e-wm-config-illume-shr = "${AUTOREV}"
-SRCREV_pn-e-wm-sysactions-shr = "${AUTOREV}"
-SRCREV_pn-e-wm-theme-illume-shr = "${AUTOREV}"
-SRCREV_pn-e-wm-theme-illume-sixteen = "${AUTOREV}"
-SRCREV_pn-elementary-theme-sixteen = "${AUTOREV}"
-SRCREV_pn-e-wm-menu-shr = "${AUTOREV}"
-SRCREV_pn-e-wm-illume-dict-pl = "${AUTOREV}"
-SRCREV_pn-etk-theme-shr = "${AUTOREV}"
-SRCREV_pn-libeflvala = "${AUTOREV}"
-
-SRCREV_pn-illume-keyboard-german = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-arabic = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-browse = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-danish = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-default-alt = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-dutch = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-dvorak = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-french = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-hebrew = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-numeric-alt = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-russian-terminal = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-russian = "${AUTOREV}"
-
-# Other stuff
-SRCREV_pn-navit = "${AUTOREV}"
-SRCREV_pn-omview = "${AUTOREV}"
-SRCREV_pn-pythm = "${AUTOREV}"
-SRCREV_pn-omoney = "29"
-SRCREV_pn-enotes = "19"
-SRCREV_pn-ebrainy = "${AUTOREV}"
-SRCREV_pn-boost-signals2 = "52299"
-SRCREV_pn-dbus-c++-native = "${AUTOREV}"
-SRCREV_pn-dbus-c++ = "${AUTOREV}"
-SRCREV_pn-openmoocow = "${AUTOREV}"
-SRCREV_pn-libmokoui2 = "4695"
-SRCREV_pn-intone = "${AUTOREV}"
-SRCREV_pn-connman = "aac35324deb8c0b57f881338d87cb36b0979e7df"
-SRCREV_pn-msn-pecan = "${AUTOREV}"
-SRCREV_pn-omgps = "${AUTOREV}"
-SRCREV_pn-shr-launcher = "${AUTOREV}"
-SRCREV_pn-e-tasks = "${AUTOREV}"
-SRCREV_pn-mokonnect = "${AUTOREV}"
-SRCREV_pn-elmdentica = "${AUTOREV}"
-SRCREV_pn-vala-terminal = "${AUTOREV}"
diff --git a/conf/distro/include/shr-autorev.inc b/conf/distro/include/shr-autorev.inc
index 1605e8607a..78735fddce 100644
--- a/conf/distro/include/shr-autorev.inc
+++ b/conf/distro/include/shr-autorev.inc
@@ -1,140 +1,14 @@
-# SHR conf file
-
-# We need to override some machine stuff as well; include the machine-
-# specific file here (if it exists).
-#include conf/distro/include/shr-${MACHINE}.conf
-
-# Nail down some SRCREV's for the kernels.  There is a real potential problem
-# here, in that git hashes are hashes, not incrementing version numbers.  Thus
-# we need to have something else in the kernel version string that gets bumped
-# with each change.  So if you change one of these, go to the kernel recipe
-# and bump the OEV value up as well.
-SRCREV_pn-linux-eten = "df9715883efa3e6a88866813168fabb1c16b0b7a"
-SRCREV_pn-linux-openmoko-shr-devel = "2d158aae9d8d36f575504f59884ed8e80802efe2"
-
-# FSO stuff
-SRCREV_pn-dbus-hlid = "39e804f28808247df2573788cb99897d4d765e69"
-SRCREV_pn-frameworkd = "e96a204768744130859ab091162ec5c976854d49"
+# SHR autorev include
 SRCREV_pn-frameworkd-config-shr = "${AUTOREV}"
-SRCREV_pn-frameworkd-config-shr_FSO_REV = "e96a204768744130859ab091162ec5c976854d49"
+SRCREV_pn-frameworkd-config-shr_FSO_REV = "${AUTOREV}"
 SRCREV_pn-frameworkd-config-shr_SHR_REV = "${AUTOREV}"
-SRCREV_pn-fsod = "${AUTOREV}"
-SRCREV_pn-fsodeviced = "${AUTOREV}"
-SRCREV_pn-fsonetworkd = "${AUTOREV}"
-SRCREV_pn-fsousaged = "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7"
-SRCREV_pn-fsoraw = "${AUTOREV}"
-SRCREV_pn-fso-abyss = "ff68be1581069ca494a559e85f6299246888d3b5"
-SRCREV_pn-fso-apm = "${AUTOREV}"
-SRCREV_pn-fso-term = "${AUTOREV}"
-SRCREV_pn-fso-gsm0710muxd = "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
-SRCREV_pn-fso-gpsd = "78fe48dffb923175bde9f0aabc3500a9264a57e0"
-SRCREV_pn-fso-monitord = "${AUTOREV}"
-SRCREV_pn-fso-sounds = "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815"
-SRCREV_pn-fso-specs = "${AUTOREV}"
-SRCREV_pn-fso-term = "${AUTOREV}"
-SRCREV_pn-gsmd2 = "${AUTOREV}"
-SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}"
-SRCREV_pn-libascenario = "${AUTOREV}"
-SRCREV_pn-libfsobasics = "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7"
-SRCREV_pn-libfsoframework = "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7"
-SRCREV_pn-libfsotransport = "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7"
-SRCREV_pn-libframeworkd-glib = "680276e4cddabeb1edd088ddd421f363dd106a50"
-SRCREV_pn-libfso-glib = "9d292508739452b55b80ec40ec57405a5de2159f"
-SRCREV_pn-libgsm0710 = "3bb80ba6cc9f86ed3996f88bfa2986cc572489d6"
-SRCREV_pn-libgsm0710mux = "8e3e7533b286d8086bce8fa09bce23bb9f18bb98"
-SRCREV_pn-mickeydbus = "6d7f51b5189a00a07d9b88100a565f46fcb62644"
-SRCREV_pn-mickeyterm = "6d7f51b5189a00a07d9b88100a565f46fcb62644"
-SRCREV_pn-misc-vapi = "${AUTOREV}"
-SRCREV_pn-python-pytrc = "f15ff7c58946a2fd6ba767628b2fe5d6f46ff9bb"
-SRCREV_pn-vala-dbus-binding-tool-native = "6071da6ad645e1200eb2aee88d254ada348d361b"
-SRCREV_pn-vala = "${AUTOREV}"
-SRCREV_pn-zhone = "${AUTOREV}"
 
-
-# SHR stuff
-SHRREV = "c3d97171723d8e824cb5acf58b711aa78b3b82d9"
-
-SRCREV_pn-libhito = "${AUTOREV}"
-SRCREV_pn-neod = "${AUTOREV}"
-SRCREV_pn-shr-settings = "4e0fbe17e4fddd18b0455ec4d007ab3f1d19918e"
-SRCREV_pn-ophonekitd = "${SHRREV}"
-SRCREV_pn-ophonekitd-vala = "${AUTOREV}"
-SRCREV_pn-libmodulo = "${AUTOREV}"
-SRCREV_pn-shr-messages = "${SHRREV}"
-SRCREV_pn-shr-contacts = "${SHRREV}"
-SRCREV_pn-shr-dialer = "${SHRREV}"
-SRCREV_pn-libframeworkd-phonegui = "${SHRREV}"
-SRCREV_pn-libframeworkd-phonegui-efl = "${SHRREV}"
-SRCREV_pn-libframeworkd-phonegui-efl2 = "${AUTOREV}"
-SRCREV_pn-libframeworkd-phonegui-gtk = "${AUTOREV}"
-SRCREV_pn-libframeworkd-phonegui-gtk2 = "${AUTOREV}"
-SRCREV_pn-opimd-utils = "${AUTOREV}"
-SRCREV_pn-pyphonelog = "9da559f0242a32aa5d0b72c795f53d7d9ef8c973"
-SRCREV_pn-shr-theme = "${AUTOREV}"
-SRCREV_pn-shr-theme-brave = "${AUTOREV}"
-SRCREV_pn-shr-theme-gtk-e17lookalike = "${AUTOREV}"
-SRCREV_pn-shr-splash = "${AUTOREV}"
-SRCREV_pn-shr-splash-theme-simple = "${AUTOREV}"
-SRCREV_pn-shr-splash-theme-dontpanic = "${AUTOREV}"
-SRCREV_pn-shr-splash-theme-handy = "${AUTOREV}"
-SRCREV_pn-shr-splash-theme-niebiee = "${AUTOREV}"
-SRCREV_pn-shr-installer = "${AUTOREV}"
-SRCREV_pn-shr-config = "${AUTOREV}"
 SRCREV_pn-alsa-scenarii-shr = "${AUTOREV}"
+SRCREV_pn-shr-settings = "${AUTOREV}"
+SRCREV_pn-shr-specs = "${AUTOREV}"
+SRCREV_pn-phoneui-apps = "${AUTOREV}"
+SRCREV_pn-phoneuid = "${AUTOREV}"
+SRCREV_pn-phonefsod = "${AUTOREV}"
+SRCREV_pn-libphone-ui = "${AUTOREV}"
+SRCREV_pn-libphone-ui-shr = "${AUTOREV}"
 SRCREV_pn-libphone-utils = "${AUTOREV}"
-SRCREV_pn-python-phoneutils = "${AUTOREV}"
-
-
-# E17 stuff
-EFL_SRCREV = "41040"
-SRCREV_pn-python-elementary = "41040"
-SRCREV_pn-e-wm-config-illume-shr = "${AUTOREV}"
-SRCREV_pn-e-wm-sysactions-shr = "${AUTOREV}"
-SRCREV_pn-e-wm-theme-illume-shr = "${AUTOREV}"
-SRCREV_pn-e-wm-theme-illume-sixteen = "${AUTOREV}"
-SRCREV_pn-e-wm-theme-illume-niebiee = "${AUTOREV}"
-SRCREV_pn-elementary-theme-sixteen = "${AUTOREV}"
-SRCREV_pn-elementary-theme-niebiee = "${AUTOREV}"
-SRCREV_pn-e-wm-menu-shr = "${AUTOREV}"
-SRCREV_pn-e-wm-illume-dict-pl = "${AUTOREV}"
-SRCREV_pn-etk-theme-shr = "${AUTOREV}"
-SRCREV_pn-libeflvala = "${AUTOREV}"
-
-SRCREV_pn-illume-keyboard-german = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-arabic = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-browse = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-danish = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-default-alt = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-dutch = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-dvorak = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-french = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-hebrew = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-numeric-alt = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-russian-terminal = "${AUTOREV}"
-SRCREV_pn-illume-keyboard-russian = "${AUTOREV}"
-
-
-# Other stuff
-SRCREV_pn-bt-configure = "${AUTOREV}"
-SRCREV_pn-navit = "2309"
-SRCREV_pn-omview = "${AUTOREV}"
-SRCREV_pn-pythm = "${AUTOREV}"
-SRCREV_pn-omoney = "29"
-SRCREV_pn-enotes = "19"
-SRCREV_pn-ebrainy = "${AUTOREV}"
-SRCREV_pn-boost-signals2 = "52299"
-SRCREV_pn-dbus-c++-native = "${AUTOREV}"
-SRCREV_pn-dbus-c++ = "${AUTOREV}"
-SRCREV_pn-openmoocow = "${AUTOREV}"
-SRCREV_pn-libmokoui2 = "4695"
-SRCREV_pn-intone = "${AUTOREV}"
-SRCREV_pn-connman = "aac35324deb8c0b57f881338d87cb36b0979e7df"
-SRCREV_pn-msn-pecan = "${AUTOREV}"
-SRCREV_pn-omgps = "${AUTOREV}"
-SRCREV_pn-shr-today = "${AUTOREV}"
-SRCREV_pn-shr-launcher = "${AUTOREV}"
-SRCREV_pn-e-tasks = "${AUTOREV}"
-SRCREV_pn-mokonnect = "${AUTOREV}"
-SRCREV_pn-elmdentica = "${AUTOREV}"
-SRCREV_pn-vala-terminal = "${AUTOREV}"
-
diff --git a/conf/distro/iphone-compat.conf b/conf/distro/iphone-compat.conf
index 74edc0fb53..be2017b7c5 100644
--- a/conf/distro/iphone-compat.conf
+++ b/conf/distro/iphone-compat.conf
@@ -5,7 +5,7 @@ DISTRO_NAME = "iphone-compat"
 TARGET_OS = "darwin9"
 TARGET_VENDOR = "-apple"
 
-export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} -Wl,-L${STAGING_DIR_TARGET}${layout_libdir}"
+export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${libdir} -Wl,-L${STAGING_DIR_TARGET}${libdir}"
 
 # Compiler selection
 PREFERRED_PROVIDER_linux-libc-headers                       = "iphone-sdks"
diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf
index 43b00f7958..a1220ee592 100644
--- a/conf/distro/micro.conf
+++ b/conf/distro/micro.conf
@@ -97,8 +97,8 @@ ENABLE_BINARY_LOCALE_GENERATION = "0"
 PACKAGE_SNAP_LIB_SYMLINKS = "1"
 
 # Collapse /usr into /
-layout_prefix = ""
-layout_exec_prefix = ""
+prefix = ""
+exec_prefix = ""
 
 # Don't install ldconfig and associated gubbins
 USE_LDCONFIG = "0"
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index ecf6649fab..33eceab456 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -126,7 +126,7 @@ DISTRO_EXTRA_RDEPENDS += "\
   ${DISTRO_EXTRA_APPS} \
 "
 
-# Additional content II (can be masked with BAD_RECOMMENDS)
+# Additional content II (can be masked with BAD_RECOMMENDATIONS)
 DISTRO_EXTRA_RRECOMMENDS += " \
     kernel-module-vfat \
     kernel-module-ext2 \
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index bd3b93ec17..2ef04872fb 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -21,7 +21,7 @@ OEINCLUDELOGS = "yes"
 KERNEL_CONSOLE = "tty1"
 # prebuilt toolchain doesn't know about -isystem
 export BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
-export TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}/${layout_includedir}"
+export TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}/${includedir}"
 #DEBUG_OPTIMIZATION = "-O -g3"
 #DEBUG_BUILD = "1"
 
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
new file mode 100644
index 0000000000..e45fc07334
--- /dev/null
+++ b/conf/distro/shr.conf
@@ -0,0 +1,97 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: SHR
+#@DESCRIPTION: Linux Distribution Configuration for Mobile Phones
+#-----------------------------------------------------------------------------
+
+# set default locale for images - we have to do that before
+# including angstrom-2007-for-openmoko.inc because otherwise
+# it will be already set to en-gb
+IMAGE_LINGUAS ?= "en-us"
+
+# Set the toolchain type (internal, external) and brand (generic, csl etc.)
+TOOLCHAIN_TYPE ?= "internal"
+TOOLCHAIN_BRAND ?= ""
+
+#LIBC = "glibc"
+
+require conf/distro/include/preferred-xorg-versions-X11R7.5.inc
+require conf/distro/include/preferred-shr-versions.inc
+require conf/distro/include/shr-autorev.inc
+
+include conf/distro/minimal.conf
+
+#
+# Header
+#
+DISTRO_NAME = "shr"
+DISTRO_VERSION = "-${DATE}"
+DISTRO_REVISION = "2"
+DISTRO_PR = ".4"
+#DISTRO_TYPE = "release"
+DISTRO_TYPE = "debug"
+DISTRO = "shr"
+
+#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
+PREFERRED_PROVIDER_qemu-native = "qemu-native"
+ENABLE_BINARY_LOCALE_GENERATION ?= "1"
+
+# We only want to build UTF8 locales
+LOCALE_UTF8_ONLY = "1"
+
+INHERIT += "testlab"
+
+CVS_TARBALL_STASH += "http://build.shr-project.org/sources/"
+
+PREMIRRORS = "(ftp|https?)$://.*/.* http://build.shr-project.org/sources/"
+
+DISTRO_FEED_PREFIX ?= "shr-dev"
+DISTRO_FEED_URI ?= "http://build.shr-project.org/shr-testing/ipk"
+
+AB_DEPLOY_EXTRA ?= ""
+DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE_ARCH}/${AB_DEPLOY_EXTRA}"
+
+IMAGE_INITSCRIPTS = "initscripts-shr"
+DISTRO_INITSCRIPTS = "initscripts-shr"
+DISTRO_DEV_MANAGER = "udev"
+
+IPKG_VARIANT = "opkg"
+
+# Same kernel so same usb
+PACKAGE_ARCH_pn-usb-gadget-mode_om-gta01 = "armv4t"
+PACKAGE_ARCH_pn-usb-gadget-mode_om-gta02 = "armv4t"
+# same kernel so same keymaps
+PACKAGE_ARCH_pn-keymaps_om-gta01 = "armv4t"
+PACKAGE_ARCH_pn-keymaps_om-gta02 = "armv4t"
+# neod knows about both machines
+PACKAGE_ARCH_pn-neod_om-gta01 = "armv4t"
+PACKAGE_ARCH_pn-neod_om-gta02 = "armv4t"
+
+PREFERRED_PROVIDER_gconf = "gconf"
+PREFERRED_PROVIDER_virtual/shr-splash-theme = "shr-splash-theme-logo"
+PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr"
+PREFERRED_PROVIDER_gpsd = "fso-gpsd"
+PREFERRED_PROVIDER_e-wm-menu = "e-wm-menu-shr"
+PREFERRED_PROVIDER_openmoko-alsa-scenarios = "alsa-scenarii-shr"
+PREFERRED_PROVIDER_virtual/alsa-scenarios = "alsa-scenarii-shr"
+PREFERRED_PROVIDER_libfribidi = "fribidi"
+PREFERRED_PROVIDER_bluez-libs = "bluez4"
+PREFERRED_PROVIDER_bluez-utils = "bluez4"
+PREFERRED_PROVIDER_classpath = "classpath"
+PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
+PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
+PREFERRED_PROVIDER_virtual/gail = "gtk+"
+PREFERRED_PROVIDER_opkg = "opkg"
+PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
+PREFERRED_PROVIDER_atd = "atd-over-fso"
+
+# Helper to say what image we built
+SHR_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/shr-version"
+ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${SHR_VERSION_FILE};cd $OLD_PWD;"
+ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo VERSION: `git-log -n1 --pretty=oneline|awk '{print $1}'` >> ${SHR_VERSION_FILE}; cd $OLD_PWD;"
+ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Branch: ` git branch |awk '/*/{print $2}'` >> ${SHR_VERSION_FILE}; cd $OLD_PWD;"
+ROOTFS_POSTPROCESS_COMMAND += "echo Build Host: `cat /etc/hostname` >> ${SHR_VERSION_FILE};"
+ROOTFS_POSTPROCESS_COMMAND += "echo Time Stamp: `date -R` >> ${SHR_VERSION_FILE};"
+
+#Package customization
+EXTRA_OECONF-pn_qemu += " --target-list=arm-linux-user,arm-softmmu"
diff --git a/conf/machine/geodegx.conf b/conf/machine/geodegx.conf
index a9cf5773ee..0ec6782076 100644
--- a/conf/machine/geodegx.conf
+++ b/conf/machine/geodegx.conf
@@ -2,18 +2,16 @@
 # Copyright (C) 2005, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
 
-TARGET_ARCH =  "i586"
+TARGET_ARCH =  "i486"
 
 require conf/machine/include/tune-geode.inc
 
-PREFERRED_PROVIDER_virtual/kernel = "linux"
-MACHINE_EXTRA_RDEPENDS = "kernel grub"
-MACHINE_FEATURES = "kernel26 pci ext2 x86"
-MACHINE_KERNEL_VERSION = "2.6"
+PREFERRED_PROVIDER_virtual/kernel = "linux-geodegx"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
 
 udevdir = "/dev"
 
 KERNEL_IMAGETYPE = "bzImage"
 
 GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=i586"
+GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=geode"
diff --git a/conf/machine/geodelx.conf b/conf/machine/geodelx.conf
index 7316f2d747..f8874fd966 100644
--- a/conf/machine/geodelx.conf
+++ b/conf/machine/geodelx.conf
@@ -2,7 +2,7 @@
 # Copyright (C) 2005, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
 
-TARGET_ARCH =  "i586"
+TARGET_ARCH =  "i486"
 
 require conf/machine/include/tune-geode.inc
 
@@ -11,5 +11,5 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-geodelx"
 KERNEL_IMAGETYPE = "bzImage"
 
 GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=i586"
+GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=geode"
 SELECTED_OPTIMIZATION_pn-glibc := "${@'${SELECTED_OPTIMIZATION}'.replace('-fomit-frame-pointer', '')}"
diff --git a/conf/machine/iei-nanogx-466.conf b/conf/machine/iei-nanogx-466.conf
new file mode 100644
index 0000000000..3bab3070c6
--- /dev/null
+++ b/conf/machine/iei-nanogx-466.conf
@@ -0,0 +1,30 @@
+# Copyright (C) 2009, Petr Stetiar
+# Released under the MIT license (see packages/COPYING)
+#@TYPE: Machine
+#@NAME: IEI Nano GX-466
+#@DESCRIPTION: Machine configuration for IEI Nano GX-466 - http://bit.ly/t9TOj
+
+TARGET_ARCH =  "i586"
+
+require conf/machine/include/tune-geode.inc
+
+MACHINE_FEATURES = "kernel26 pci vfat ext2 keyboard usbhost sound touchscreen screen serial ethernet"
+
+KERNEL_IMAGETYPE = "bzImage"
+IMAGE_FSTYPES ?= "ext2 tar.bz2"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-input-tslib \
+           xf86-video-geode \
+           xerver-xorg-module-libint10 \
+           xserver-xorg-module-xaa \
+           xf86-input-keyboard"
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=i586"
diff --git a/conf/sanity.conf b/conf/sanity.conf
index 7112324132..0f53cb2e04 100644
--- a/conf/sanity.conf
+++ b/conf/sanity.conf
@@ -3,7 +3,7 @@
 # See sanity.bbclass
 #
 # Expert users can confirm their sanity with "touch conf/sanity.conf"
-BB_MIN_VERSION = "1.8.12"
+BB_MIN_VERSION = "1.8.18"
 
 SANITY_ABIFILE = "${TMPDIR}/abi_version"
 SANITY_PRFILE = "${TMPDIR}/distro_pr"