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

92 files changed, 7369 insertions, 734 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 121d403247..f7745e1ee3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -171,10 +171,10 @@ Recipes:    altboot, webcam-server
 
 Person:     Michael 'Mickey' Lauer
 Mail:       mlauer@vanille-media.de
-Distros:    Openmoko, Ångström, Generic
-Machines:   om-gta01, om-gta02, nokia810, x86, qemuarm, qemux86
-Interests:  Core OE infrastructure, everything Python, EFL
-Recipes:    efl1/*, busybox/*, dbus/*, dropbear/*, freesmartphone/*, gstreamer/*, *python*
+Distros:    Openmoko, Ångström, Minimal
+Machines:   om-gta01, om-gta02, om-gta03, htcraphael, a780, a1200, a910
+Interests:  Core OE infrastructure, everything Python, EFL, Vala, Freesmartphone.org
+Recipes:    efl1/*, busybox/*, dbus/*, dropbear/*, freesmartphone/*, gstreamer/*, *python*, vala/
 
 Person:     Patrick Gfeller
 Mail:       gfellerpatrik@gmx.net
diff --git a/classes/image.bbclass b/classes/image.bbclass
index 2ed0ee1de7..fd0df4df08 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -2,19 +2,6 @@ inherit rootfs_${IMAGE_PKGTYPE}
 
 LICENSE = "MIT"
 PACKAGES = ""
-RDEPENDS += "${IMAGE_INSTALL}"
-
-# "export IMAGE_BASENAME" not supported at this time
-IMAGE_BASENAME[export] = "1"
-export PACKAGE_INSTALL ?= "${IMAGE_INSTALL}"
-
-# We need to recursively follow RDEPENDS and RRECOMMENDS for images
-do_rootfs[recrdeptask] += "do_deploy do_populate_staging"
-
-# Images are generally built explicitly, do not need to be part of world.
-EXCLUDE_FROM_WORLD = "1"
-
-USE_DEVFS ?= "0"
 
 #
 # udev, devfsd, busybox-mdev (from busybox) or none
@@ -28,15 +15,26 @@ IMAGE_INITSCRIPTS ?= "initscripts"
 #
 # tinylogin, getty
 #
-IMAGE_LOGIN_MANAGER ?= "tinylogin" 
+IMAGE_LOGIN_MANAGER ?= "tinylogin"
 
 IMAGE_VARS = "${IMAGE_INITSCRIPTS} \
 ${IMAGE_DEV_MANAGER} \
 ${IMAGE_INIT_MANAGER} \
 ${IMAGE_LOGIN_MANAGER} "
 
-RDEPENDS += "${IMAGE_VARS}"
-PACKAGE_INSTALL += "${IMAGE_VARS}"
+RDEPENDS += "${IMAGE_INSTALL} ${IMAGE_VARS}"
+
+# "export IMAGE_BASENAME" not supported at this time
+IMAGE_BASENAME[export] = "1"
+export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${IMAGE_VARS}"
+
+# We need to recursively follow RDEPENDS and RRECOMMENDS for images
+do_rootfs[recrdeptask] += "do_deploy do_populate_staging"
+
+# Images are generally built explicitly, do not need to be part of world.
+EXCLUDE_FROM_WORLD = "1"
+
+USE_DEVFS ?= "0"
 
 PID = "${@os.getpid()}"
 
diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index e752449305..f5714bd1a3 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -21,7 +21,10 @@ ONLINE_PACKAGE_MANAGEMENT ?= "full"
 # Which packages to not install on the basis of a recommendation
 BAD_RECOMMENDATIONS ?= ""
 
-DISTRO_EXTRA_RDEPENDS += "${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "opkg opkg-collateral", d)}"
+IPKG_VARIANT ?= "opkg"
+
+RDEPENDS_append = " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${IPKG_VARIANT} opkg-collateral", d)}"
+PACKAGE_INSTALL_append = " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${IPKG_VARIANT} opkg-collateral", d)}"
 
 fakeroot rootfs_ipk_do_rootfs () {
 	set -x
diff --git a/conf/checksums.ini b/conf/checksums.ini
index c6007aa679..bbab8f2e95 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1,4 +1,4 @@
-[http://www.directfb.org/downloads/Extras/++DFB-0.9.25.tar.gz]
+[?1034h[http://www.directfb.org/downloads/Extras/++DFB-0.9.25.tar.gz]
 md5=c6a2705f6210d8ede50a947b375f1c0b
 sha256=b3dbf01563dd60d63cff543ea8cd0c885381e78ecbbab8ff176e46df3f198a88
 
@@ -4542,6 +4542,10 @@ sha256=39999c5bfb663404f6450da66d98d69193a5d0ab496d2d47cc53cd0202c4051c
 md5=95d900913bee4b27d7e9ce55f8a55427
 sha256=8daa89512f9349fc131d48555726ffe1187e0f7d9f4cef992464c8098d86e77c
 
+[http://matt.ucc.asn.au/dropbear/dropbear-0.52.tar.bz2]
+md5=a1fc7adf601bca53330a792a9c873439
+sha256=8c7b727a4c9066e90a14f7f01c47cab698afb5a854ffa0404da162d4286f04c1
+
 [http://www.monkey.org/~dugsong/dsniff/dsniff-2.3.tar.gz]
 md5=183e336a45e38013f3af840bddec44b4
 sha256=82e492455486e655c315f027d393dbeb49ad930804acccdc51b30d57e1294ff5
@@ -4614,6 +4618,10 @@ sha256=635d6d07e5a4d615e599c051166af965baa754f9ff7435e746de1a5d2a5c0d56
 md5=1c1c5177aea9a23b45b9b3f5b3241819
 sha256=635d6d07e5a4d615e599c051166af965baa754f9ff7435e746de1a5d2a5c0d56
 
+[http://qa.debian.org/watch/sf.php/e2fsprogs/e2fsprogs-1.41.4.tar.gz]
+md5=59033388df36987d2b9c9bbf7e19bd57
+sha256=2cc10fee2b29add737e454eb634513135b34a638f7ca2b18364864fe089020dc
+
 [http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.33.tar.gz]
 md5=c7545bb05e0c2fc59174f0dc455c6519
 sha256=a65d064bee3e97c164d07a490692db0e73da8da10019ad9a89866706c93ae703
@@ -6402,6 +6410,10 @@ sha256=7848b7c1992ef202d54a5602904e7d7e190bce0195af69174baa79e741d07e87
 md5=3c8935efb9fdc7202720894279ad04a7
 sha256=5cdfe0c0919895e2ec87773c583cc6ebf2b84cba7617d5ec6cfd0150749e190f
 
+[http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.1.tar.gz]
+md5=2ff9924c7249ef7f736ecfe6f08f3f9b
+sha256=e3cef6028fe3efe7de3bcf4107c880eae50b3ee79841450d885467c09bcebf30
+
 [http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.5.tar.gz]
 md5=00bf95cdcbedfa7321d14e0133b31cdb
 sha256=217df8b36d848a85eb81ec6fa2a411e9bf186a747c2ddb223cb82b5001e4d80b
@@ -9966,6 +9978,10 @@ sha256=74d6088a6f7521c36b73550baa9dd0381505d66658f0bc01802aa2dfc7430fbc
 md5=97c606182f5e177eef70c1e8a55efc1f
 sha256=74d6088a6f7521c36b73550baa9dd0381505d66658f0bc01802aa2dfc7430fbc
 
+[http://downloads.sourceforge.net/inkscape/inkscape-0.46.tar.bz2]
+md5=59997096c3640b2601c2b4afba8a3d75
+sha256=f2ea624b98544b9d780bae1b5f042eae97bbd2779c7779ba21390b7bf6a9ca8e
+
 [http://www.geocities.co.jp/SiliconValley-Oakland/4550/inkwp-0.1.1.tar.gz]
 md5=a19896b756f1b29a33411a1fb2842c4b
 sha256=4afa4f4ddfdc40a32ef2c6034b2fa3bca415088b7eac4b7ad2b814202153f1e0
@@ -10478,6 +10494,10 @@ sha256=915ee6c4b8f1ffd5313d990875cd44e5e7092a51de259707daca797fd5c42b46
 md5=7965d33e47a7cc97c4084c2e9aa0bf82
 sha256=bc4f62cbac4716c2c1a25cf53b73343a03883964576d9dd590a9e4c7a70f465a
 
+[http://downloads.sourceforge.net/juce/juce_1_46.zip]
+md5=a746183ea41aebc27a0f771036f668e1
+sha256=1b8f50169bc2d827c6efe6bc98bbef2161f615219e4e8921e68227888fd50a9e
+
 [http://downloads.sourceforge.net/junit/junit-4.3.1-src.jar]
 md5=170f9645a41398388e8553b32ff5f630
 sha256=57d1e49ee3fd0dbdc0a68a852925c973af5c30b1725b6aa63bfb42df6f7c3349
@@ -11618,6 +11638,10 @@ sha256=d54efe38aad450363c46eaa32b1bf29cbd3b7f8c870c0ffcaec8891c22681eb0
 md5=76596823cc1a6d1cdf7779b782ff0ee6
 sha256=39e7c9f8644d1af310d076c1a5cc648040033e4724e7edfd85eb983ad88336d0
 
+[http://0pointer.de/lennart/projects/libdaemon/libdaemon-0.13.tar.gz]
+md5=ae9113fcd825d5a7f07e5ddccb3c3102
+sha256=bd949d459d2da54f1cdfbd1f4592e32541e8a195aca56fa7a8329ed79836d709
+
 [http://0pointer.de/lennart/projects/libdaemon/libdaemon-0.6.tar.gz]
 md5=5b83dd22fd72130cc4fdd46bd1a7fe8a
 sha256=1f918fc7c51e8de4b97aa3556b829a03ef7a06bd44c344a494326dc222785a6a
@@ -21242,6 +21266,10 @@ sha256=ef5e9bf276b65bb831f9c2554cd8784bd5b4ee65353808f82b7e2aef851587ec
 md5=3aa0e0e488719611f0bc4441b63a6f56
 sha256=f3aae7e2f67cf12f3da98325388c7b2f6718729aa69c5c804d1866d6a49f8592
 
+[http://alioth.debian.org/frs/download.php/2733/tuxmath_w_fonts-1.7.1.tar.gz]
+md5=4ab3d5bd74adb0d0aeacb721b8cac395
+sha256=d0aebfb352add3ada95537aeef163019f93d5a0f9385a2fcae678125b77d5035
+
 [http://heanet.dl.sourceforge.net/sourceforge/tuxnes/tuxnes-0.75.tar.gz]
 md5=5db0cd42dfdff3e681805e93b4867c43
 sha256=217fc57fdd2a5ec360c197ea36110ec929d3f27c88cf875f0f4723b3496ed7c2
@@ -21786,6 +21814,10 @@ sha256=a1cef2b1f56c46cf787af855c43468ff7dcb4acd4e253c85e302cd8bd37dbbac
 md5=c4e3d285ffacd6c5971788215588420b
 sha256=7f2f0492b0e1f9f96bd416e6c7a34e77c46faa20eeaff28c81c5932c91534ffc
 
+[http://download.gnome.org/sources/vala/0.5/vala-0.5.7.tar.bz2]
+md5=5e6c4ce07091725d9afdac7cf00e553c
+sha256=d0425be8572be85b8a7ae802a19bcb73fdeac74906f7bcbbc129697ea6a86f3a
+
 [http://www.valgrind.org/downloads/valgrind-3.2.1.tar.bz2]
 md5=9407d33961186814cef0e6ecedfd6318
 sha256=7f9a15d7be16ca03a0912191e8d55a486bf69690e11bb76ccece3eaff3730a33
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 062cba7ac6..27545cebde 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -181,6 +181,12 @@ PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
 ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
 require conf/distro/include/angstrom${ARM_ABI}.inc
 
+
+
+# If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run
+# We also take this opportunity to inject angstrom-version and the feed configs into the rootfs
+IPKG_VARIANT = "opkg-nogpg angstrom-version ${ANGSTROM_FEED_CONFIGS}"
+
 # do some task-base stuff here
 
 # We want to ship extra debug utils in the rootfs when doing a debug build 
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index 6182591d6a..3e816f7c58 100644
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@ -12,6 +12,8 @@ DISTRO_TYPE = "alpha"
 TARGET_ARCH ?= "armeb"
 ARM_INSTRUCTION_SET = "arm"
 TARGET_OS = "linux-gnueabi"
+IPKG_VARIANT ?= "opkg-nogpg-nocurl"
+IMAGE_INITSCRIPTS ?= "initscripts-slugos"
 
 require conf/distro/include/slugos.inc
 
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index 3160f80a6d..22f39f8fc7 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -83,6 +83,7 @@ do
                       bonjour \
                       camera-assistant \
                       cdparanoia \
+                      cdstatus \
                       checkers \
                       cherokee \
                       claws-mail \
diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh
index 62d4e1ec0c..1cbb1e2a70 100755
--- a/contrib/angstrom/build-release.sh
+++ b/contrib/angstrom/build-release.sh
@@ -77,7 +77,7 @@ do
 done	 
 
 # build kexecboot kernels for supported machines
-for machine in h2200 hx4700 c7x0 akita spitz poodle collie
+for machine in h2200 hx4700 c7x0 akita spitz poodle collie tosa
 do
 	BUILD_MACHINE=$machine
 	BUILD_TARGETS="linux-kexecboot"
diff --git a/packages/apache2/apache2-native_2.2.3.bb b/packages/apache2/apache2-native_2.2.3.bb
index 73f9b8baec..3ea987c718 100644
--- a/packages/apache2/apache2-native_2.2.3.bb
+++ b/