diff options
author | Tom Rini <tom_rini@mentor.com> | 2011-03-07 10:44:14 -0700 |
---|---|---|
committer | Tom Rini <tom_rini@mentor.com> | 2011-03-07 10:51:49 -0700 |
commit | cc14abd3baa79dcff056679e2479523f96bd8969 (patch) | |
tree | 4941789925a27065556943f8a5dcb88c30abfa37 /recipes/tzdata | |
parent | 1f7fe5429cc9ea4df54715ddef8ade505c35324f (diff) | |
download | openembedded-cc14abd3baa79dcff056679e2479523f96bd8969.tar.gz |
tzdata/tzcode: Switch to subdir= in SRC_URI
Signed-off-by: Tom Rini <tom_rini@mentor.com>
Diffstat (limited to 'recipes/tzdata')
-rw-r--r-- | recipes/tzdata/tzdata.inc | 20 | ||||
-rw-r--r-- | recipes/tzdata/tzdata_2011b.bb | 8 |
2 files changed, 13 insertions, 15 deletions
diff --git a/recipes/tzdata/tzdata.inc b/recipes/tzdata/tzdata.inc index dd5c2c97df..2c53652b4f 100644 --- a/recipes/tzdata/tzdata.inc +++ b/recipes/tzdata/tzdata.inc @@ -3,7 +3,7 @@ SECTION = "base" PRIORITY = "optional" DEPENDS = "tzcode-native" -INC_PR = "r8" +INC_PR = "r9" DEFAULT_TIMEZONE ?= "Europe/London" @@ -12,9 +12,7 @@ RCONFLICTS_${PN} = "timezones timezone-africa timezone-america timezone-antarcti timezone-australia timezone-europe timezone-indian \ timezone-iso3166.tab timezone-pacific timezone-zone.tab" -SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz;name=tar" - -S = "${WORKDIR}" +SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz;subdir=${BPN}-${PV}" TZONES= "africa antarctica asia australasia europe northamerica southamerica \ factory solar87 solar88 solar89 etcetera backward systemv \ @@ -26,28 +24,28 @@ CONFFILES_${PN} = "${sysconfdir}/timezone ${sysconfdir}/localtime" do_compile () { mkdir -p build for zone in ${TZONES}; do \ - ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}/build${datadir}/zoneinfo -L /dev/null \ + ${STAGING_BINDIR_NATIVE}/zic -d ${S}/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 ${S}/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 ${S}/build${datadir}/zoneinfo/right -L ${S}/leapseconds \ -y ${S}/yearistype.sh ${S}/${zone} ; \ done } do_install () { install -d ${D}${prefix} ${D}${datadir}/zoneinfo - cp -pPR ${WORKDIR}/build${prefix}/* ${D}${prefix} + cp -pPR ${S}/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 + cp -pP "${S}/zone.tab" ${D}${datadir}/zoneinfo + cp -pP "${S}/iso3166.tab" ${D}${datadir}/zoneinfo fi # Install a sane default for timezones install -d ${D}${sysconfdir} echo ${DEFAULT_TIMEZONE} > ${D}${sysconfdir}/timezone - cp -pPR ${WORKDIR}/build${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ${D}${sysconfdir}/localtime + cp -pPR ${S}/build${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ${D}${sysconfdir}/localtime } PACKAGE_ARCH = "all" diff --git a/recipes/tzdata/tzdata_2011b.bb b/recipes/tzdata/tzdata_2011b.bb index 87ba61983b..158f4cee5c 100644 --- a/recipes/tzdata/tzdata_2011b.bb +++ b/recipes/tzdata/tzdata_2011b.bb @@ -1,11 +1,11 @@ require tzdata.inc -# Note that elsie.nci.nih.gov removes old archives when new is being +# Note that elsie.nci.nih.gov removes old archives after a new one is # released. So if this doesn't build for you because of missing source file -# just bump it to the latest available version, removing old one +# just bump it to the latest available version, removing the old one PR = "${INC_PR}.0" -SRC_URI[tar.md5sum] = "9eaf3ca354c42a32bd28e623539bf0e0" -SRC_URI[tar.sha256sum] = "ff45f5ddc2ec925249626d00d7bc2ffff587e0956a1d8245517a023bf27e4cc9" +SRC_URI[md5sum] = "9eaf3ca354c42a32bd28e623539bf0e0" +SRC_URI[sha256sum] = "ff45f5ddc2ec925249626d00d7bc2ffff587e0956a1d8245517a023bf27e4cc9" |