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

8 files changed, 81 insertions, 34 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 1151f4cc68..0886587edc 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -565,11 +565,11 @@ FETCHCMD_bzr = "/usr/bin/env bzr"
 FETCHCMD_hg = "/usr/bin/env hg"
 
 FETCHCOMMAND = "ERROR, this must be a BitBake bug"
-FETCHCOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} ${URI}"
+FETCHCOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'"
 FETCHCOMMAND_cvs = "/usr/bin/env 'PATH=${PATH}' cvs '-d${CVSROOT}' co ${CVSCOOPTS} ${CVSMODULE}"
 FETCHCOMMAND_svn = "/usr/bin/env svn co ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}"
 RESUMECOMMAND = "ERROR, this must be a BitBake bug"
-RESUMECOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -c -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} ${URI}"
+RESUMECOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -c -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'"
 UPDATECOMMAND = "ERROR, this must be a BitBake bug"
 UPDATECOMMAND_cvs = "/usr/bin/env 'PATH=${PATH}' cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}"
 UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 70346bf92c..0a63d0c752 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -11830,22 +11830,6 @@ sha256=48d93ef10f17cffe1ecbfec3078932ae48e08e3c172437e4bdfb22ae87d25421
 md5=4a04df0d971a8952fb395b6eb0bc8dab
 sha256=48d93ef10f17cffe1ecbfec3078932ae48e08e3c172437e4bdfb22ae87d25421
 
