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

9 files changed, 61 insertions, 22 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index a4483bcaeb..68301bc478 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -284,7 +284,9 @@ STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}"
 
 STAGING_DIR_SDK = "${STAGING_DIR}/${SDK_SYS}"
 
-DEPLOY_DIR = "${TMPDIR}/deploy"
+# Setting DEPLOY_DIR outside of TMPDIR is helpful, when you are using
+# packaged staging and/or multimachine.
+DEPLOY_DIR ?= "${TMPDIR}/deploy"
 DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar"
 DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk"
 DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm"
diff --git a/conf/checksums.ini b/conf/checksums.ini
index a206eb7443..c725f13c99 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1214,6 +1214,10 @@ sha256=e5ffecc423e2a9214cb4abd9dbd086552a0d45387b7bc2072738f5e2a8dd90ec
 md5=16748b2d6e318e0e2a25581005e1943a
 sha256=4d2d7a6b69b00ffe603a136a9df7ecda9f43448c7bc723503e76eaec9ab8e9fe
 
+[http://www.abiword.org/downloads/abiword/2.6.8/source/abiword-2.6.8.tar.gz]
+md5=fab04d8ef999c303f720197adf261310
+sha256=b6656a0da13d94b334f02637c89d8fe13aa54752040ad1b8f14f668d8cb96e93
+
 [http://www.abiword.org/downloads/abiword/2.5.1/source/abiword-plugins-2.5.1.tar.gz]
 md5=b1ce7ca49a0ee4e04f828e10eaebe6a9
 sha256=37faf6ea346c9b6473c5b2dfd1bb599457faa06b6a7cdef58e3e9f3e2773976b
@@ -1234,6 +1238,10 @@ sha256=d3ddfd3dbd20ed9bb35dceb06a55ec13d66acb1c3fce28976a8d10929c39a194
 md5=3bf973c5a1446ef3eaf980724821d6e9
 sha256=ec561e865387fa0a108ac135fc39ef0aa18e0dddd99f1f92749f67b029ba30eb
 
+[http://www.abiword.org/downloads/abiword/2.6.8/source/abiword-plugins-2.6.8.tar.gz]
+md5=421c49723e209c971ddb0798c1b313a9
+sha256=151517ae94e0f4c26370f31c903078bd0561b8088a63b532408ca128f0e65448
+
 [http://www.labyrinth.net.au/~trandor/abuse/files/abuse_sdl-0.7.0.tar.bz2]
 md5=59ea4498886642aa975f04233cc92558
 sha256=bda8a3c42733853444e1d4bee16e85990b78c2eaafc4b26e0769be2e14dab931
@@ -3035,8 +3043,8 @@ md5=a72d169e9545e26257032e0e367feb95
 sha256=fd4a64c6a83e07586de0360258162c5bf431f164b3980301185743e4029940df
 
 [http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-modprobe.patch]
-md5=6eeb6efcd71e57082d6654a9a6a368eb
-sha256=a02007661cf2f318a66468456f8fc8ae1177e12c3c66c59ff2de4d98863a388e
+md5=b2b9d0992b055816077ec9e0e4ee7775
+sha256=ba540cad8a029ff2eec7b078e31a308f408c074a13160aa7eba80f5ca18ee703
 
 [http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-tar.patch]
 md5=90d093817855bc63ad16fbb8524f80df
@@ -3946,7 +3954,7 @@ sha256=133caca2c4e7c64106555154ee0ff693f5cf5beb9421ce2eb86baee997d22368
 md5=d3912b9f7bf745fbfea68f6a9b9de30f
 sha256=133caca2c4e7c64106555154ee0ff693f5cf5beb9421ce2eb86baee997d22368
 
-[http://linux.duke.edu/projects/metadata/generate/createrepo-0.9.tar.gz]
+[http://createrepo.baseurl.org/download/createrepo-0.9.tar.gz]
 md5=0a1b1e67e3c61cda41b41a8886a90e78
 sha256=21786abe80f2c06eb9bef107d8c79f50a088a894cddf793112ce0417e83be531
 
@@ -5586,6 +5594,10 @@ sha256=7796adabf4514ba535ccd518bb377c839c098cd2a28ba46984a627b2e9382e26
 md5=87970d6784f536cde84f9bcbaaa52720
 sha256=6810168a3f2e20103d936513bce225dfcdda4bf1ae5f9f8042af47025c097cef
 
+[ftp://ftp.pl.debian.org/pub/debian/pool/main/f/fakeroot/fakeroot_1.12.1.tar.gz]
+md5=87970d6784f536cde84f9bcbaaa52720
+sha256=6810168a3f2e20103d936513bce225dfcdda4bf1ae5f9f8042af47025c097cef
+
 [ftp://ftp.us.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.12.1.tar.gz]
 md5=87970d6784f536cde84f9bcbaaa52720
 sha256=6810168a3f2e20103d936513bce225dfcdda4bf1ae5f9f8042af47025c097cef
@@ -5782,6 +5794,10 @@ sha256=0e9e771114a75c461e813538f129eb05a251b8fc6591a5563420700b8e312da0
 md5=ea5587e3c66d50b1503b82ac4179c303
 sha256=0e9e771114a75c461e813538f129eb05a251b8fc6591a5563420700b8e312da0
 
+[http://ffmpeg.org/releases/ffmpeg-0.5.tar.bz2]
+md5=be8503f15c3b81ba00eb8379ca8dcf33
+sha256=16de61d7426b1df7aee54b48c16aa728de1ed82f95db5fc4d8886d5d2702d90a
+
 [http://folks.o-hand.com/dodji/0xdeadbabe/ffmpeg_xine.tar.bz2]
 md5=e67e1c2eb134d2fba50a524188b6a3b4
 sha256=61ba89c0deaaf324485b2bf480fdb90941b74e2c47b4810e34f530b77005bb8c
@@ -7414,6 +7430,10 @@ sha256=9f769e8449c8cc1d8789ba987e446bdac3ed22671d71f946c973c7aadccc0b36
 md5=aa214a10d873b68ddd67cd9de2ccae55
 sha256=af1456e075954c122bda008736437b048d5336d0b426847c627e607eb35e59e5
 
+[http://ftp.gnome.org/pub/GNOME/sources/glib/2.20/glib-2.20.0.tar.bz2]
+md5=05188e560dbd8bddd568e24ce10dd003
+sha256=6fb4269a187bee6f7825c358fd6f0e0e99e6ad71f7f995ddcbfe9466ec8f6631
+
 [ftp://ftp.gtk.org/pub/gtk/v2.4/glib-2.4.6.tar.bz2]
 md5=a45db7d82480da431f6cd00ea041a534
 sha256=d2ca79bac06a625d9276b48492c2c1caccf7f8962f9b331b39796391013e72f2
@@ -9446,6 +9466,10 @@ sha256=516d981d1d696bb00a8c451fe928efd64ce0bd674ccc3024a0aefb292343231b
 md5=b693a2c1c2dd95457b87d0d042aa5bba
 sha256=efc277e87e3b7e0315eb3c2837fad6a06aab92b38e08fec6f30beb53e7e56e09
 
+[http://download.gnome.org/sources/gtk+/2.16/gtk+-2.16.0.tar.bz2]
+md5=139528802794287427fd4d18875b5cf5
+sha256=ff25cbf43dd5c5f8cddc1b2094505c1d079a576b873a6d3d6b62d95da1bdd1d7
+
 [http://handhelds.org/packages/gtk-2.0/gtk+-2.2.4.diff.bz2]
 md5=c6697665e06cad01e87c2cf8d0913725
 sha256=2a768a45adea587c4a7d6e3c3567ad7961bf7509e118ae62ce32f5369b1aeeb0
@@ -13590,6 +13614,10 @@ sha256=cafe6431f9e6d561fb7b396bf94ff73a9cd0f4279f3eea2fc714ab90e345eee6
 md5=00cea4539bea4bd34cbf8b82ff9589cd
 sha256=9bec729a1e77d8bbc5800b14aa81f09290aa18daa40f344103f2c0d1d681531b
 
+[http://libproxy.googlecode.com/files/libproxy-0.2.3.tar.gz]
+md5=86b635e1eb2d665cfbef4c6134fe6604
+sha256=59ded160b3547d29e37cc9d06359f7f37d94112214e4532430cd65e704c1339a
+
 [http://xcb.freedesktop.org/dist/libpthread-stubs-0.1.tar.bz2]
 md5=774eabaf33440d534efe108ef9130a7d
 sha256=004dae11e11598584939d66d26a5ab9b48d08a00ca2d00ae8d38ee3ac7a15d65
@@ -13794,6 +13822,10 @@ sha256=d98203f017c6e1de7dca2037c533000705fc86b12f29694ddb4db17854e5498a
 md5=118967f097a7e1e9d5023f1f06e0b65a
 sha256=30055988d990f0f4db4dcffd5088115f1065a6fd7c22b555686449628375376b
 
+[http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.26/libsoup-2.26.0.tar.bz2]
+md5=9df9d2b3304213641d3214a774d75ee1
+sha256=47b749b20717df24393c83adcce9a3a10f0690517c18da8d0a1ddcb410a0ac1d
+
 [http://ftp.gnome.org/pub/GNOME/sources/libsoup-2.4/2.4/libsoup-2.4.1.tar.bz2]
 md5=d0fc91ccb9da401e9e40d2f4612bdac9
 sha256=774094746748fb0c8985210de0994accdc7095c222fba42c5623e2137443b6cd
@@ -15782,6 +15814,10 @@ sha256=7861535eef2c0804dbdc6993db76574b4a812164bed7545a3697a3b97e36d2dd
 md5=5169ead6783f374cedf3f89bf399bd75
 sha256=a966641cf1b6e18e4f58aa3585a9a63905ed50252883804c006a3263674a32ec
 
+[http://goodies.xfce.org/releases/midori/midori-0.1.4.tar.bz2]
+md5=a9b21027ba894fed3055d7074c5f073d
+sha256=4a84422c270625162f6e9e1e4e8151d9546457d64c61c2b3c896cbf43fb54ce5
+
 [http://git.xfce.org/kalikiana/midori/snapshot/midori-f30dff433056e239ca775d16f343bdb249f1a338.tar.bz2]
 md5=24f6c176246300b66c036de65fed0565
 sha256=6151809d337ea8d07769618acd4ac470c5ccd310790e40805b93cf8781904048
@@ -18119,8 +18155,8 @@ md5=e4e6155530a23ea0ea4ca59f8c5fda8c
 sha256=e86a0a81ce1b989a4d06e0c07d64e1fcbba2456fa8e22ae24f333f186f3fc663
 
 [http://gpephone.linuxtogo.org/download/gpephone/phoneserver-1.0/phoneserver-1.0.tar.bz2]
-md5=195b684e025ff5c15617d6f757cf631f
-sha256=e14546d11e899e7e9f06ca58979fee14b273d53c637eb268d7c6fe3bf78d564d
+md5=6f6450c4e762059e790216b15b5930e6
+sha256=a1f05eba12369fb8bafb53559ae5ab2855ab1e83746049a100ce5a6d69bec2a6
 
 [http://de3.php.net/distributions/php-4.4.4.tar.bz2]
 md5=bc6fa8908e2ac36e93bab9f7d42cda3a
@@ -20999,8 +21035,8 @@ md5=a362dc3f5f23d785990917103c76a43d
 sha256=084f8286eb945455f3f1567c0a7e7df3a759f2a4e1aab3b881b8ef1bda5bdb21
 
 [http://gpephone.linuxtogo.org/download/gpephone/soundserver-1.0/soundserver-1.0.tar.bz2]
-md5=95a2346791fb461d570808369ac5a2bb
-sha256=0b1009cd6bb5a345be3fe69048b23c8f3248a86340832861f0ffda9e368a6015
+md5=14cbf40e5c6ba1ac05a9309d392326fc
+sha256=2cd45d30fcf862f65d3d9a096e69df1e6520920b01cc35fe66e1f21799645614
 
 [http://mutab0r.chat.ru/soundtracker-0.6.7.gtk2.tar.bz2]
 md5=e10563187f49d9f39d360d4c59de6c6c
@@ -23059,8 +23095,8 @@ md5=511ffbc8ed8d9df82e7c67852164728c
 sha256=ee1faf72ef745a7d96e44cb4797d92a8cd2c9e290dfe602fae0fd955a11d4f3a
 
 [http://gpephone.linuxtogo.org/download/gpephone/voicecall-0.1/voicecall-0.1.tar.gz]
-md5=c775c0663a5c499d3f2ac23602e98426
-sha256=52f8a7087960aa8845941d08d4fe58c29670c374fbeccd722dd5fbfe995fb89c
+md5=7fa731310c2f5e334ca4eba9c5482965
+sha256=f6ddc993d4890b9500a63345f76acd3eb4a04a9190fcd055f323319627bf104e
 
 [http://www.wirelessdefence.org/Contents/Files/void11-0.2.0.tar.bz2]
 md5=1c5b3e3e70916de74c2932c7f3e46d9e
diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
index 6de3c82a38..d0b3a77d08 100644
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -3,6 +3,7 @@ SRCREV_pn-dbus-hlid = "${AUTOREV}"
 SRCREV_pn-frameworkd = "${AUTOREV}"
 SRCREV_pn-frameworkd-devel = "${AUTOREV}"
 SRCREV_pn-fsod = "${AUTOREV}"
+SRCREV_pn-fsodeviced = "${AUTOREV}"
 SRCREV_pn-fso-abyss = "${AUTOREV}"
 SRCREV_pn-fso-apm = "${AUTOREV}"
 SRCREV_pn-fso-gsm0710muxd = "${AUTOREV}"
@@ -11,6 +12,8 @@ SRCREV_pn-fso-monitord = "${AUTOREV}"
 SRCREV_pn-fso-sounds = "${AUTOREV}"
 SRCREV_pn-gsmd2 = "${AUTOREV}"
 SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}"
+SRCREV_pn-libeflvala = "${AUTOREV}"
+SRCREV_pn-libfsoframework = "${AUTOREV}"
 SRCREV_pn-libframeworkd-glib = "${AUTOREV}"
 SRCREV_pn-libgsm0710 = "${AUTOREV}"
 SRCREV_pn-libgsm0710mux = "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index e0b8dba733..87e9204e45 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -141,7 +141,7 @@ SRCREV_pn-osb-browser ?= "125"
 SRCREV_pn-osb-jscore ?= "117"
 SRCREV_pn-osb-nrcit ?= "125"
 SRCREV_pn-osb-nrcore ?= "126"
-SRCREV_pn-openezx-kernel ?= "cd10215486503506f53667d69958cc547a510cce"
+SRCREV_pn-openezx-kernel ?= "87c2ff2531fd4a5f6799a80b339859dd3ebf4191"
 SRCREV_pn-openmoko-agpsui ?= "7"
 SRCREV_pn-openmoko-alsa-scenarios ?= "4732"
 SRCREV_pn-openmoko-appearance ?= "3262"
@@ -232,9 +232,7 @@ SRCREV_pn-uclibc-initial ?= "24279"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
 SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b"
-SRCREV_pn-webkit-gtk ?= "40814"
-SRCREV_pn-webkit-qt ?= "28656"
-SRCREV_pn-webkit-qtopia ?= "28656"
+SRCREV_pn-webkit-gtk ?= "41827"
 SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
 SRCREV_pn-wmiconfig ?= "4522"
diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc
index b261d635af..f70e98ee17 100644
--- a/conf/distro/include/sane-toolchain.inc
+++ b/conf/distro/include/sane-toolchain.inc
@@ -117,9 +117,6 @@ TARGET_CC_ARCH_pn-cairo_armv5te = "-march=armv4t"
 # Can be "glibc", "eglibc" or "uclibc"
 PREFERRED_LIBC ?= "glibc"
 PSTAGE_EXTRAPATH = "${PREFERRED_LIBC}"
-
-CACHE = "${TMPDIR}/cache/${PREFERRED_LIBC}/${MACHINE}"
-DEPLOY_DIR = "${TMPDIR}/deploy/${PREFERRED_LIBC}"
 require conf/distro/include/sane-toolchain-${PREFERRED_LIBC}.inc
 
 # Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index 196018b431..56724446cf 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -57,6 +57,8 @@ IPKG_VARIANT = "opkg-nogpg"
 #############################################################################
 # Name the generated images in a sane way
 IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${PREFERRED_LIBC}-${PREFERRED_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}"
+CACHE ?= "${TMPDIR}/cache/${PREFERRED_LIBC}/${MACHINE}"
+DEPLOY_DIR ?= "${TMPDIR}/deploy/${PREFERRED_LIBC}"
 DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
 
 #############################################################################
@@ -99,8 +101,8 @@ require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
 #############################################################################
 
 # Ship extra debug utils in the rootfs when doing a debug build 
-DEBUG_APPS ?= ""
-DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "task-cli-tools-debug",d)}'
+DISTRO_EXTRA_APPS ?= ""
+DISTRO_EXTRA_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "task-cli-tools-debug",d)}'
 
 # Additional content I (only valid if you include task-base)
 # distro-feed-configs: configuration files for the online feeds
@@ -110,6 +112,7 @@ DISTRO_EXTRA_RDEPENDS += "\
   distro-feed-configs \
   util-linux-ng-mount util-linux-ng-umount \
   angstrom-libc-fixup-hack \
+  ${DISTRO_EXTRA_APPS} \
 "
 
 # Additional content II (can be masked with BAD_RECOMMENDS)
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 36407b015d..022d65d4c2 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -23,7 +23,7 @@
 DL_DIR = "${HOME}/sources"
 
 # Delete the line below. Then specify which .bb files to consider for
-# your build. Typically this will be something like BBFILES = "/path/to/openembedded/packages/*/*.bb"
+# your build. Typically this will be something like BBFILES = "/path/to/openembedded/recipes/*/*.bb"
 BBFILES := "${@bb.fatal('Edit your conf/local.conf: BBFILES')}"
 
 # Use the BBMASK below to instruct BitBake to _NOT_ consider some .bb files
diff --git a/conf/machine/dm355-leopard.conf b/conf/machine/dm355-leopard.conf
index a9699499b7..5131488577 100644
--- a/conf/machine/dm355-leopard.conf
+++ b/conf/machine/dm355-leopard.conf
@@ -13,7 +13,7 @@ UBOOT_ENTRYPOINT = "0x80008000"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
 
-MACHINE_FEATURES = "kernel26 alsa"
+MACHINE_FEATURES = "kernel26 alsa ethernet usbhost usbgadget mmc"
 
 require conf/machine/include/tune-arm926ejs.inc
 
diff --git a/conf/machine/wrap.conf b/conf/machine/wrap.conf
index 92720043f2..1fc75ebe94 100644
--- a/conf/machine/wrap.conf
+++ b/conf/machine/wrap.conf
@@ -5,7 +5,7 @@
 TARGET_ARCH = "i486"
 PACKAGE_EXTRA_ARCHS = "i386 x86"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-wrap-geode"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
 # Serial console settings for sysvinit