From 9ad72193d157a5222251342a6ae6991a3f55d278 Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Wed, 09 Oct 2013 16:03:56 -0400 Subject: tzdata-common: Provide Etc/UTC and make default. --- (limited to 'build') diff --git a/build b/build index 2ecb1a1..5553d93 100755 --- a/build +++ b/build @@ -26,12 +26,13 @@ build: install: build # Install tzdata-common files. - mkdir -p tzdata-common.data/usr/share/zoneinfo + mkdir -p tzdata-common.data/usr/share/zoneinfo/Etc + cp -p tzdata-etcetera.data/usr/share/zoneinfo/Etc/UTC \ + tzdata-common.data/usr/share/zoneinfo/Etc cp src/iso3166.tab src/zone.tab tzdata-common.data/usr/share/zoneinfo - cp -p tzdata-northamerica.data/usr/share/zoneinfo/America/New_York \ - tzdata-common.data/usr/share/zoneinfo/posixrules + ln -sf Universal tzdata-common.data/usr/share/zoneinfo/posixrules mkdir -p tzdata-common.data/etc - ln -sf /usr/share/zoneinfo/posixrules tzdata-common.data/etc/localtime + ln -sf /usr/share/zoneinfo/Universal tzdata-common.data/etc/localtime ln -sf . tzdata-common.data/usr/share/zoneinfo/posix # Install time zones. for t in $(tables); do \ @@ -54,9 +55,13 @@ install: build # Install links listed in the "backward" table into the relevant time # zone data package. grep '^Link' src/backward | while read type dest src etc; do \ - t="$$(cd src && grep -l \ - "^Zone[ ][ ]*$${dest}[ ].*$$" \ - $(tables))"; \ + if [ x"$${dest}" = x'Etc/UTC' ]; then \ + t='common'; \ + else \ + t="$$(cd src && grep -l \ + "^Zone[ ][ ]*$${dest}[ ].*$$" \ + $(tables))"; \ + fi; \ link="$${src}" up=''; \ while [ "$${link#*/}" != "$${link}" ] && \ [ "$${link%%/*}" = "$${dest%%/*}" ]; do \ -- cgit v0.9.1