diff options
| author |   Junqian Gordon Xu <xjqian@gmail.com> | 2008-09-18 07:48:28 +0000 |
|---|---|---|
| committer | Junqian Gordon Xu <xjqian@gmail.com> | 2008-09-18 07:48:28 +0000 |
| commit | 14c07ec4660896fece779c622c3b9f8b12493b0e (patch) | |
| tree | f818b506d9c7b7d6c7898d34fc53552ac022998c | |
| parent | 7b0c0beb72a082c16eb1fdbf2fd523cd6b5d5958 (diff) | |
| download | openembedded-14c07ec4660896fece779c622c3b9f8b12493b0e.tar.gz | |
tzdata: backport 2007k
acked by koen and xjqian
applied partial changes from ebc7a8c81fa299830e32cebc2b20fd8cf3233a6d
through 501c67dde049332cb9a85285814cba121334c407
applied changes from d3a7772f0dda4caa934b43a1aec81871ae3eadc8
through 9b0fbae44184479ffb939c3720d3435cee0db061
applied partial changes from d9edb5077cdbbcb97aec97a31a3d177515c68c77
through 47719692fbdea0a9908a2b8c86858fe92ce97e1e
| -rw-r--r-- | conf/distro/include/angstrom-2007-preferred-versions.inc | 2 | ||||
| -rw-r--r-- | packages/tzdata/tzdata_2007k.bb (renamed from packages/tzdata/tzdata_2007e.bb) | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index ab545183d3..4e2fead330 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -1872,7 +1872,7 @@ PREFERRED_VERSION_twutils ?= "0.2" PREFERRED_VERSION_txdrug ?= "0.1" PREFERRED_VERSION_tximage ?= "0.2" PREFERRED_VERSION_tzcode-native ?= "2007e" -PREFERRED_VERSION_tzdata ?= "2007e" +PREFERRED_VERSION_tzdata ?= "2007k" PREFERRED_VERSION_u-boot ?= "1.2.0" PREFERRED_VERSION_u-boot-omap2430sdp ?= "1.1.4" PREFERRED_VERSION_u2nl ?= "1.3" diff --git a/packages/tzdata/tzdata_2007e.bb b/packages/tzdata/tzdata_2007k.bb index 2fbe9ac884..76bbfe9ca3 100644 --- a/packages/tzdata/tzdata_2007e.bb +++ b/packages/tzdata/tzdata_2007k.bb @@ -3,12 +3,8 @@ SECTION = "base" PRIORITY = "optional" DEPENDS = "tzcode-native" -PR = "r1" +PR = "r3" -PROVIDES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ - tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ - tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" -RPROVIDES = "tzdata" RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \ timezone-arctic timezone-asia timezone-atlantic \ timezone-australia timezone-europe timezone-indian \ @@ -46,6 +42,8 @@ PACKAGES = "${PN}-dbg tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" +ALLOW_EMPTY_${PN}-dbg = "1" + FILES_tzdata-africa += "${datadir}/zoneinfo/Africa/*" RPROVIDES_tzdata-africa = "tzdata-africa" @@ -126,6 +124,7 @@ FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \ ${datadir}/zoneinfo/Asia/Bankok \ ${datadir}/zoneinfo/Asia/Hong_Kong \ ${datadir}/zoneinfo/Asia/Tokyo \ + ${datadir}/zoneinfo/Australia/Perth \ ${datadir}/zoneinfo/Australia/Darwin \ ${datadir}/zoneinfo/Australia/Adelaide \ ${datadir}/zoneinfo/Australia/Brisbane \ |