From 0d60951718f4a853dd5f446ab8b5e4ccf1e8047b Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Thu, 06 Jun 2019 00:01:36 -0400 Subject: tzdata: Merge in Factory and split out Etc/UTC TODO: This breaks . --- (limited to 'build') diff --git a/build b/build index b7a938a..fd7f74d 100755 --- a/build +++ b/build @@ -8,8 +8,7 @@ tables = \ europe \ northamerica \ southamerica \ - etcetera \ - factory + etcetera nop: @: @@ -32,19 +31,17 @@ install: build tzdata.data/usr/share/zoneinfo/Etc cp src/*.tab tzdata.data/usr/share/zoneinfo ln -sf Universal tzdata.data/usr/share/zoneinfo/posixrules + # Install Factory zone. + src/zic -d tzdata.data/usr/share/zoneinfo src/factory; \ mkdir -p tzdata.data/etc - ln -sf /usr/share/zoneinfo/Universal tzdata.data/etc/localtime + ln -sf /usr/share/zoneinfo/Factory tzdata.data/etc/localtime ln -sf . tzdata.data/usr/share/zoneinfo/posix # Install time zones. set -e; for t in $(tables); do \ src/zic -d tzdata-$${t}.data/usr/share/zoneinfo src/$${t}; \ grep '^L' src/$${t} | while read type dest src etc; do \ rm -f "tzdata-$${t}.data/usr/share/zoneinfo/$${src}"; \ - if [ x"$${dest}" = x'Etc/UTC' ]; then \ - p='tzdata'; \ - else \ - p="tzdata-$${t}"; \ - fi; \ + p="tzdata-$${t}"; \ link="$${src}" up=''; \ while [ x"$${link#*/}" != x"$${link}" ] && \ [ x"$${link%%/*}" = x"$${dest%%/*}" ]; do \ @@ -62,13 +59,9 @@ install: build # Install links listed in the "backward" table into the relevant time # zone data package. grep '^L' src/backward | while read type dest src etc; do \ - if [ x"$${dest}" = x'Etc/UTC' ]; then \ - p='tzdata'; \ - else \ - p="tzdata-$$(cd src && grep -l \ - "^Zone[ ][ ]*$${dest}[ ].*$$" \ - $(tables))"; \ - fi; \ + p="tzdata-$$(cd src && grep -l \ + "^Zone[ ][ ]*$${dest}[ ].*$$" \ + $(tables))"; \ link="$${src}" up=''; \ while [ x"$${link#*/}" != x"$${link}" ] && \ [ x"$${link%%/*}" = x"$${dest%%/*}" ]; do \ -- cgit v0.9.1