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

5 files changed, 27 insertions, 14 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index b2bc05b06f..9c4bc7c608 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -298,10 +298,6 @@ sha256=c54e779a720841126e23d692de85243e23b0d94fb7792a958b96b5bd097a8b85
 md5=ce018f681b469a1d72ffc32650304b98
 sha256=830a1bd6775d8680523596a88a72fd8e4c6a74bf886d3e169b06d234a5cf7e3e
 
-[http://www.diskohq.org/downloads/disko-1.6.0.tar.gz]
-md5=c63bad58524501e367af9842f510b458
-sha256=fe578299be4031d0c2454ff4fd3b3034e332260b9695687adf27a776a61eb2e4
-
 [http://media.djangoproject.com/releases/1.0.2/Django-1.0.2-final.tar.gz]
 md5=89353e3749668778f1370d2e444f3adc
 sha256=50a5d228743a69a682899b20141194bf8fd3fd75eaf33ba5f2932f43ea93ea0d
@@ -5406,6 +5402,10 @@ sha256=847d1db31bd68ab9ab94b642b0cd40ac8d3cf816900f5d5652124986601df1e9
 md5=066bd39d80f286ae5ce69a2adbbd01e4
 sha256=f0be78d2c2f0279cce26b0b2e87077bfe568f1da189eef2daec78b1e12699c4e
 
+[http://www.diskohq.org/downloads/disko-1.6.0.tar.gz]
+md5=c63bad58524501e367af9842f510b458
+sha256=fe578299be4031d0c2454ff4fd3b3034e332260b9695687adf27a776a61eb2e4
+
 [http://distcc.samba.org/ftp/distcc/distcc-2.11.tar.bz2]
 md5=f3458779c13255d88ee89ea7ccddda29
 sha256=00ca6747501d1b6034398ba5482dcb1e7cf3aff8739fbff0c72e58602d68774c
@@ -26070,13 +26070,17 @@ sha256=7b08bb8a98ad8a06e2cafda05ab21f2a69b2d64252dfc9435c93094d979e7c5a
 md5=75c74b9c8df7c83c8e3c3068fff08a82
 sha256=5fbd4053a4eb01b814799855e35a3c01743f98acf9fcd167522e6484a2edd7b7
 
+[ftp://elsie.nci.nih.gov/pub/tzdata2009p.tar.gz]
+md5=e401e284512be17f5cf63ee52e4f3284
+sha256=7182ad6f03bfe16ccdbac4a3efb9e765ea7c51afc33c3a7fefb053122aa6da2c
+
 [ftp://elsie.nci.nih.gov/pub/tzdata2009r.tar.gz]
 md5=c38d977a3f9f4d4646cab902554c519e
 sha256=684d23e3ebe825c9db90732534446f4e33f5ad4455980b15fd9eb2e4ba5a6731
 
-[ftp://elsie.nci.nih.gov/pub/tzdata2009p.tar.gz]
-md5=e401e284512be17f5cf63ee52e4f3284
-sha256=7182ad6f03bfe16ccdbac4a3efb9e765ea7c51afc33c3a7fefb053122aa6da2c
+[ftp://elsie.nci.nih.gov/pub/tzdata2009s.tar.gz]
+md5=3cd8038d7bbfb3a4ac544aceef724853
+sha256=ee9000a0276675ed697f8d404edf80104fd338c3fb979907e4ee63ca83d65e5e
 
 [ftp://ftp.pl.debian.org/pub/debian/pool/main/t/tzdata/tzdata_2007h.orig.tar.gz]
 md5=8b766bb807c1f7c0c02ff798ea5db80e
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 23c0b6b13c..ef5bb43b2d 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -165,7 +165,7 @@ SRCREV_pn-linux-openmoko-2.6.28 ?= "8aa6cdde17381dd8865d10ba15ee62c092ec2ba5"
 SRCREV_pn-linux-openmoko-2.6.31 ?= "4331f6c95fadc37ea89359d6afb915be838790f9"
 SRCREV_pn-linux-openmoko-devel ?= "b9aa5bf345a0b802af0d10b6cf1079738fe4fd12"
 SRCREV_pn-linux-openmoko-shr-devel ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5"
-SRCREV_pn-linux-openmoko-shr-drm-devel ?= "44d09f40c5c01989bb41bdefe56dd615ea49bbf8"
+SRCREV_pn-linux-openmoko-shr-drm-devel ?= "53cf49505d15824ebbb50aa3c86ba4b059c0ac64"
 SRCREV_pn-linux-sgh-i900 ?= "7e5f8bd3864485e5fc66cb946e09f18b5a32cebc"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
diff --git a/recipes/linux/linux-openmoko-shr-drm-devel_git.bb b/recipes/linux/linux-openmoko-shr-drm-devel_git.bb
index 6b6887918f..671ad758c4 100644
--- a/recipes/linux/linux-openmoko-shr-drm-devel_git.bb
+++ b/recipes/linux/linux-openmoko-shr-drm-devel_git.bb
@@ -7,13 +7,12 @@ DEFAULT_PREFERENCE = "-1"
 KERNEL_RELEASE = "2.6.29"
 KERNEL_VERSION = "2.6.29-rc3-drm"
 
-OMV = "oe14"
+OMV = "oe15"
 PV = "${KERNEL_RELEASE}-drm-${OMV}+gitr${SRCREV}"
 PR = "r2"
 
 SRC_URI = "\
-#  git://git.openmoko.org/git/kernel.git;protocol=git;branch=drm-tracking \
-  git://git.bitwiz.org.uk/kernel.git;protocol=git;branch=kms-tests \
+  git://git.openmoko.org/git/kernel.git;protocol=git;branch=drm-tracking \
   file://fix-install.patch;patch=1 \
   file://0001-Add-drm-to-Makefile-version.patch;patch=1 \
   file://0001-Fix-s3c-adc-suspend.patch;patch=1 \
diff --git a/recipes/tzdata/tzdata.inc b/recipes/tzdata/tzdata.inc
index 71de930761..cfc5d2f8e8 100644
--- a/recipes/tzdata/tzdata.inc
+++ b/recipes/tzdata/tzdata.inc
@@ -3,7 +3,7 @@ SECTION = "base"
 PRIORITY = "optional"
 DEPENDS = "tzcode-native"
 
-INC_PR = "r4"
+INC_PR = "r5"
 
 DEFAULT_TIMEZONE ?= "Europe/London"
 
@@ -28,9 +28,9 @@ do_compile () {
         for zone in ${TZONES}; do \
             ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}/build${datadir}/zoneinfo -L /dev/null \
                 -y ${S}/yearistype.sh ${S}/${zone} ; \
-            ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}}/build${datadir}/zoneinfo/posix -L /dev/null \
+            ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}/build${datadir}/zoneinfo/posix -L /dev/null \
                 -y ${S}/yearistype.sh ${S}/${zone} ; \
-            ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}}/build${datadir}/zoneinfo/right -L ${S}/leapseconds \
+            ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}/build${datadir}/zoneinfo/right -L ${S}/leapseconds \
                 -y ${S}/yearistype.sh ${S}/${zone} ; \
         done
 }
@@ -38,6 +38,11 @@ do_compile () {
 do_install () {
         install -d ${D}${prefix} ${D}${datadir}/zoneinfo
         cp -pPR ${WORKDIR}/build${prefix}/* ${D}${prefix}
+        # Only eglibc is removing zoneinfo files from package
+        if [ "${LIBC}"x == "eglibc"x ] ; then
+          cp -pP "${WORKDIR}/zone.tab" ${D}${datadir}/zoneinfo
+          cp -pP "${WORKDIR}/iso3166.tab" ${D}${datadir}/zoneinfo
+        fi
 
         # Install a sane default for timezones
         install -d ${D}${sysconfdir}
@@ -168,5 +173,7 @@ FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu     \
                 ${datadir}/zoneinfo/WET                  \
                 ${datadir}/zoneinfo/Zulu                 \
                 ${datadir}/zoneinfo/Etc/*                \
+                ${datadir}/zoneinfo/iso3166.tab          \
+                ${datadir}/zoneinfo/zone.tab             \
                 ${sysconfdir}/localtime                  \
                 ${sysconfdir}/timezone                   "
diff --git a/recipes/tzdata/tzdata_2009s.bb b/recipes/tzdata/tzdata_2009s.bb
new file mode 100644
index 0000000000..17c2dd4f0c
--- /dev/null
+++ b/recipes/tzdata/tzdata_2009s.bb
@@ -0,0 +1,3 @@
+require tzdata.inc
+SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz"
+PR = "${INC_PR}.0"