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

6 files changed, 102 insertions, 14 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 0aba3f28a8..6588dd4234 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1330,6 +1330,10 @@ sha256=9fd529867402456bd826fe0e5588d35b3a2e27e586a2fd838d1352b71c2ed73f
 md5=593aa8001e5c301cdcdb4bb3b63abc33
 sha256=a54967c188cda3e20f496c83be4de3f1740eeaa83c0380712ecd969ad8766826
 
+[http://www.angstrom-distribution.org/unstable/sources/XML-Twig-3.33-upstream-keeps-changing-this-tarball-so-we-mirror-our-own.tar.gz]
+md5=918f8fba33efe9cf5bc07907c6e46556
+sha256=630241ba64685a264d6037cbfed29476ab36fce652746ad5966fcfc9d810abdc
+
 [http://xmltwig.com/xmltwig/XML-Twig-3.33.tar.gz]
 md5=495fd8c320f67a0c8e0b90ccb060f0ea
 sha256=d87ff8c2e1d594808a58373ea72aa6f6e42a9a19d550a569b3f5fd22b53efebd
@@ -1974,6 +1978,10 @@ sha256=1828cbd348d1418287b29337e1047cfc3d6c092e18691cd9c6dfc2d6535bcebd
 md5=cebfeb99c4a7c2a6cee2564770415fe7
 sha256=c1df9737e208a96a61fa92ddad83f4b4d9be66f8992f3c917e9edf4b05ff5898
 
+[http://mesh.dl.sourceforge.net/project/asciidoc/asciidoc/8.5.1/asciidoc-8.5.1.tar.gz]
+md5=412fb0c86c3dcb4cc159ef63bd274c90
+sha256=ccb02db04e6e6eff2149435516e88557ca30c85bc4467420f40c895e25f17a20
+
 [http://downloads.sourceforge.net/asio/asio-1.1.1.tar.bz2]
 md5=3e6bcedc549cb4c014227f882969db5c
 sha256=f6277da4651bceaeab442f864b735a5d7b0998d55f9209e37cf18f7464320e3e
@@ -5170,6 +5178,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
@@ -6758,6 +6770,10 @@ sha256=d68b5988907e06cc37793489589f5545487a9b1bbe6444b7e2e16450bd1cb9ae
 md5=0b6ccb1e50d96b7127a18a69399fcf05
 sha256=b2b0a231aae105090948521a469c5019eb886f0562fa3315a49cebaf74f61be4
 
+[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.5.5/source/firefox-3.5.5.source.tar.bz2]
+md5=b3d92dfb40584141dc1068efc9bdfccc
+sha256=2abe7b5561267c230df27951d1d8c6c5853d06ca2426997fdf0a63c5db689feb
+
 [http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/3.5b4-candidates/build1/source/firefox-3.5b4-source.tar.bz2]
 md5=ff6bf463300cb56bcf750973b2af3d80
 sha256=b653f2fa8dfdd0a54a6b8c576769719cf9014ca6b09f8e9d351721a51766d95d
@@ -10602,6 +10618,10 @@ sha256=d864fbd0bf6dea24e4f71736da9902a1cae86d0a1a893b5fe17118927257ec3e
 md5=cd3f3eb54446be6003156158d51f4884
 sha256=4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b
 
+[http://grun.googlecode.com/files/grun-0.9.3.tar.gz]
+md5=7788783e5a18221ae591606075d3a8ee
+sha256=c484d80e4636a69c6ad6491a4769f555be20595e67cb4bfd34c3c91e501b95dd
+
 [ftp://ftp.gnu.org/gnu/gsl/gsl-1.10.tar.gz]
 md5=d67be4f2e5560d6cf907e18a428becdc
 sha256=ea3968b58bfc7619f47bf5ff64a7198a38c72419d24b844e71e48823a4776ff0
@@ -11518,6 +11538,10 @@ sha256=cae6ed86296d01be98ee3be0c224c4323eee508941a7f162a0366d56655afe06
 md5=0524dd10ad986285ff4eeb3507f7471c
 sha256=689a413119c4d670ed95b9ac24511655c4805db678ad93866ab1036a0ba4d6bf
 
+[ftp://ftp.gnu.org/gnu/help2man/help2man-1.36.4.tar.gz]
+md5=d31a0a38c2ec71faa06723f6b8bd3076
+sha256=a4adadf76b496a6bc50795702253ecfcb6f0d159b68038f31a5362009340bca2
+
 [http://handhelds.org/~zecke/oe_packages/hexatrolic-103beta3-zecke1.tar.bz2]
 md5=1d9420e8b5a6d5fa491c458ffafd4adb
 sha256=b60a5358e56e676529e7d3d655d5107a76b9a2434e38952711fea794f65721ce
@@ -16950,10 +16974,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
@@ -18930,6 +18950,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
@@ -18946,6 +18970,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
@@ -19022,6 +19050,10 @@ sha256=86c8839ad5c8a1c5674eb3617bbe15e9c9bb2358a7435a0e2d22cd25ab7718ff
 md5=14d9464043848eddd0bd0d35bbe63415
 sha256=3761b27da474b71194ff900e7941c005be608a00fe0ba1f216390ce1ba9cba72
 
+[http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.28/nautilus-2.28.1.tar.bz2]
+md5=e759af11a0844828e2b484ff42ee0498
+sha256=197147d04529ee14e63609fa4755c9effff19842f77594ff8cce6e2433d0bec0
+
 [http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.6/nautilus-2.6.1.tar.bz2]
 md5=50c5732c0c9736b7026bce1c6b0007dc
 sha256=83f1d6623e142af30a9b3fa9135ecf973fbb8c89f1dc36a218de0c0fef6ddf07
@@ -20738,6 +20770,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
@@ -21706,6 +21742,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
@@ -25234,6 +25274,10 @@ sha256=6c3b8fa619749cbb28ca0f8847e56773d13e0bb92f1ea34287420950373640c2
 md5=59c92b223f69cc7e50ae6cd9d1539db1
 sha256=38f24694983f20e5bffa2ebc1d35a7c3abea50479a6df6449cc900bf2732891d
 
+[http://download.savannah.gnu.org/releases/texi2html/texi2html-1.82.tar.bz2]
+md5=a8a9193c0ac1bec2f3ca7be40a5a82eb
+sha256=d69c1effc416896409003ea64fdb21152cc0a9a7c665d437a0a3bef9b588b4f1
+
 [ftp://ftp.gnu.org/gnu/texinfo/texinfo-4.8a.tar.bz2]
 md5=0f429f87de9f20d6c0d952e63bf8e3fa
 sha256=efcda677be7ef093757d965736dff3b5af8c9fd36b3e7d3db09289a4a1d5d013
@@ -26250,6 +26294,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
@@ -26362,6 +26414,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
@@ -28122,6 +28178,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/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..e258b0551e 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.16"
 
 SANITY_ABIFILE = "${TMPDIR}/abi_version"
 SANITY_PRFILE = "${TMPDIR}/distro_pr"