diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-11-20 11:16:21 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-11-20 11:16:21 +0100 |
| commit | 84f302c25be32c87529995b83bea8edaff4ca485 (patch) | |
| tree | 26e65236bf75d81a75eeb3c0896ffb556989ee1e /recipes | |
| parent | 9fd535b0de736044013231d1c6d576f07d0dcf93 (diff) | |
| parent | 117485f14d53a0eeddd1bda873812e6cd79b8892 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/linux/linux-openmoko-shr-drm-devel_git.bb | 5 | ||||
| -rw-r--r-- | recipes/tzdata/tzdata.inc | 13 | ||||
| -rw-r--r-- | recipes/tzdata/tzdata_2009s.bb | 3 |
3 files changed, 15 insertions, 6 deletions
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" |