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

3 files changed, 56 insertions, 3 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 0eba0c8847..1ea968e2da 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -150,10 +150,22 @@ sha256=dde5d254cd00e4182680b1241e9a5feebbc9b4887f5d0bac2ba2935f213c97e7
 md5=dac0f6c217437819f620da18a97d505f
 sha256=ec9ba2f4ac57fea244639d3ddcdcb0307a4130b250a2b7f3b3ef416aaa5cdb53
 
+[http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.010.tar.gz]
+md5=a63c9f73afef70b6c80d899424b003e9
+sha256=7068295a5e35ed7dcf20446bee6d80a8de8ba7af5eb5fa35c0b60135c3445c2f
+
+[http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/DBI-1.607.tar.gz]
+md5=bd5785b39675213948a61dea1b400012
+sha256=7090a1e6a0d13be2f7e27a724351c61e44ffa5d165a7720bfe505aa2c4d47e14
+
 [http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Data-OptList-0.101.tar.gz]
 md5=6e9bb994a8716112a78c1306261f4164
 sha256=a96fb122261fb5f069341d7e69dcf07a2988da7cfd8df65d50843b8b102fb55c
 
+[http://search.cpan.org/CPAN/authors/id/S/SB/SBECK/Date-Manip-5.54.tar.gz]
+md5=16c343329bad644b17f4f8ec5fb243cf
+sha256=b61f4f0e3e580723ca7f5c0e1952922c101875535bff04afd772fbd3f193e22a
+
 [http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Devel-StackTrace-1.13.tar.gz]
 md5=35d85c3f2c91c1de389b13436659551a
 sha256=fe044ec9817a31f2b76f701b2cfd980809676943a901ba3d49200162807fa1f9
@@ -214,6 +226,10 @@ sha256=4c780b9e2906944ce02a9325b15f480d2bd4c0b12137f752aa4800c0f8563acf
 md5=3bf4d8d285591a5b7f31170f9b87aba0
 sha256=c196988f55fc6633d9f9f6d9ddc2ae9b4dfa1f300edf4cbbad865c06a8656df7
 
+[http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Email-Date-Format-1.002.tar.gz]
+md5=7ae25275da6ab272aa8b40141eac9f82
+sha256=0c7f3636dffa5ff151f6906baa17582c2efeb29109750f40f820fe5d2dc38e84
+
 [http://divmod.org/trac/attachment/wiki/SoftwareReleases/Epsilon-0.5.11.tar.gz?format=raw]
 md5=39710dfdeb42e51c953b17b6cded163e
 sha256=a5907a3b7584d63be30b3f79b0422b2b0778e73c053be9ac5a11004f1c9097dc
@@ -294,6 +310,14 @@ sha256=5673927f18790511f2a01004a51110e167f7950e7accf9e1bc6832a4bfed4feb
 md5=c09f77e2af500b51d22e0238c0534994
 sha256=01c75ebc523b77b88d5754fa93a283eeff77bcf799536db8697b61daf42f36bd
 
+[http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTML-Parser-3.60.tar.gz]
+md5=fb97ea7e5bd832b079d8660732f9d8d9
+sha256=0f1365a546e8c54faf5e17c5d011d0b9db8784568fb6b03522ab558ad39d9a63
+
+[http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/HTML-Tagset-3.20.tar.gz]
+md5=d2bfa18fe1904df7f683e96611e87437
+sha256=adb17dac9e36cd011f5243881c9739417fd102fce760f8de4e9be4c7131108e2
+
 [http://gallium.prg.dtu.dk/HVSC/random/HVSC_45-all-of-them.rar]
 md5=5394dac412dbe34d2dfe63cb91bdce8d
 sha256=6068499eeb3aad19d2f860390c65496cf38c5f5e5b54422db6ec2f67abbb8d10
@@ -406,6 +430,10 @@ sha256=ab8fdcfdbb6c74ecef4cfaf9e83f955aa422e43f8cd8683c1f2648c70070b88c
 md5=a7bda690ec0ad0bed457fa525e28034a
 sha256=ffac9cd4a6fbc59618bf4e79c389a927491a81b448528278e010a190e2483544
 
+[http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/MIME-Lite-3.024.tar.gz]
+md5=ca71d1d844f5c4f693e5079a2b4fa9a5
+sha256=886b57c7d8d9903b54dad07b68f58e398745d6d92522e89e2ce714472c09f903
+
 [http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2]
 md5=18c05d88e22c3b815a43ca8d7152ccdc
 sha256=8dd9dd61a0fe56904f5b76ddedb99bd359abaaf486e0b83b45e3357fecc81063
@@ -498,6 +526,10 @@ sha256=a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2
 md5=598bb59b86c2c4842eeffb03392fab5b
 sha256=8fd609d1e6b460b5c95ad5612cb823aa863d51360ed55caea987909a9bab50f5
 
+[http://search.cpan.org/CPAN/authors/id/K/KA/KANE/Module-Load-0.16.tar.gz]
+md5=851a225e31621a66621f28a25ec53d9a
+sha256=f05c3300c988dc5f5f02d55f8ee241c05fbf4565c512f804f47c6e72e5f69e33
+
 [http://downloads.sourceforge.net/mysql-python/MySQL-python-1.2.1_p2.tar.gz]
 md5=e6b9ea21fd91cb4a5663304da727bb70
 sha256=59f44cd53cfa1189dcaa5bf2c48662d5765f347b03827feb807f4cd0ef18943e
@@ -570,6 +602,10 @@ sha256=987eeb9460185950e066e5db3b5fa531e53e213742b545288405552a5a7bb704
 md5=87f56e79ae0c20397f4207d61d154303
 sha256=987eeb9460185950e066e5db3b5fa531e53e213742b545288405552a5a7bb704
 
+[http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/PHP-Serialization-0.30.tar.gz]
+md5=210b764fca7c791f4387717185f589b5
+sha256=09917ebe3b088649f0767723a7e25ae08fb8db921a85183e2e8c3d2e79ae6d10
+
 [http://www.packagekit.org/releases/PackageKit-0.2.4.tar.gz]
 md5=87bf41fd021077c93549d47de6d5fe07
 sha256=3b1a6f451928ca7e36d25e6e5a2e3dec2adae11c20770406f8bdc484f38b1600
@@ -978,6 +1014,10 @@ sha256=3d92318dadef22b1d1b062925ef66bac2ad48a0fd4fc83b88dcabba38c182b7b
 md5=61eed8ed819688663e399b5e79ed006f
 sha256=6a19418a074a7dec6fd67f00df74f3335e85eb38d2d2a17bd0e91cf8010537e3
 
+[http://search.cpan.org/CPAN/authors/id/R/RO/ROBF/X10-0.03.tar.gz]
+md5=056b3d98fab545865148b948de6784c7
+sha256=2b34d7c2112e8b79856c63f43403bff1a7ed5005d9b98db5f94c6f4cc7ba5623
+
 [ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-1.tgz]
 md5=4f241a4f867363f40efa2b00dca292af
 sha256=5276b045e154948fce7abba7d686406c65862d90b43b50f2546b33e38378f0d7
@@ -1042,6 +1082,10 @@ sha256=f274a4bc969ae192994a856b7f786c6fce96bae77f96c1c2b71dd97599e06e43
 md5=4be042a043ec520074b0ab6f7ca0bded
 sha256=fa668e8f01fe43fdddb33f0c5e294698818f37519000b9f782f504ece071c740
 
+[http://www2.zoneminder.com/downloads/ZoneMinder-1.23.3.tar.gz]
+md5=ee803f0f71d6e67adf602c3557fb6bc9
+sha256=76cba999bf602b1d561921cfcbbf7a9eab64370f349a0b389efff75f4b0c3af2
+
 [http://zope.org/Products/Zope/2.7.1/Zope-2.7.1.tgz]
 md5=ae9d4bb3f7220dfffb6e91b42503b16c
 sha256=341f56aa4ece9001a118be8ff9675bfad6410dc1df86dd86aeb726adc732341b
@@ -17914,6 +17958,10 @@ sha256=1fe008b728923f25d3c8ebd7f28cc538aa0814f3b090df817e25c266fcaecf6a
 md5=e65d9245d706350b3db811280d897f30
 sha256=3eecd66deecc2de5c31bb91a4b4479232087e80da94e3086e2a686879374cde9
 
+[http://pypi.python.org/packages/source/p/pyflakes/pyflakes-0.3.0.tar.gz]
+md5=ec7eee3444214bda18e57b82175e1da7
+sha256=019b6d4b549306d013974678872aaf2453af3f02760175504dbe8a9f89db0a2c
+
 [http://pyftpdlib.googlecode.com/files/pyftpdlib-0.5.1.tar.gz]
 md5=f64ac67ebec1d8ab47c0766082617384
 sha256=6daed9475412eaab232e021ed76568c6520dacd75c58da406454139bef95c393
@@ -19070,6 +19118,10 @@ sha256=22647c6bdd0f1b311bd0e3a893fb184f07d0f5e1c4b3bccd20a024fe18fd7567
 md5=528677f261f3ed4a58f9483ca25ba6b2
 sha256=4f2bb8c5785c50ad05d3adc0027c0881211b8a5c51e840651b53b7e455c004a3
 
+[http://samba.org/samba/ftp/stable/samba-3.2.8.tar.gz]
+md5=06efd6e6cc4aac628a1a0b082e4be0f2
+sha256=7e7fb53d6ff05993dcb8b871e3c3016bd4d161d72ded8f8760a4439e9d76aa3b
+
 [http://samba.org/samba/ftp/stable/samba-3.3.0.tar.gz]
 md5=adb048dc3988055533e1ea5d91d81f99
 sha256=b00ca360e9b414744eff33ca4567f3eb1a28d32914e20f00b6672fbc141c9beb
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index ecc3d0917e..e72549e58c 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -57,7 +57,7 @@ SRCREV_pn-flashrom ?= "3682"
 SRCREV_pn-frameworkd ?= "700ab8250582767628165b7cf6f671ef756ba56d"
 SRCREV_pn-frameworkd-devel ?= "${SRCREV_pn-frameworkd}"
 SRCREV_pn-fsod ?= "3fa5eb6f2edcf7c9f0fc2027fda47b91d9f0f136"
-SRCREV_pn-fso-abyss ?= "4afeacb21c3d4193289e2b7db549a91751d75195"
+SRCREV_pn-fso-abyss ?= "30817edd8767bb9405f56cad72b3420670975128"
 SRCREV_pn-fso-apm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa"
 SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0"
 SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
@@ -84,6 +84,7 @@ SRCREV_pn-libexalt-dbus ?= "76"
 SRCREV_pn-libfakekey ?= "1455"
 SRCREV_pn-libframeworkd-glib ?= "703017c8f874a325d917931378071c614597110e"
 SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f"
+SRCREV_pn-libgsm0710 ?= "a05704a56003dc02dca784cef4176e97eaf9f688"
 SRCREV_pn-libgsmd ?= "4505"
 SRCREV_pn-libiac ?= "1590"
 SRCREV_pn-libjana ?= "713"
@@ -229,7 +230,7 @@ SRCREV_pn-uclibc-initial ?= "24279"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
 SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b"
-SRCREV_pn-webkit-gtk ?= "39964"
+SRCREV_pn-webkit-gtk ?= "40814"
 SRCREV_pn-webkit-qt ?= "28656"
 SRCREV_pn-webkit-qtopia ?= "28656"
 SRCREV_pn-wlan-ng-modules ?= "1859"
diff --git a/conf/machine/include/kexecboot.inc b/conf/machine/include/kexecboot.inc
index c8656bb117..1835af4727 100644
--- a/conf/machine/include/kexecboot.inc
+++ b/conf/machine/include/kexecboot.inc
@@ -13,4 +13,4 @@ RDEPENDS_kernel-base = "kernel-image"
 # we store kernel images in rootfs and only a minimal initramfs kernel in mtd1 for booting other kernels
 DONT_CHECK_KERNELSIZE ?= "1"
 
-MACHINE_EXTRA_RRECOMMENDS_append = " kexecboot-cfg"
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg"