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

6 files changed, 84 insertions, 4 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 6c2924278b..9964dc783d 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -250,6 +250,10 @@ sha256=cbf94eb10e9c305c81b24e298e55c7825df5ab9060d82443f7b9734f760f859d
 md5=e7df079ff44ec98187c24a00500e597a
 sha256=aa9d532ec4481a3c9f7b3298b1786a84825a3474b714690b901d0617743d8221
 
+[http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-1.4.2.tar.gz]
+md5=e4376c6c5b8e27d735edb7f62a7a8e86
+sha256=051847e21e88a9c32ee78f8920014602d8b21928602075c5266433cd58addbc6
+
 [http://www.directfb.org/downloads/Extras/DirectFB-examples-0.9.25.tar.gz]
 md5=835e850fddba8d8214d39ddd0646c3e8
 sha256=f83af60d53ab4319e5d71a4459cc10464ffd683efabacd6bd773bb807f8771fa
@@ -3682,6 +3686,10 @@ sha256=e9c6feee2a626a38cd69c726ed31ffbbf55d288386f50fe6f90fa63de410d67a
 md5=9f1876232bdfdfa5b4e02ff0636e7241
 sha256=701721a58aa79b93a4f3aaf633f0b842a05b07c73996cd44e78a383a7387226d
 
+[http://www.cherokee-project.com/download/0.99/0.99.24/cherokee-0.99.24.tar.gz]
+md5=5afed8bdd6020dc5bf0ba9ec83b947f1
+sha256=0581b5eafba9a993d035467c51bfa85fa76ca46043fab95e6f7592ad8f4f38e1
+
 [http://www.call-with-current-continuation.org/chicken-2.6.tar.gz]
 md5=332edae079bb34d815369f4ba5181983
 sha256=32385c5393c7376035f911f3e887351b1ce8fb6e56498cc4258815bc6db06326
@@ -8274,6 +8282,10 @@ sha256=d094028bc6d6691f56b4efeff7cd7e1c7ca10733e0cb5efc36e8fb08d8324bf1
 md5=eaeb8527b8fa286c2d887157214f9998
 sha256=3e481996259af87c3581da23481970a27de679e3c87cfa9a5a59751cd20c7b44
 
+[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-2.9.tar.bz2]
+md5=7d5d86031cb15403e4d246658209ee81
+sha256=824c97b83f1ec2894ee0e824db6d542c40b978d2f6c4364c7411777e44b15a64
+
 [ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.16/glibmm-2.16.2.tar.bz2]
 md5=408054366f0acc01014f4c4af2304da5
 sha256=f033f6f39c32fc17ecce63087e41408671a3a43d698c83de2528af3fc7276d28
@@ -10350,6 +10362,10 @@ sha256=ff25cbf43dd5c5f8cddc1b2094505c1d079a576b873a6d3d6b62d95da1bdd1d7
 md5=d666f9f5a544e9d4d45804d88b1b5c4d
 sha256=afcdc5b67974054b111a4c283641303647d1ffa5677ffb8c4ce8621f12e17f88
 
+[http://download.gnome.org/sources/gtk+/2.16/gtk+-2.16.6.tar.bz2]
+md5=416412b336d9f3b6b78ca887395d1726
+sha256=18e0f9792028e6cc5108447678f17d396f9a2cdfec1e6ab5dca98cb844f954af
+
 [http://handhelds.org/packages/gtk-2.0/gtk+-2.2.4.diff.bz2]
 md5=c6697665e06cad01e87c2cf8d0913725
 sha256=2a768a45adea587c4a7d6e3c3567ad7961bf7509e118ae62ce32f5369b1aeeb0
@@ -15114,6 +15130,10 @@ sha256=afcedda15bde2395dec31a82a243871a0540ea2e13e7a14d15846ad0c1f09a7b
 md5=c9b676621f1b89245ec5cec0c67198b7
 sha256=4d67aa8d2d3c719b67bde58ca3b8a94aa1d172bc242672401d7f3d22685065b9
 
+[http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.27/libsoup-2.27.91.tar.bz2]
+md5=58e5518a483fbef0b72f142e63f43e9f
+sha256=b39fd86e555cc530ec587db8860b084e95555e044c0cf8b213e636aff043e4f3
+
 [http://ftp.gnome.org/pub/GNOME/sources/libsoup-2.4/2.4/libsoup-2.4.1.tar.bz2]
 md5=d0fc91ccb9da401e9e40d2f4612bdac9
 sha256=774094746748fb0c8985210de0994accdc7095c222fba42c5623e2137443b6cd
@@ -20250,6 +20270,10 @@ sha256=cc60000bbe5f4d7b9beae8a84e1cd1ba69339a489a7d1a7365a3d8fe8fd73d6b
 md5=3498f5983c683c3a57dce7379a722082
 sha256=70e7cc53e5fbade5e447bda9f0ca12f2153bf426e074dbac3a2e97adf46180f2
 
+[http://www.lesswatts.org/projects/powertop/download/powertop-1.8.tar.gz]
+md5=38fd8a6825cd62b6c22df8a44b4e27d0
+sha256=7325ea46e5af59c12ea024e69622ac7753010c8de615d668e1f03b0fc05bad3a
+
 [http://www.linuxpowertop.org/download/powertop-1.8.tar.gz]
 md5=38fd8a6825cd62b6c22df8a44b4e27d0
 sha256=7325ea46e5af59c12ea024e69622ac7753010c8de615d668e1f03b0fc05bad3a
@@ -25170,6 +25194,10 @@ sha256=ac091ba9b2e2e9aff293969b3405b145c09789e59ac0caab2247211a19e09a8a
 md5=8ffa2ff763badd5de7592004d8d69a63
 sha256=197c29803790efc0273bb4577d54629d0769a3b49b091c6430eb6704fd69824f
 
+[http://www.lavrsen.dk/foswiki/pub/Motion/VideoFourLinuxLoopbackDevice/vloopback-1.2.tar.gz]
+md5=1b63bf5b3d2b7fae63497d285789aec5
+sha256=d5af0c07aa53a6c93e92a6dd83f34dd9a08a05a0c0169c8ca8b15b023fdadf80
+
 [http://194.213.43.198/vmedit/vmedit-0.02.tar.gz]
 md5=7550ea1dd951d2f7fb1a54caa88860b2
 sha256=bca8b0073d9527c0293b831c9b8d8f89fc3dc7b5ab30898e7b748843af07a978
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 32cfbfb403..0c0c83117e 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -11,7 +11,7 @@ PREFERRED_VERSION_glib-2.0-native = "2.18.0"
 PREFERRED_VERSION_glibmm = "2.18.0"
 PREFERRED_VERSION_glproto	= "1.4.9"
 PREFERRED_VERSION_gst-pulse 	= "0.9.7"
-PREFERRED_VERSION_gtk+		= "2.16.4"
+PREFERRED_VERSION_gtk+		= "2.16.6"
 PREFERRED_VERSION_gtkmm		= "2.14.1"
 PREFERRED_VERSION_hal		= "0.5.13"
 PREFERRED_VERSION_libgemwidget	= "1.0"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index b88ac9bc8c..e3400a213b 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -86,6 +86,7 @@ SRCREV_pn-libexalt-dbus ?= "76"
 SRCREV_pn-libfakekey ?= "1455"
 SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f"
 SRCREV_pn-libgsmd ?= "4505"
+SRCREV_pn-libgee ?= "ea130c0837eefe404b53240f8c2ed642ae98a677"
 SRCREV_pn-libiac ?= "1590"
 SRCREV_pn-libjana = "749"
 SRCREV_pn-libmokogsmd2 ?= "4334"
diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc
index 65cb7763d1..e2c6740e52 100644
--- a/conf/distro/include/sane-toolchain.inc
+++ b/conf/distro/include/sane-toolchain.inc
@@ -5,7 +5,7 @@
 #############################################################################
 
 # Base line versions, good for most things
-PREFERRED_GCC_VERSION                ?= "4.2.4"
+PREFERRED_GCC_VERSION                ?= "4.4.1"
 PREFERRED_BINUTILS                   ?= "2.18"
 
 # Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
@@ -19,9 +19,9 @@ PREFERRED_VERSION_uclibc-initial    ?= "0.9.30.1"
 # Some systems need a special gcc version
 PREFERRED_GCC_VERSION_486sx          ?= "4.3.2"
 PREFERRED_GCC_VERSION_avr32          ?= "4.2.2"
-PREFERRED_GCC_VERSION_armv7a         ?= "4.3.1" 
+PREFERRED_GCC_VERSION_armv7a         ?= "4.4.1" 
 PREFERRED_GCC_VERSION_bfin           ?= "4.1.2"
-PREFERRED_GCC_VERSION_ppc405         ?= "4.1.1"
+PREFERRED_GCC_VERSION_ppc405         ?= "4.4.1"
 PREFERRED_GCC_VERSION_xilinx-ml403   ?= "4.1.1"
 PREFERRED_GCC_VERSION_xilinx-ml403   ?= "4.1.1"
 
diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf
index aca4a18caf..67e3aff3ca 100644
--- a/conf/distro/micro.conf
+++ b/conf/distro/micro.conf
@@ -61,6 +61,7 @@ MACHINE_KERNEL_VERSION = "2.6"
 # TOOLCHAIN
 #############################################################################
 LIBC ?= "eglibc"
+PREFERRED_BINUTILS = "2.19.51"
 require conf/distro/include/sane-toolchain.inc
 
 #############################################################################
diff --git a/conf/machine/omap3517-evm.conf b/conf/machine/omap3517-evm.conf
new file mode 100644
index 0000000000..4bbd25c718
--- /dev/null
+++ b/conf/machine/omap3517-evm.conf
@@ -0,0 +1,50 @@
+#@TYPE: Machine
+#@NAME: omap3 EVM
+#@DESCRIPTION: Machine configuration for the TI omap3517 EVM
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-input-tslib \
+           xf86-video-omapfb \
+           xf86-input-keyboard"
+
+GUI_MACHINE_CLASS = "smallscreen"
+
+require conf/machine/include/omap3.inc
+
+# Ship all kernel modules
+MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules kernel-modules"
+
+IMAGE_FSTYPES ?= "jffs2 tar.bz2"
+EXTRA_IMAGECMD_jffs2 = "-lnp "
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp"
+
+UBOOT_ARCH = "arm"
+UBOOT_MACHINE = "omap3517_evm_config"
+XLOAD_MACHINE = "omap3517evm_config"
+
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen ethernet"
+
+# NOTE: there are NAND and OneNAND versions of this board...
+
+# 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"
+