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

4 files changed, 40 insertions, 48 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 05d9a8c0cb..5c0e4967ce 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1891,8 +1891,8 @@ md5=3b416557d2c395a36b97a819812e99b0
 sha256=2bcc5d5620f8533eb4300ba1b48c9d2a00092ce04588e32f7074cf2aadc34259
 
 [http://downloads.digium.com/pub/asterisk/releases/asterisk-1.4.23.1.tar.gz]
-md5=4788954a93f5fbf78e55e2aa6e03329f
-sha256=03e2cf43ffe9935d56fa0ea3663fc9bd23ce9720682c79d6269e78a9a1629d63
+md5=f5fdaa7e4a6d9b8dfc9e2bef8ee81681
+sha256=e78e73de5d9b920070b778cbb2ab077119a86a71a59755d67aa2c3a82b4239c4
 
 [http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.4.8.tar.gz]
 md5=e708a5510a61217725b6ad663287dfa0
@@ -5706,6 +5706,10 @@ sha256=d437b49f40f61e3ba5a3ed8edad783895dcbdfc3cd4cbe6ef37a56f7eea59573
 md5=cce9edb41b4a8308e0ef0eea24b5a1ab
 sha256=61d041afc953e0570ddae934179e92edf800f69f043d78058073806504e4137f
 
+[http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-0.1.7.tar.bz2]
+md5=1919bb19c16ef0a97d48b0a8303d3c7b
+sha256=0afbb0f348d4ba916cf58da48b4749b7cca6a9038136b27dc652161913704ae8
+
 [http://enlightenment.freedesktop.org/files/epeg-0.9.0.007.tar.gz]
 md5=383db51e46d13d986966459e4918d236
 sha256=bb12585b433fd0eca11865541bdb877166b9e53b0ea12624776f11cce3ce189b
@@ -5914,6 +5918,10 @@ sha256=c424e6dd5cc0d998a311f5c49835de9803da4dbcb74ca7fbda29c1b953bf6d6b
 md5=ad0e463ab1fe596fc52c03403a9b9f1e
 sha256=d8803313e2a0b3fa3fe20fe613ac3ec85ec6848d5d446dd02e9cc5be8194f65c
 
+[http://ftp.gnome.org/pub/GNOME/sources/evince/2.26/evince-2.26.2.tar.bz2]
+md5=ed8b9fb5c5d6feafd19f0114b736c9ef
+sha256=5165adb77af7dd355c600bc1fce4bcc7de2538ed02d0f87028660096a61af489
+
 [http://beagleboard.googlecode.com/files/evtest.c]
 md5=da26fda6df8835a7cb95182e1fabe912
 sha256=ba2bdf6887eb0ef606402d51a2f4e68510d68dec5afd9f4d30d787950dece770
@@ -18030,6 +18038,10 @@ sha256=0ea976722c993c87dede8eb6348e6feb059e3851bbef2de824bf18ac97cdb565
 md5=6c974df7a5a5b1579f72115e6b045bda
 sha256=0ea976722c993c87dede8eb6348e6feb059e3851bbef2de824bf18ac97cdb565
 
+[http://downloads.sourceforge.net/net-snmp/net-snmp-5.4.2.1.tar.gz]
+md5=984932520143f0c8bf7b7ce1fc9e1da1
+sha256=11a8baf167f7bfff60d2590e050991400a3a082923dbcdbf85e0e0ce46eb247c
+
 [http://download.berlios.de/net-tools/net-tools-1.60.tar.bz2]
 md5=888774accab40217dde927e21979c165
 sha256=7ae4dd6d44d6715f18e10559ffd270511b6e55a8900ca54fbebafe0ae6cf7d7b
@@ -20022,6 +20034,10 @@ sha256=796f210200129e478bcb0f9c40c09998f2c47b346d4c734d94756e84989fd8b3
 md5=8efe67bc46564512bd1de09fce5971ab
 sha256=3238cc3553f721c110822bdc7fbfe7c57f33f59a05e406a19e956e71a1712aa8
 
+[http://poppler.freedesktop.org/poppler-0.11.3.tar.gz]
+md5=28f9dbdc74e9aadbf27aff16d06f4990
+sha256=2ec40a8d9d9b80ebebea594c407c31962845376287c19e37345371236ed180d5
+
 [http://poppler.freedesktop.org/poppler-0.5.4.tar.gz]
 md5=053fdfd70533ecce1a06353fa945f061
 sha256=ca0f880a4ff07391e99b443f0e7c9860241df6a6aaa327b9d811b358d94a29c9
@@ -23042,6 +23058,10 @@ sha256=dcb0c10965430862721b675e2f9f6a30819880e03124b5e9403bfce2c7f3b69a
 md5=4809dcf89e504d4039ed01c9f61c68d5
 sha256=3da4fccc40c7c8ad51dba5bc7ac29a3a53905d5f2de0761353214d7e359d4bfd
 
+[http://www.klake.org/~jt/sscep/sscep.tgz]
+md5=89ba368c8455c324d208e5f5965f8f8f
+sha256=e622c344f72c6d95e15db834efbf777392778b2854e58a5d8f5d20b668cf2a9b
+
 [http://downloads.sourceforge.net/fuse/sshfs-fuse-1.3.tar.gz]
 md5=40fe4a353d03b80f8b37e4b0cc6159d3
 sha256=f80f713105fc0747197b6e5d2440cd77205cb1febe25b7b4fe08809ab67ace26
@@ -24702,6 +24722,10 @@ sha256=dbc5d6921136711f08c197284ec67dc77232559e2e31429f8a30a1a102bd07f7
 md5=042c5243ce0253341fe920a8a863e37b
 sha256=6d2ae5d70609df7d2c2b518eca0624c4a59328b277ed114b9e5b57dd030e6e94
 
+[http://www.draisberghof.de/usb_modeswitch/usb_modeswitch-1.0.2.tar.bz2]
+md5=4f896ed631f9be0338df9c5a2145ef82
+sha256=f1b9388f4507185a4ac30bae3383d9e9bbb95075a14dd188c904cacdd8cf4e66
+
 [http://www.rpsys.net/openzaurus/patches/archive/usb_pxa27x_udc-r0.patch]
 md5=c8193bc27642fa446d702cfdb9464c2a
 sha256=2101f292449cbacc277aecc5c649de895d501057f299e8e48a7ec50cfb0a200d
@@ -28866,3 +28890,10 @@ sha256=f57c4e33eb2cdd87a6c2f01bfa4794340fbe61ea1a1cfc7dac3b6671e1dd22af
 md5=5f7b88ebb2bcd7e8044328482d079661
 sha256=f57c4e33eb2cdd87a6c2f01bfa4794340fbe61ea1a1cfc7dac3b6671e1dd22af
 
+[http://compcache.googlecode.com/files/compcache-0.6pre3.tar.gz]
+md5=532fbc4e6a8ae0670ec15a49484f313f
+sha256=3e54f26665bd1b7ece4e4621a15f82da66a95bafd04286d447be5a596790a7db
+
+[http://compcache.googlecode.com/files/compcache-0.6.tar.gz]
+md5=0a574643c0eb857b946adcd5d5a22eb0
+sha256=e5f697be6c1b7bfb9ac9ba5b8d836ff20f880c161f998c482caba83caf443c0c
diff --git a/conf/distro/micro-uclibc.conf b/conf/distro/micro-uclibc.conf
index f793d4a3c1..9cce7d18d0 100644
--- a/conf/distro/micro-uclibc.conf
+++ b/conf/distro/micro-uclibc.conf
@@ -7,42 +7,20 @@
 #@COMMENT: based on uclibc.
 #############################################################################
 
-# Based on the Micro Linux distribution
-require conf/distro/micro.conf
-
 # Use overrides for micro as well
 OVERRIDES .= ":micro"
 
 #############################################################################
 # DISTRO CONFIGURATION
 #############################################################################
-DISTRO_NAME = "micro-uclibc"
 
-#############################################################################
-# TARGET OS 
-#############################################################################
-# Use linux uclibc
-TARGET_OS = "linux-uclibc"
-TARGET_OS_armeb = "linux-uclibcgnueabi"
+DISTRO_NAME = "micro-uclibc"
 
 #############################################################################
 # TOOLCHAIN
 #############################################################################
-LIBC = "uclibc"
-
-#############################################################################
-# PREFERRED PROVIDERS 
-#############################################################################
-PREFERRED_PROVIDER_virtual/libc		= "uclibc"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc	= "uclibc"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils	= "binutils-cross"
-PREFERRED_PROVIDER_linux-libc-headers	= "linux-libc-headers"
-PREFERRED_PROVIDER_virtual/libintl	= "proxy-libintl"
-PREFERRED_PROVIDER_virtual/libiconv     = "libiconv"
 
-#############################################################################
-# PREFERRED VERSIONS 
-#############################################################################
-PREFERRED_VERSION_uclibc = "0.9.30.1"
-PREFERRED_VERSION_uclibc-initial = "0.9.30.1"
+LIBC = "uclibc"
+# Based on the Micro Linux distribution
+require conf/distro/micro.conf
 
diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf
index 861f7ef886..2d45425290 100644
--- a/conf/distro/micro.conf
+++ b/conf/distro/micro.conf
@@ -1,7 +1,7 @@
 #############################################################################
 #@TYPE: Distribution
 #@NAME: Micro
-#@DESCRIPTION: Micro Linux Distribution (glibc based)
+#@DESCRIPTION: Micro Linux Distribution (eglibc based)
 #@MAINTAINER: Martin Lund <mgl@doredevelopment.dk>
 #@COMMENT: This distribution configuration defines a truely tiny OE Linux  
 #@COMMENT: distribution. The matching buildable image target (micro-image)
@@ -79,7 +79,6 @@ ${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
 # PREFERRED PROVIDERS
 #############################################################################
 PREFERRED_PROVIDER_task-bootstrap	= "task-bootstrap"
-PREFERRED_PROVIDER_virtual/libintl	= "glibc"
 
 #############################################################################
 # PREFERRED VERSIONS
diff --git a/conf/distro/minimal-uclibc.conf b/conf/distro/minimal-uclibc.conf
index f246bffa69..9594622bed 100644
--- a/conf/distro/minimal-uclibc.conf
+++ b/conf/distro/minimal-uclibc.conf
@@ -1,7 +1,7 @@
 #-----------------------------------------------------------------------------
 #@TYPE: Distribution
-#@NAME: Minimal uClibC
-#@DESCRIPTION: uClibC Embedded Linux Distribution Configuration (minimal)
+#@NAME: Minimal uClibc
+#@DESCRIPTION: uClibc based Embedded Linux Distribution Configuration (minimal)
 #
 #@COMMENT: This distribution configuration serves as a starting point for
 #@COMMENT: the integration of new target platforms, machines, or distributions.
@@ -13,25 +13,9 @@
 #
 DISTRO_NAME = "minimal-uclibc"
 
-#
-# Target OS & FPU system
-#
-TARGET_OS = "linux-uclibc"
 TARGET_FPU_arm = "soft"
 TARGET_FPU_armeb = "soft"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
-PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 
-# Override the default virtual/libintl
 LIBC = "uclibc"
-PREFERRED_PROVIDER_virtual/libintl = "proxy-libintl"
-
-USE_NLS ?= "no"
-USE_NLS_glib-2.0 = "yes"
-USE_NLS_glib-2.0-native = "yes"
-USE_NLS_gcc-cross = "no"
-
-PREFERRED_VERSION_uclibc ?= "0.9.30.1"
-PREFERRED_VERSION_uclibc-initial ?= "0.9.30.1"
 
 require conf/distro/minimal.conf