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

2 files changed, 32 insertions, 4 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 3617415c15..cc93b8957c 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1322,6 +1322,10 @@ sha256=3b732ed179dd34c17d1ba17867b60a36f20d82a3f0eca7b084fcb5396aa2b30c
 md5=84d9e0001fe01c14867256c3fe115899
 sha256=55386de7bf78f67ad2b9ef664a578db66ee53f512a28eb067cd2303f5e23d740
 
+[http://www.cpan.org/modules/by-module/XML/XML-Parser-2.36.tar.gz]
+md5=1b868962b658bd87e1563ecd56498ded
+sha256=9fd529867402456bd826fe0e5588d35b3a2e27e586a2fd838d1352b71c2ed73f
+
 [http://www.cpan.org/modules/by-module/XML/XML-Simple-2.18.tar.gz]
 md5=593aa8001e5c301cdcdb4bb3b63abc33
 sha256=a54967c188cda3e20f496c83be4de3f1740eeaa83c0380712ecd969ad8766826
@@ -3318,6 +3322,10 @@ sha256=9a4a0cfbbd227c20a13519a2c41f2e707dc0d89e518a3c7bfcd381f7b7fbcdef
 md5=328bfec66c312150e4c2a78dcecb504b
 sha256=9a4a0cfbbd227c20a13519a2c41f2e707dc0d89e518a3c7bfcd381f7b7fbcdef
 
+[http://sodium.resophonic.com/boost-cmake/1.40.0.cmake2/boost-1.40.0.cmake2.tar.gz]
+md5=1a0926fe4c8228f14a2622b4182b801e
+sha256=ce6e6c3a6b9a3e7695cb7a0f83d4dbb58f1fb246eb706e3caf3fce3b77e186c0
+
 [http://downloads.sourceforge.net/asio/boost_asio_0_3_7.tar.bz2]
 md5=e006cde4b4a28cfce95e43710cd126a9
 sha256=ade3663edc611d558f5a383abccd0a9ab87d6168f422ef4c2a38775e8b7ca575
@@ -4374,6 +4382,10 @@ sha256=eacc3c57cffb411b09d834d2225323cde5676165b5d2fc2a27b16cde98e3ba97
 md5=f5b84040e99eeff3a18e11e83b1eb12a
 sha256=e3a35e2ee2cc729bd637a69c7f82d6672317738d29dacab067468bb0634eb0de
 
+[http://www.kernel.org/pub/linux/network/connman/connman-0.46.tar.gz]
+md5=9bcdc528f38bc17ecb92519a28b741f1
+sha256=1853ed3d6400e25ef61ba1c98a7ef0f3984a2bf59aaf3485721cbc1de036b75c
+
 [ftp://ftp.moblin.org/connman/releases/connman-0.8.tar.gz]
 md5=3f1995bf91846b601a25a37832c88cb6
 sha256=d40272cfb9a9990a32f6985056735df53d7368eacc28b31b8141de1fb2cb414d
@@ -5842,6 +5854,10 @@ sha256=a0d03208e335610defc3049d8dd03f4ec7fcf477f44c4897b3f68adc478237ee
 md5=b96a6d4263122f1711db12701d79f738
 sha256=ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55
 
+[http://sources.openembedded.org/eject-2.1.5.tar.gz]
+md5=b96a6d4263122f1711db12701d79f738
+sha256=ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55
+
 [http://ekg.chmurka.net/ekg-1.6.tar.gz]
 md5=1094eee5062d9b9900c4b28bd68fb564
 sha256=c6dc601e20bb43c94f5689f05bca8e8501af4cff9dd760afdb3d6998c6952c28
@@ -19914,6 +19930,10 @@ sha256=063f00d5b889beee910eb113c8cfbb4fc85cd404693494bcaaf79dd09a98335c
 md5=ba2ee667a8b7606b125b7d32f47ca578
 sha256=d7f52e2217ed1cf367ca93257b27c8acb29fcae4fcaa31b4a94146a3c7a7de33
 
+[http://openvpn.net/release/openvpn-2.1_rc20.tar.gz]
+md5=8187f8f21507faac5e320e32747203b8
+sha256=4d423b48cb3ccc66b5669b9404dcb028cb62af410361c09e6056db0c5d2a1267
+
 [http://downloads.sourceforge.net/gakusei/openwrt-imagetools-svn-rev7641.tar.bz2]
 md5=7f35543286911b827dcbf8d07a7d72be
 sha256=bad49b59646dbea380cc88be13a77d17c70488b8e11e85f7dd474930fa9cf36a
@@ -26090,6 +26110,10 @@ sha256=2edc7cc98fd217f6980d8ba0b3792beed4695d4e8429a11c7237faab04ab47f4
 md5=6e393cc7423b5d228fa3d34c21481ae4
 sha256=9876b0e45a1bd3899222b916ab1d423e9efa3ad9374d55a6a301d5716f2d8a2f
 
+[http://downloads.sourceforge.net/linux-usb/usbutils-0.86.tar.gz]
+md5=34979f675d2bcb3e1b45012fa830a53f
+sha256=b3b2bea6d2cd87660c8201a47071bf2a9889d8ed90c7203cc768b597799c12f4
+
 [http://www.kroah.com/linux-usb/usbview-1.0.tar.gz]
 md5=2ac1bdae03a858b965e895b211a75ad7
 sha256=7a7add52242142f37a7d220c76dfe77090f6592eacdf796e3d07fa61415340fd
@@ -29002,6 +29026,10 @@ sha256=b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83
 md5=73a366b9892152266b465d7d9c35bef4
 sha256=b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83
 
+[http://mocha.xfce.org/archive/src/xfce/xfce4-panel/4.6/xfce4-panel-4.6.2.tar.bz2]
+md5=88352816c84cbea57121b0c478976976
+sha256=1d8ab1354c73935a5d12f0d7d226d26ae1b90fdd235460bdb57fd5651229bc8b
+
 [http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-session-4.4.2.tar.bz2]
 md5=4c3d1acb8ce37ea4dd55d82aeb38e9e7
 sha256=7394906dec7b50789407219f85143ae83b10938949d38adeecdd59eb50c8c1c6
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index f7d78ec01f..f0a064232b 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -189,9 +189,9 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "4913"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
-SRCREV_pn-opkg ?= "219"
-SRCREV_pn-opkg-native ?= "219"
-SRCREV_pn-opkg-sdk ?= "219"
+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"
@@ -245,7 +245,7 @@ SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCREV ?= "43038"
+EFL_SRCREV ?= "43437"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eina-native ?= "${EFL_SRCREV}"