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

5 files changed, 94 insertions, 6 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index e19a0ff1b7..392ec5063b 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -58,6 +58,10 @@ sha256=7a960180e7873b1bdb522e76b0423b5c2c1b8efe1d30d7ca80c41eb97d822b2d
 md5=f13ab353b11329ce3d605b6f40e77fa6
 sha256=41991e8aa2e5fe8e5dfd47b1e5c446fa03c3ee96a5eae54fd6ec15d1d9afef30
 
+[http://hg.openjdk.java.net/hsx/hsx14/master/archive/25a020f13592.tar.gz]
+md5=dbd7aca5544d1aeebf0eadd45d29d08e
+sha256=02f10b35508cb11908bb908156daad1ea5e653840440d62482231efeb4cbe178
+
 [http://sense.net/zc/free42/42c_skins.tgz]
 md5=24b0e5bbfe21ea9c5a5c589bcc79c0f2
 sha256=ab877846c6caaff32efbf5be6fc5c63b7dec97a2e78c57c525da7705d2052bfc
@@ -1542,6 +1546,10 @@ sha256=caba504ca4f769c5f3f8b4e97ed0da1888bd0be2efd3c33cac9bf36e7c285bc3
 md5=0d68db4a1ada5c91bcbf53cefd0c2fd7
 sha256=4dc49a7260ef90a6dc6611b7e96b9f047d507589736d4a2ad6efbe3edfc6fba6
 
+[http://ftp.riken.jp/net/apache/ant/source/apache-ant-1.7.1-src.tar.gz]
+md5=2a44ff60456cf67bb83771cfcedb8e33
+sha256=1a2fceea38f04e6fea0c0cb8ad7312dc948004af4d9308b5e630d299d89dfb38
+
 [http://archive.apache.org/dist/logging/log4j/1.2.15/apache-log4j-1.2.15.tar.gz]
 md5=10f04abe4d68d5a89e8eb167e4e45e1a
 sha256=f5d9f6aa78b9156ae2de2a32d0f26507d2e73db4993d501db2e79f0bd803ab31
@@ -2838,6 +2846,10 @@ sha256=0b22f518085528b71aa9eab8bbc44d2696458c85d902c6a6686076ae10d64549
 md5=d24dfd3ca42847123e29f58b29af6948
 sha256=ed7631a6d22b456eb26b881bdbe46ea47f93d2f192da420408bad4bbc245f796
 
+[http://www.kernel.org/pub/linux/bluetooth/bluez-4.46.tar.gz]
+md5=ed24b291e9a724a37bc8e9d04adae413
+sha256=31f058fb722dfb96a7b496a064e0c46d634d7dffdd5b64c7dce3ab6ec2fa48bc
+
 [http://www.kernel.org/pub/linux/bluetooth/bluez-4.7.tar.gz]
 md5=2aa806940d2c841e57a9b2ab7302b750
 sha256=ed384dea4f5f21157758fcd7db64db19ce0b410509c26630706e4a3c779287a0
@@ -4670,6 +4682,10 @@ sha256=9ae500ffb1af6e29da00114bad18b776c2f24872c254ee62f6283948beaefc15
 md5=e52d681c5ca11f4a9491624ab8c4fa90
 sha256=e9f0cd45a82d2f60af7e927b1740b5971e9007bf7d05e39a900db2dcb7871916
 
+[http://ftp.gnome.org/pub/GNOME/sources/devhelp/0.23/devhelp-0.23.tar.bz2]
+md5=704c0c90616aeb1c52ca3af1df93fde6
+sha256=60f336ac396f67a0cce70d71ea931545727ab48e9d09bf36415098965f9a7ef2
+
 [ftp://sources.redhat.com/pub/dm/device-mapper.1.01.04.tgz]
 md5=42dd0610e24d4b4f2409a32a04e6e37f
 sha256=49c8303f58abf3a0efbbd42decdc5968688df32c154cffb20a1c3c1ae8b92048
@@ -4719,8 +4735,8 @@ md5=e23f236e94be4c429aa1ceac0f01544b
 sha256=3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639
 
 [http://www.lartmaker.nl/lartware/port/devmem2.c]
-md5=be12c0132a1ae118cbf5e79d98427c1d
-sha256=ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191
+md5=e23f236e94be4c429aa1ceac0f01544b
+sha256=3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639
 
 [http://pknet.com/~joe/dgen-sdl-1.23.tar.gz]
 md5=b1896c1b21ddb152626aec2e8a157a3a
@@ -5262,6 +5278,10 @@ sha256=2de57ec75aca127ec70c2797c1a416fca43d78e6cb5c8ee4938864cb8eaafb56
 md5=c75f112d24bdc39c76dbec61d59a4a91
 sha256=dc1eb1b7bbad2edc030e50e7506c79562d98098f99a5d6cb5db5aa5ca92ffe48
 
+[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.41.8.tar.gz]
+md5=bd28f2ccce2c14f06091e04fd1a0c67e
+sha256=90428106333a38b93b6f4a306fff17749243862883a06598ff6e6ea11f8d24d2
+
 [http://www.pobox.com/~sheff/sw/e2tools/e2tools-0.0.16.tar.gz]
 md5=1829b2b261e0e0d07566066769b5b28b
 sha256=4e3c8e17786ccc03fc9fb4145724edf332bb50e1b3c91b6f33e0e3a54861949b
@@ -5310,6 +5330,10 @@ sha256=b5725fa7f8b1f7dc28776e60591e9ef0c171629fe567ef49ab9be28516ff2cd6
 md5=f7b84d912e61dfdd77b7173065845250
 sha256=a6ce5f0682462e85e5e47229e5b16555f74c60188fa0bb17536beb1138c537b4
 
+[http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.5-200906111540/ecjsrc-3.5.zip]
+md5=356f1d337833670e34cf53b58513daeb
+sha256=f3f82d0b91f63fa3aab52f61ad8f5d50c0e4029479cf4b720b83a3424074bd38
+
 [http://mirror.calvin.edu/eclipse/downloads/drops/S-3.3M5eh-200702220951/ecjsrc.zip]
 md5=9e1fc1c86c85e72df5e141069b82041d
 sha256=f41194a9580023afd11d18b82f6815b064af83c4f9ca407a40cd8d960bd112cc
@@ -5418,6 +5442,10 @@ sha256=998b50e3920546cb43cd281d519394a2db23f5bf10223cac49120296407b3c6d
 md5=3009f30e124a2062370824bb307c5313
 sha256=21032e8a420365d0539c6356d220bb8634e9c1ee839bfcceb3c03d9e427cd397
 
+[http://ftp.gnome.org/pub/GNOME/sources/ekiga/3.2/ekiga-3.2.5.tar.bz2]
+md5=a545490e03a6b49f00253bf0d692f362
+sha256=6a624b741b110b5b1d9cdff8179760f52b0a623bf597b8e6be757fc18af20a4c
+
 [http://effbot.org/media/downloads/elementtree-1.2.7-20070827-preview.zip]
 md5=30e2fe5edd143f347e03a8baf5d60f8a
 sha256=5071431068c58c1f56dcc8fff37f8a213351f3b45c012d3adb640ec9418053ad
@@ -7134,6 +7162,10 @@ sha256=9f17181cd8bf46203a288e3fc1d9bd82d5dc011fe419d33bee2f62bace081f08
 md5=d2f52d92776f47bf353787237607f23c
 sha256=9f17181cd8bf46203a288e3fc1d9bd82d5dc011fe419d33bee2f62bace081f08
 
+[http://www.gnome.org/~veillard/gamin/sources/gamin-0.1.10.tar.gz]
+md5=b4ec549e57da470c04edd5ec2876a028
+sha256=28085f0ae8be10eab582ff186af4fb0be92cc6c62b5cc19cd09b295c7c2899a1
+
 [http://www.gnome.org/~veillard/gamin/sources/gamin-0.1.8.tar.gz]
 md5=985022c8b1b993e471d528fd0e14ffbe
 sha256=be22f69b4797db510f4270ff0e228dd027e99e561ac5f5d38be595be7e82d203
@@ -7886,6 +7918,10 @@ sha256=6fb4269a187bee6f7825c358fd6f0e0e99e6ad71f7f995ddcbfe9466ec8f6631
 md5=346916673c0eab72191cf44b4afe535f
 sha256=af709f0eabfbbfa5c59a02764ca1dd5e6509bbe7fb67a474b2c448bda7b06fb9
 
+[http://ftp.gnome.org/pub/GNOME/sources/glib/2.21/glib-2.21.4.tar.bz2]
+md5=5092c5b479ba80065dc164d27e63000f
+sha256=b772e4bdf1b28dd23cdb4c4d7f1d219ddb748226d0207e57c75992bf0100182d
+
 [ftp://ftp.gtk.org/pub/gtk/v2.4/glib-2.4.6.tar.bz2]
 md5=a45db7d82480da431f6cd00ea041a534
 sha256=d2ca79bac06a625d9276b48492c2c1caccf7f8962f9b331b39796391013e72f2
@@ -10398,6 +10434,10 @@ sha256=730a9f2340f789677eb0c3b0984bbaca3ede6c12d1e4b16bc7ea91f51d10ba90
 md5=bb7c36e142437f7363f9a80ae8391926
 sha256=c444e0485e4361eec0e6f06580c45b9fcf6f20a119634a5f0a5c13218cfdfd02
 
+[http://hal.freedesktop.org/releases/hal-0.5.13.tar.gz]
+md5=46ecc5d2e5bd964fb78099688f01bb6a
+sha256=ebcf22a373761530920643add1a791af40954dc7349f027d1c35b0e0f7f9c8af
+
 [http://freedesktop.org/~david/dist/hal-0.5.2.tar.gz]
 md5=3b351822ba359669646026013a3d5a03
 sha256=46d0a75f90058909269da4cc42986cd51d5163a6af669e9d7fb4a7d170217d17
@@ -10946,6 +10986,10 @@ sha256=c15fb24475ad93e064ba252f2739c020f9981a808bde6cbd6c41eae38dd0143d
 md5=6428ca1b0c38111cca230f5b69460b03
 sha256=4f23aadcee80a9a03c858e36a8eaaa92149987ce0a3eac276e3003c9b2462739
 
+[http://icedtea.classpath.org/download/source/icedtea6-1.5.tar.gz]
+md5=a67303675a53781c4e42bdb02ec78e40
+sha256=1ec328f41f8adfbf797599bc7bf4c07de162ac6d565d2b9fd95685b1cbc99ac8
+
 [http://jalimo.evolvis.org/repository/sources/icepick-0.0+hg20080118.tar.bz2]
 md5=ce7b1827e6f4cbe73b9ffa90b0d45a6a
 sha256=63170836095f8451498c813a1f93a9ec70a1164d82aa30650c0f2216ca4377ab
@@ -14202,6 +14246,10 @@ sha256=07128710a699b453dcd7b92e33f2aa8dcbbfe0a657d33040803cdaf0997e442c
 md5=6d6b6a75bc8751a7421b5e739c53ef6e
 sha256=07128710a699b453dcd7b92e33f2aa8dcbbfe0a657d33040803cdaf0997e442c
 
+[http://downloads.sourceforge.net/omxil/libomxil-bellagio-0.9.1.tar.gz]
+md5=757371e21e4f3653ce4d12d3ba0be1e0
+sha256=9a0864cd442c43e5b69072dc0617b56252bc933fce26f6bfd6d47909287a353a
+
 [http://download.ofb.net/liboop/liboop-1.0.tar.bz2]
 md5=88fc8decf99fd75d2af40e0a005fa0d3
 sha256=4a973d28466fde0b689099192f9bcd081b129d90b3c5a9815e5ade73052cf8d2
@@ -16782,6 +16830,10 @@ sha256=e6cc1b6da8a7af99ba9298e0cb4aac790595f04e04497ea8c2bb4b48c44feb5f
 md5=c6299ecf93417526f37bc0154c18b126
 sha256=9b74a776831c3680c10ad5c3d04985a1368c4fdf2f383a0e8efcc3cda925baaf
 
+[http://goodies.xfce.org/releases/midori/midori-0.1.8.tar.bz2]
+md5=06935203b20e9794121a2c354fc9dea5
+sha256=3b0e4a2c5c3e4457ce8f44e6cbb9f14ddfb66a515017b430f4f4484893e8ce9d
+
 [http://git.xfce.org/kalikiana/midori/snapshot/midori-abbfc163a39d7f1f01725fe2cfe3df516f9fa0f4.tar.bz2]
 md5=d50f0a9683dee60685bcd48e04970949
 sha256=c5eb824148935697cf4fc36f11cfd7a05fbe6a3392d8f32e296e2cdfd21de3ee
@@ -17970,6 +18022,10 @@ sha256=8ed452371010117e183ade4e1e3ae4b489485b792722bf3b97b817cf0ed66ac8
 md5=8764dcbcd7b5ed80e17b1279a82701b0
 sha256=c986121e520897af6c326ece8a26eca87bdb4641a93913b63a5c29521cefaf66
 
+[http://www.kernel.org/pub/linux/bluetooth/obexd-0.15.tar.gz]
+md5=f9adc013e0e4b26c992cc0ca05328f3d
+sha256=44ba0d99e1bf8fa2caf9f7a85d569e513208c0710c1ad00032e271289e87b63f
+
 [http://downloads.sourceforge.net/openobex/obexftp-0.20.tar.gz]
 md5=085b9edc0504c0d79e7479a54e2018c5
 sha256=7246fc75257afcd30ff16dc70185057157bcefc12fa9fba111b3b201577cc40e
@@ -18170,6 +18226,10 @@ sha256=e6b48a294b35449c851c2a6ea6969041ed7f4148e92b3faa03a330b7bb5a59af
 md5=88076eeadee1351704afb2aeb3532c17
 sha256=09ffe451256fafdd74d4dc35ed153b93c81328c397d36872cca1f0104877caca
 
+[http://downloads.sourceforge.net/opalvoip/opal-3.6.4.tar.bz2]
+md5=d894c176818a33d34a04b21386798c4f
+sha256=b1fb3bad0c8581b82f0da9c69673f43ad9aed7868a7e4f2a68c6c72ed656237b
+
 [http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz]
 md5=641cf53761f35ee979f3e888614797a0
 sha256=723e2c57c3cdffa7ff11f9b6b5478d6cb4af017e5a1ee7a56032969c39c1c2fe
@@ -18182,6 +18242,10 @@ sha256=a898b79336c7372c901bcc7e5f83db7b8e79f8e864be6a262f515b3e088bc607
 md5=5c9c1639bdff3bd35c63697d398f1a68
 sha256=3d6c58830e50373d0dc2a72f6fc65afd7ef30aabf2d1078e6878c911270dec16
 
+[http://downloads.sourceforge.net/myposition/openbmap-logger-0.4.0.tar.gz]
+md5=52b71c33ce0d2da8d5c29db293132630
+sha256=93820366128b394d84b1b37830344b70f349c2896b60b601e884f9d857ff5d84
+
 [http://icculus.org/openbox/releases/openbox-3.4.7.2.tar.gz]
 md5=9e7589e90519bc6ac2f4656ea6869439
 sha256=d11f2137a0fe1de6c36c999d29523ad68c05f22c5935ce8628a8cab7a2e4b000
@@ -18210,6 +18274,10 @@ sha256=f099b3b1f3c22b8cea950403b992267ec69f43ad8a80bbcb84448b26340807ab
 md5=9f9773a822156dd3d576d83d794364ce
 sha256=1272f975052e51d3faf2d7ac13d0b8b4ac68019a688bffe03d9b684a9e3b4480
 
+[http://download.java.net/openjdk/jdk6/promoted/b16/openjdk-6-src-b16-24_apr_2009.tar.gz]
+md5=850a29b70206bc7fa083cd26acc781f3
+sha256=96159489d8b70db275c125b627c6e6912e6c078279d76b968d2e0969359c9420
+
 [http://jalimo.evolvis.org/repository/sources/openjdk-langtools-jdk7-b31.tar.bz2]
 md5=670931f67b2e4ac46c6e0cd15418f2fa
 sha256=f8b8820e410c137d279d14dec7e7a93217cc371acdfe1b3343b2278d1728932e
@@ -18222,6 +18290,10 @@ sha256=82ed5a27d2b340826b2e10625e687627ccefc883a426314952e4a253d5a6af29
 md5=fbde128a8421b8d2ea587a25057a281e
 sha256=63d1c60a49277a4e95dcfb7f45dbb66a902d9e9023f8aca3a01cda4ff221d6a9
 
+[ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.17.tgz]
+md5=5e82103780f8cfc2b2fbd0f77c47c158
+sha256=4a18ce70154f5c0ffc1804698dba609d8f4aab3e74f01bbddf31b28b96403fc3
+
 [http://www.zip.com.au/~dtucker/openntpd/release/openntpd-3.7p1.tar.gz]
 md5=10ed8eefd760e5819efcf3277b118f47
 sha256=313509a7ccb15565e911f61c599055afc705cfe4bf6370bdc1c30582d52a9ea9
@@ -19938,6 +20010,10 @@ sha256=b8301389c1ee9968df8075942061665e33198d3865f92d8fb26e519068517305
 md5=d478121cfc82da7c0f0ce0e53fc7c2fd
 sha256=941ead5179f5bab8dd6e81806b6e52120dc5b98c6ced8128df24639af1eabedd
 
+[http://downloads.sourceforge.net/opalvoip/ptlib-2.6.4.tar.bz2]
+md5=bcc8e2d5bb6be7e3fea857ce2f7fce5c
+sha256=22eae4f6c72247f8ac79c57ce4469797ad3df67614758c5096b7ce9290bd10b4
+
 [http://pypi.python.org/packages/source/p/ptrace/ptrace-0.3.2.tar.gz]
 md5=8108c2474bef16d126e956dce3c5073b
 sha256=634fe75e195179adafb6218040724f38252bd0fc8f796bb3e3e9bdba065890c5
@@ -24250,6 +24326,10 @@ sha256=7736d8d7d3b39654e350416585b3e00af9f55670cce8b3dddd2c2494cbaae81c
 md5=71919b69eeecbba05612224d8f2c450f
 sha256=db4dcbf99d989a8f539d7521e9e64047367fa2ccdcbb91517cdec19693a41ffd
 
+[http://kernel.org/pub/linux/utils/util-linux-ng/v2.16/util-linux-ng-2.16.tar.bz2]
+md5=9623380641b0c2e0449f5b1ecc567663
+sha256=a6365fcb2b34439faa52164e1a018086c2b6818f8a189c487c79e09dc3c62722
+
 [http://xorg.freedesktop.org/releases/individual/util/util-macros-1.1.5.tar.bz2]
 md5=51952682d8b42aeda3af5cee0133ce2c
 sha256=75939790e16b8bcc122e83f3f060d6f000ed1a98e97b4972fac0903142f5651b
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 3e2705a445..d5e09af068 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -161,8 +161,8 @@ PREFERRED_PROVIDER_bluez-utils-dbus      = "bluez-utils"
 PREFERRED_PROVIDER_bluez-libs            = "bluez4"
 PREFERRED_PROVIDER_bluez-utils           = "bluez4"
 
-ANGSTROM_BLACKLIST_pn-bluez-libs	= "bluez3 has been replace by bluez4"
-ANGSTROM_BLACKLIST_pn-bluez-utils	= "bluez3 has been replace by bluez4"
+ANGSTROM_BLACKLIST_pn-bluez-libs	= "bluez-libs 3.x has been replaced by bluez4"
+ANGSTROM_BLACKLIST_pn-bluez-utils	= "bluez-utils 3.x has been replaced by bluez4"
 
 # we don't ship gtk-directfb by default
 PREFERRED_PROVIDER_gtk+                   ?= "gtk+"
diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
index 8fefbbce8a..bc42ebc227 100644
--- a/conf/distro/chinook-compat.conf
+++ b/conf/distro/chinook-compat.conf
@@ -194,6 +194,9 @@ PREFERRED_VERSION_swt3.4-gtk-hildon = "3.4"
 # Does not build with later versions
 PREFERRED_VERSION_fakeroot-native = "1.9.6"
 
+# newer Versions needs newer autotools we cant relay on
+PREFERRED_VERSION_guile-native = "1.8.2"
+
 # WARNING: If you change these values after the respective package has
 # been built the change will have no effect. Edit the package's file in 
 # ${STAGING}/pkgdata/runtime then.
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 5bf5b30d4c..6c1963549c 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -13,7 +13,7 @@ PREFERRED_VERSION_glproto	= "1.4.9"
 PREFERRED_VERSION_gst-pulse 	= "0.9.7"
 PREFERRED_VERSION_gtk+		= "2.16.4"
 PREFERRED_VERSION_gtkmm		= "2.14.1"
-PREFERRED_VERSION_hal		= "0.5.12"
+PREFERRED_VERSION_hal		= "0.5.13"
 PREFERRED_VERSION_libgemwidget	= "1.0"
 PREFERRED_VERSION_libgpephone	= "0.4"
 PREFERRED_VERSION_libsdl-x11	= "1.2.11"
@@ -24,7 +24,7 @@ PREFERRED_VERSION_libtool-sdk	= "2.2.4"
 PREFERRED_VERSION_libx11 = "1.2"
 PREFERRED_VERSION_mesa = "7.2"
 PREFERRED_VERSION_pango 	= "1.24.4"
-PREFERRED_VERSION_pixman	= "0.13.2"
+#PREFERRED_VERSION_pixman	= "0.13.2"
 PREFERRED_VERSION_pkgconfig	= "0.23"
 PREFERRED_VERSION_pkgconfig-native = "0.23"
 PREFERRED_VERSION_pulseaudio 	= "0.9.15"
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index a00fec4c2a..643ae0b611 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -119,6 +119,11 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 # squashfs, squashfs-lzma
 IMAGE_FSTYPES = "jffs2 tar"
 
+# Uncomment this if you want to keep the temporary rootfs
+# diretory, this can be useful during development.
+# (Note that this rootfs is NOT usuable as NFS export.)
+# IMAGE_KEEPROOTFS = "1"
+
 # Uncomment this to disable the parse cache (not recommended).
 # CACHE = ""