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

5 files changed, 18 insertions, 10 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 6ded5a9a5d..0b05edff44 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -21162,7 +21162,7 @@ sha256=489bb2f9fb69922e9befc27ae1b8d19d31c83c586f55b7ecc503cb4f5e767da4
 md5=6df271fd6a92d7641d7b060dedf7fec6
 sha256=7eedc4ece1c82668c06222ef85457206139253e24a50e5b5d2401a41baee28c1
 
-[http://www.dest-unreach.org/socat/download/socat-1.3.2.1.tar.bz2]
+[http://www.dest-unreach.org/socat/download/Archive/socat-1.3.2.1.tar.bz2]
 md5=860fe417ea5e9ca2d2b2225192b85b87
 sha256=ecfbca297c26eff6cb04c2c45af1ee5c21d4a123a05f8b056a1c81ffcdfa1e3a
 
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index bb9b75bece..1f7a5fdf5b 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -39,8 +39,8 @@ SRCREV_pn-dfu-util-native ?= "4160"
 SRCREV_pn-diversity-daemon ?= "571"
 SRCREV_pn-diversity-radar ?= "453"
 SRCREV_pn-eds-dbus ?= "736"
-SRCREV_pn-eglibc ?= "7467"
-SRCREV_pn-eglibc-initial ?= "7467"
+SRCREV_pn-eglibc ?= "8139"
+SRCREV_pn-eglibc-initial ?= "8139"
 SRCREV_pn-enlazar ?= "37"
 SRCREV_pn-essential-dialer ?= "60"
 SRCREV_pn-exalt ?= "79"
@@ -64,6 +64,14 @@ SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
 SRCREV_pn-fso-monitord ?= "0f64979a11d6263c7b7ed0e945a0889744f295f1"
 SRCREV_pn-fso-sounds ?= "3d2cf5231cb0e81770a246530574142bd2b8bbff"
 SRCREV_pn-fstests ?= "204"
+SRCREV_pn-gabriel ?= "38"
+SRCREV_pn-gabriel-native ?= "38"
+GCCREV ?= "145550"
+SRCREV_pn-gcc ?= ${GCCREV}
+SRCREV_pn-gcc-cross ?= ${GCCREV}
+SRCREV_pn-gcc-cross-initial ?= ${GCCREV}
+SRCREV_pn-gcc-cross-intermediate ?= ${GCCREV}
+SRCREV_pn-gcc-cross-sdk ?= ${GCCREV}
 SRCREV_pn-gconf-dbus ?= "641"
 SRCREV_pn-gnuradio ?= "10302"
 SRCREV_pn-gpe-conf ?= "9798"
@@ -235,7 +243,7 @@ SRCREV_pn-uclibc-initial ?= "25712"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
 SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b"
-SRCREV_pn-vala-native ?= "54a924505856a839ad02dc95baa482e994e94a57"
+SRCREV_pn-vala-native ?= "6cf030120cd7f6a76a5d766d7420aea847e02cfd"
 SRCREV_pn-webkit-gtk ?= "42127"
 SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
@@ -248,7 +256,7 @@ SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCREV ?= "39786"
+EFL_SRCREV ?= "39886"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 4e95fb15e4..8d1eb899de 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,6 +1,7 @@
 require conf/machine/include/tune-cortexa8.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
-MACHINE_KERNEL_PR = "r21" 
+# Increase this everytime you change something in the kernel
+MACHINE_KERNEL_PR = "r23" 
 
 KERNEL_IMAGETYPE = "uImage"
 
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 5ce1cdca6a..61b636bebb 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -10,8 +10,8 @@ ERASEBLOCKSIZE_akita = "0x20000"
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" 
 
-ZAURUS-UPDATER = "zaurus-updater"
-EXTRA_IMAGEDEPENDS += "${ZAURUS-UPDATER}"
+EXTRA_IMAGEDEPENDS += "zaurus-updater"
+KEXECBOOT_IMAGEDEPENDS = "zaurus-updater"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc
index df4e243eef..714380e9aa 100644
--- a/conf/machine/include/zaurus-clamshell.inc
+++ b/conf/machine/include/zaurus-clamshell.inc
@@ -3,9 +3,8 @@ include conf/machine/include/tune-xscale.inc
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
-
-LEGACY_IMAGEDEPENDS = "${ZAURUS-UPDATER} sharp-flash-header-c700"
 EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
+KEXECBOOT_IMAGEDEPENDS += "sharp-flash-header-c700"
 
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \
                    --output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \