Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

11 files changed, 183 insertions, 77 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 96e7799d2a..e74b63e23e 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.
@@ -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..d646dbe938 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
@@ -5178,6 +5186,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
@@ -11854,6 +11866,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
@@ -16970,10 +16990,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 +18958,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 +18970,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 +18990,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 +20790,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 +21762,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 +26314,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 +26434,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 +27106,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 +28198,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-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.inc b/conf/distro/include/sane-srcrevs.inc
index b57ea4d673..ca88ae564d 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -89,6 +89,7 @@ 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-librfid ?= "2094"
 SRCREV_pn-libsnmp-perl ?= "17367"
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/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/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"