diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-16 03:11:12 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-11-16 03:11:12 +0100 |
| commit | 53f008c4823d65ed0f0e5c6da54bc9dc81975401 (patch) | |
| tree | 9a0964f1b8af771df773db2e79e5d87aada26935 /packages | |
| parent | 39aefb745a42f565c2986b2f8c421ba150471244 (diff) | |
| parent | cf949a41dc7b21558b6f3f36e3e2be4a07f46e36 (diff) | |
Merge branch 'holger/openmoko-merges' into org.openembedded.dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/tzdata/tzdata_2007k.bb | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/packages/tzdata/tzdata_2007k.bb b/packages/tzdata/tzdata_2007k.bb index 76bbfe9ca3..75c9f34e71 100644 --- a/packages/tzdata/tzdata_2007k.bb +++ b/packages/tzdata/tzdata_2007k.bb @@ -3,7 +3,7 @@ SECTION = "base" PRIORITY = "optional" DEPENDS = "tzcode-native" -PR = "r3" +PR = "r3.01" RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \ timezone-arctic timezone-asia timezone-atlantic \ @@ -19,6 +19,8 @@ TZONES= "africa antarctica asia australasia europe northamerica southamerica \ # pacificnew \ " +CONFFILES_${PN} = "${sysconfdir}/timezone ${sysconfdir}/localtime" + do_compile () { for zone in ${TZONES}; do \ ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo -L /dev/null \ @@ -33,6 +35,11 @@ do_compile () { do_install () { install -d ${D}/usr ${D}${datadir}/zoneinfo cp -pPR ${S}/usr ${D}/ + + # Install a sane default for timezones + install -d ${D}${sysconfdir} + echo "Europe/London" > ${D}${sysconfdir}/timezone + cp -pPR ${S}/usr/share/zoneinfo/Europe/London ${D}${sysconfdir}/localtime } # Packages primarily organized by directory with a major city @@ -157,4 +164,6 @@ FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \ ${datadir}/zoneinfo/W-SU \ ${datadir}/zoneinfo/WET \ ${datadir}/zoneinfo/Zulu \ - ${datadir}/zoneinfo/Etc/*" + ${datadir}/zoneinfo/Etc/* \ + ${sysconfdir}/localtime \ + ${sysconfdir}/timezone " |