diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-06-06 00:01:36 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-06-06 00:03:44 (EDT) |
| commit | 0d60951718f4a853dd5f446ab8b5e4ccf1e8047b (patch) | |
| tree | e30d46c73badf60ea0a9f09ac059768b17dbd543 | |
| parent | fc461fcfce92269b7bd85b5b95e61bd0a8bacf1d (diff) | |
tzdata: Merge in Factory and split out Etc/UTC
TODO: This breaks </usr/share/zoneinfo/posixrules>.
| -rwxr-xr-x | build | 23 | ||||
| -rw-r--r-- | tzdata-factory.pkg/control | 8 |
2 files changed, 8 insertions, 23 deletions
@@ -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 \ diff --git a/tzdata-factory.pkg/control b/tzdata-factory.pkg/control deleted file mode 100644 index 9c6c7ce..0000000 --- a/tzdata-factory.pkg/control +++ /dev/null @@ -1,8 +0,0 @@ -Architecture: all -Platform: all -Depends: tzdata (= ${Binary-Version}) -Description: Time zone and daylight saving time data - factory message - ${Common-Description} - . - This package provides a message indicating that the local time zone must be - set by the user. |