-[ftp://ftp.debian.org/debian/pool/main/g/gzip/gzip_1.3.5.orig.tar.gz]
-md5=3d6c191dfd2bf307014b421c12dc8469
-sha256=631820e566353eafc4bdc0d9d8221c26c7ef6b5d10a254783dbe9bcac88caa07
-
-[ftp://ftp.nl.debian.org/debian/pool/main/g/gzip/gzip_1.3.5.orig.tar.gz]
-md5=3d6c191dfd2bf307014b421c12dc8469
-sha256=631820e566353eafc4bdc0d9d8221c26c7ef6b5d10a254783dbe9bcac88caa07
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/g/gzip/gzip_1.3.5.orig.tar.gz]
-md5=3d6c191dfd2bf307014b421c12dc8469
-sha256=631820e566353eafc4bdc0d9d8221c26c7ef6b5d10a254783dbe9bcac88caa07
-
-[ftp://ftp.us.debian.org/debian/pool/main/g/gzip/gzip_1.3.5.orig.tar.gz]
-md5=3d6c191dfd2bf307014b421c12dc8469
-sha256=631820e566353eafc4bdc0d9d8221c26c7ef6b5d10a254783dbe9bcac88caa07
-
 [http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/h1940_batt.patch]
 md5=2810d6a0aa41a349faf711bfc9facf14
 sha256=0d68bfb125997599470dbc4822d43e777a831da2f1cfa5356b5dc791cdd8b27f
@@ -18050,10 +18034,6 @@ sha256=b1f136a1d89daa4b1b9711eb81ad120b53c9357d159f262021b84ef8c9d128be
 md5=b5ce6a74abc9b9eb2af94dffdfd372a4
 sha256=c28b36b14bddb014d9e9c97c52459852f97bd405f89113f30bee45ed92728ff1
 
-[http://www.lysator.liu.se/~nisse/archive/lsh-1.5.5.tar.gz]
-md5=a2b1ff6f5dcca6968516b5557c2e7ce7
-sha256=d1c10ca755db2f5fa8aa7c8ef2770d205a9bb9e5a6ed7272a5dda942647df4be
-
 [ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.77.tar.bz2]
 md5=7b0de0d1283f2d86407a98e5c2f05f04
 sha256=fe6fde629a97a2855e608cd6ae1f89e66ae42d7045499b1a6faca5cfb50f5f3b
@@ -25630,14 +25610,6 @@ sha256=ba8c492c1b2033d4e2131f05df9e3780d4bc35bea87aa32a6052dd53a814e288
 md5=e9449fcee97e6a8ed73934c883c870e0
 sha256=95e7b7470e04f22c3ec8dc6d0b1fdd8944306cb5313c84c4545cd83abada26d0
 
-[http://downloads.sourceforge.net/streamripper/streamripper-1.61.10.tar.gz]
-md5=2d62a4546521980e1ed705a5094a6ec3
-sha256=08ca63620c1c071f4b2d42c5f63f38cee920aa57cde151ac3cfcf344437e3f11
-
-[http://heanet.dl.sourceforge.net/streamripper/streamripper-1.61.10.tar.gz]
-md5=2d62a4546521980e1ed705a5094a6ec3
-sha256=08ca63620c1c071f4b2d42c5f63f38cee920aa57cde151ac3cfcf344437e3f11
-
 [http://downloads.sourceforge.net/streamripper/streamripper-1.61.3.tar.gz]
 md5=57cd09098917bda29f841d366649681c
 sha256=1747aee9fa4cc09b49e0fb14baace3293f8f870c0de27fd3550cde21d99e9cd7
diff --git a/conf/collections.inc b/conf/collections.inc
index 6a0f41fd78..0572568f06 100644
--- a/conf/collections.inc
+++ b/conf/collections.inc
@@ -10,7 +10,7 @@
 # supported format will be unpacked into COLLECTIONS_UNPACKDIR and used from
 # there.
 
-COLLECTIONS = "${@' '.join(d.getVar('BBPATH', 1).split(':'))}"
+COLLECTIONS ?= "${@' '.join(d.getVar('BBPATH', 1).split(':'))}"
 COLLECTIONS_UNPACKDIR = "${TMPDIR}/collections"
 
 COLLECTIONINFO = "${@get_collection(d.getVar('FILE', 1), d)}"
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index fe278925bd..f3874192bb 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -44,7 +44,7 @@ PREFERRED_VERSION_qt4-x11-free = "${ANGSTROM_QT_VERSION}"
 PREFERRED_VERSION_qt4-x11-free-gles = "${ANGSTROM_QT_VERSION}"
 
 PREFERRED_VERSION_samba		= "3.3.9"
-PREFERRED_VERSION_tiff 		= "3.8.2+4.0.0beta2"
+PREFERRED_VERSION_tiff 		= "3.9.2+4.0.0beta5"
 
 PREFERRED_VERSION_udev 		= "151"
 PREFERRED_VERSION_udev_libc-uclibc = "141"
@@ -52,6 +52,7 @@ UDEV_GE_141 = "1"
 
 PREFERRED_VERSION_usbutils = "0.86"
 PREFERRED_VERSION_wpa-supplicant = "0.6.9"
+PREFERRED_VERSION_wget = "1.11.4"
 PREFERRED_VERSION_xserver-common = "1.32"
 PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
 
diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
index cd258640fb..cb02400e2f 100644
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -1,4 +1,5 @@
 # FSO
+SRCREV_pn-android-image-utils-native = "${AUTOREV}"
 SRCREV_pn-dbus-hlid = "${AUTOREV}"
 SRCREV_pn-frameworkd = "${AUTOREV}"
 SRCREV_pn-frameworkd-devel = "${AUTOREV}"
@@ -21,6 +22,7 @@ SRCREV_pn-fso-specs = "${AUTOREV}"
 SRCREV_pn-gsmd2 = "${AUTOREV}"
 SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}"
 SRCREV_pn-libascenario = "${AUTOREV}"
+SRCREV_pn-libeflvala = "${AUTOREV}"
 SRCREV_pn-libfsobasics = "${AUTOREV}"
 SRCREV_pn-libfsoframework = "${AUTOREV}"
 SRCREV_pn-libfsoresource = "${AUTOREV}"
@@ -45,3 +47,5 @@ SRCREV_pn-vala-dbus-binding-tool = "${AUTOREV}"
 SRCREV_pn-vala-native = "${AUTOREV}"
 SRCREV_pn-vala = "${AUTOREV}"
 SRCREV_pn-zhone = "${AUTOREV}"
+SRCREV_pn-zhone2 = "${AUTOREV}"
+
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index 2ff99cb370..b018b99678 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -24,7 +24,7 @@ SRCREV_pn-mterm2 ?= "${FSO_CORNUCOPIA_SRCREV}"
 
 # FSO Projects -- Misc
 SRCREV_pn-dbus-hlid ?= "5df7f49fe8881804aaab544a569fd164c3e93afb"
-SRCREV_pn-frameworkd ?= "aaca0006f07eb4b76f38e1cb8df1c968a32db989"
+SRCREV_pn-frameworkd ?= "0039f8cd21ce007ac20de8f4525ad7c6e96804c0"
 SRCREV_pn-frameworkd-config-shr_FSO_REV ?= ${SRCREV_pn-frameworkd}
 SRCREV_pn-fso-gpsd ?= "39e810899110a9bb302cf2064e1c0f73541fb4e6"
 SRCREV_pn-fso-gsm0710muxd ?= "1d69fb5b666ac2a9e54e46978c7afa8fe5dfc3c9"
@@ -33,7 +33,7 @@ SRCREV_pn-fso-sounds ?= "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815"
 SRCREV_pn-fso-specs ?= "bd8a5d1cf461c6633ddc8f4c91a1101ec835faad"
 SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8"
 SRCREV_pn-libfso-glib ?= "a1f2f14946ad154c5fb842fadf081fe377bd9924"
-SRCREV_pn-libframeworkd-glib ?= "67e300e32f4b546ba23163109cbab68be8c70ce9"
+SRCREV_pn-libframeworkd-glib ?= "1b4c0e21a6fec2c1952deb2bfeb2d85b924c3c36"
 SRCREV_pn-libgsm0710 ?= "52eea64bdbb79c09002b46e98a5e656509884f72"
 SRCREV_pn-libpersistence ?= "217ad803745f8ac1f3c72c6715e2c0faefb3fd06"
 FSO_PYTHONHELPERS_SRCREV ?= "63b1dff1bc8ac22efabcee8a90e957c3b2423317"
diff --git a/conf/machine/bug20.conf b/conf/machine/bug20.conf
new file mode 100644
index 0000000000..dbc1faf6ea
--- /dev/null
+++ b/conf/machine/bug20.conf
@@ -0,0 +1,47 @@
+#@TYPE: Machine
+#@NAME: BUG 2.0
+#@DESCRIPTION: Machine configuration for the BUG 2.0 board (OMAP3530 based)
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+           xserver-xorg-extension-dri \
+           xserver-xorg-extension-glx \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-video-omapfb \
+           xf86-input-keyboard"
+
+# Only has DVI connector for external screen
+GUI_MACHINE_CLASS = "bigscreen"
+
+require conf/machine/include/omap3.inc
+
+# this kernel is not provided in OE yet
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap-hah"
+
+IMAGE_FSTYPES += "tar.bz2"
+
+SERIAL_CONSOLE = "115200 ttyS2"
+
+UBOOT_MACHINE = "omap3_bug_config"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    129024 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 1996 LEBs
+MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
+
+PREFERRED_VERSION_u-boot = "git"
+
+# and sdio
+MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa"
diff --git a/conf/machine/p2020ds.conf b/conf/machine/p2020ds.conf
new file mode 100644
index 0000000000..996a3becc0
--- /dev/null
+++ b/conf/machine/p2020ds.conf
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@Name: P2020ds
+#@DESCRIPTION: Machine configuration for the freescale p2020ds development board
+
+TARGET_ARCH = "powerpc"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux"
+
+MACHINE_FEATURES = "kernel26 usbhost pci ext2 vfat nfs uboot"
+
+KERNEL_IMAGETYPE = "uImage"
+UBOOT_ENTRYPOINT = "0"
+
+UBOOT_MACHINE = "P2020DS_config"
+
+# Need to create jffs2 images with the correct endianess
+EXTRA_IMAGECMD_jffs2 = " --big-endian -e 0x20000"
+
+#don't try to access tty1
+USE_VT = "0"
+
+#setup serial console on Com1
+SERIAL_CONSOLE = "-L 115200 ttyS0"