From: Alexander Dahl <ada@thorsis.com>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH 3/6] timezone: Order entries
Date: Tue, 26 Jun 2018 08:56:49 +0200 [thread overview]
Message-ID: <20180626065652.18064-4-ada@thorsis.com> (raw)
In-Reply-To: <20180626065652.18064-1-ada@thorsis.com>
This will make it easier in the future to check for updates and
add/remove updated entries.
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
rules/timezone.in | 216 ++++++++++++++++++++++++++--------------------------
rules/timezone.make | 76 +++++++++---------
2 files changed, 146 insertions(+), 146 deletions(-)
diff --git a/rules/timezone.in b/rules/timezone.in
index 633c15020..7d5b8e736 100644
--- a/rules/timezone.in
+++ b/rules/timezone.in
@@ -25,218 +25,218 @@ config TIMEZONE_AFRICA
bool
prompt "Africa"
-config TIMEZONE_ATLANTIC
- bool
- prompt "Atlantic"
-
-config TIMEZONE_EUROPE
- bool
- prompt "Europe"
-
-config TIMEZONE_EST5EDT
- bool
- prompt "EST5EDT"
-
-config TIMEZONE_CANADA
- bool
- prompt "Canada"
-
-config TIMEZONE_FACTORY
- bool
- prompt "Factory"
-
-config TIMEZONE_GMT0
+config TIMEZONE_AMERICA
bool
- prompt "GMT0"
- help
- This includes GMT-0 and GMT+0
+ prompt "America"
-config TIMEZONE_ICELAND
+config TIMEZONE_ANTARCTICA
bool
- prompt "Iceland"
+ prompt "Antarctica"
-config TIMEZONE_JAPAN
+config TIMEZONE_ARCTIC
bool
- prompt "Japan"
+ prompt "Arctic"
-config TIMEZONE_MST7MDT
+config TIMEZONE_ASIA
bool
- prompt "MST7MDT"
+ prompt "Asia"
-config TIMEZONE_NAVAJO
+config TIMEZONE_ATLANTIC
bool
- prompt "Navajo"
+ prompt "Atlantic"
-config TIMEZONE_WSU
+config TIMEZONE_AUSTRALIA
bool
- prompt "W-SU"
+ prompt "Australia"
-config TIMEZONE_AMERICA
+config TIMEZONE_BRAZIL
bool
- prompt "America"
+ prompt "Brazil"
-config TIMEZONE_AUSTRALIA
+config TIMEZONE_CANADA
bool
- prompt "Australia"
+ prompt "Canada"
config TIMEZONE_CHILE
bool
prompt "Chile"
-config TIMEZONE_EGYPT
+config TIMEZONE_ETC
bool
- prompt "Egypt"
+ prompt "Etc"
-config TIMEZONE_GB
+config TIMEZONE_EUROPE
bool
- prompt "GB"
+ prompt "Europe"
config TIMEZONE_INDIAN
bool
prompt "Indian"
-config TIMEZONE_KWAJALEIN
- bool
- prompt "Kwajalein"
-
config TIMEZONE_MEXICO
bool
prompt "Mexico"
-config TIMEZONE_PRC
+config TIMEZONE_PACIFIC
bool
- prompt "PRC"
+ prompt "Pacific"
-config TIMEZONE_ROC
+config TIMEZONE_US
bool
- prompt "ROC"
+ prompt "US"
-config TIMEZONE_UCT
+config TIMEZONE_CET
bool
- prompt "UCT"
+ prompt "CET"
-config TIMEZONE_WET
+config TIMEZONE_CST6CDT
bool
- prompt "WET"
+ prompt "CST6CDT"
-config TIMEZONE_ANTARCTICA
+config TIMEZONE_CUBA
bool
- prompt "Antarctica"
+ prompt "Cuba"
-config TIMEZONE_BRAZIL
+config TIMEZONE_EET
bool
- prompt "Brazil"
+ prompt "EET"
-config TIMEZONE_CUBA
+config TIMEZONE_EGYPT
bool
- prompt "Cuba"
+ prompt "Egypt"
config TIMEZONE_EIRE
bool
prompt "Eire"
-config TIMEZONE_IRAN
+config TIMEZONE_EST
bool
- prompt "Iran"
+ prompt "EST"
-config TIMEZONE_LIBYA
+config TIMEZONE_EST5EDT
bool
- prompt "Libya"
+ prompt "EST5EDT"
-config TIMEZONE_PST8PDT
+config TIMEZONE_FACTORY
bool
- prompt "PST8PDT"
+ prompt "Factory"
-config TIMEZONE_ROK
+config TIMEZONE_GB
bool
- prompt "ROK"
+ prompt "GB"
-config TIMEZONE_US
+config TIMEZONE_GMT
bool
- prompt "US"
+ prompt "GMT"
-config TIMEZONE_ZULU
+config TIMEZONE_GMT0
bool
- prompt "Zulu"
+ prompt "GMT0"
+ help
+ This includes GMT-0 and GMT+0
-config TIMEZONE_ARCTIC
+config TIMEZONE_HONGKONG
bool
- prompt "Arctic"
+ prompt "Hongkong"
-config TIMEZONE_CET
+config TIMEZONE_HST
bool
- prompt "CET"
+ prompt "HST"
-config TIMEZONE_EET
+config TIMEZONE_ICELAND
bool
- prompt "EET"
+ prompt "Iceland"
-config TIMEZONE_ETC
+config TIMEZONE_IRAN
bool
- prompt "Etc"
+ prompt "Iran"
-config TIMEZONE_GMT
+config TIMEZONE_ISRAEL
bool
- prompt "GMT"
+ prompt "Israel"
-config TIMEZONE_HST
+config TIMEZONE_JAMAICA
bool
- prompt "HST"
+ prompt "Jamaica"
-config TIMEZONE_ISRAEL
+config TIMEZONE_JAPAN
bool
- prompt "Israel"
+ prompt "Japan"
+
+config TIMEZONE_KWAJALEIN
+ bool
+ prompt "Kwajalein"
+
+config TIMEZONE_LIBYA
+ bool
+ prompt "Libya"
config TIMEZONE_MET
bool
prompt "MET"
-config TIMEZONE_NZ
+config TIMEZONE_MST
bool
- prompt "NZ"
+ prompt "MST"
-config TIMEZONE_PACIFIC
+config TIMEZONE_MST7MDT
bool
- prompt "Pacific"
+ prompt "MST7MDT"
-config TIMEZONE_SINGAPORE
+config TIMEZONE_NAVAJO
bool
- prompt "Singapore"
+ prompt "Navajo"
-config TIMEZONE_UTC
+config TIMEZONE_NZ
bool
- prompt "UTC"
+ prompt "NZ"
-config TIMEZONE_ASIA
+config TIMEZONE_NZ_CHAT
bool
- prompt "Asia"
+ prompt "NZ-CHAT"
-config TIMEZONE_CST6CDT
+config TIMEZONE_PRC
bool
- prompt "CST6CDT"
+ prompt "PRC"
-config TIMEZONE_EST
+config TIMEZONE_PST8PDT
bool
- prompt "EST"
+ prompt "PST8PDT"
-config TIMEZONE_HONGKONG
+config TIMEZONE_ROC
bool
- prompt "Hongkong"
+ prompt "ROC"
-config TIMEZONE_JAMAICA
+config TIMEZONE_ROK
bool
- prompt "Jamaica"
+ prompt "ROK"
-config TIMEZONE_MST
+config TIMEZONE_SINGAPORE
bool
- prompt "MST"
+ prompt "Singapore"
-config TIMEZONE_NZ_CHAT
+config TIMEZONE_UCT
bool
- prompt "NZ-CHAT"
+ prompt "UCT"
config TIMEZONE_UNIVERSAL
bool
prompt "Universal"
+config TIMEZONE_UTC
+ bool
+ prompt "UTC"
+
+config TIMEZONE_WET
+ bool
+ prompt "WET"
+
+config TIMEZONE_WSU
+ bool
+ prompt "W-SU"
+
+config TIMEZONE_ZULU
+ bool
+ prompt "Zulu"
+
endif
diff --git a/rules/timezone.make b/rules/timezone.make
index 536088ecf..b978bc843 100644
--- a/rules/timezone.make
+++ b/rules/timezone.make
@@ -23,59 +23,59 @@ TIMEZONE_LICENSE := public_domain
TIMEZONE_LOCALTIME_FILE := /usr/share/zoneinfo/$(PTXCONF_TIMEZONE_LOCALTIME)
TIMEZONE-$(PTXCONF_TIMEZONE_AFRICA) := "Africa"
-TIMEZONE-$(PTXCONF_TIMEZONE_ATLANTIC) += "Atlantic"
-TIMEZONE-$(PTXCONF_TIMEZONE_EUROPE) += "Europe"
-TIMEZONE-$(PTXCONF_TIMEZONE_EST5EDT) += "EST5EDT"
-TIMEZONE-$(PTXCONF_TIMEZONE_CANADA) += "Canada"
-TIMEZONE-$(PTXCONF_TIMEZONE_FACTORY) += "Factory"
-TIMEZONE-$(PTXCONF_TIMEZONE_GMT0) += "GMT-0" "GMT0" "GMT+0"
-TIMEZONE-$(PTXCONF_TIMEZONE_ICELAND) += "Iceland"
-TIMEZONE-$(PTXCONF_TIMEZONE_JAPAN) += "Japan"
-TIMEZONE-$(PTXCONF_TIMEZONE_MST7MDT) += "MST7MDT"
-TIMEZONE-$(PTXCONF_TIMEZONE_NAVAJO) += "Navajo"
-TIMEZONE-$(PTXCONF_TIMEZONE_WSU) += "W-SU"
TIMEZONE-$(PTXCONF_TIMEZONE_AMERICA) += "America"
+TIMEZONE-$(PTXCONF_TIMEZONE_ANTARCTICA) += "Antarctica"
+TIMEZONE-$(PTXCONF_TIMEZONE_ARCTIC) += "Arctic"
+TIMEZONE-$(PTXCONF_TIMEZONE_ASIA) += "Asia"
+TIMEZONE-$(PTXCONF_TIMEZONE_ATLANTIC) += "Atlantic"
TIMEZONE-$(PTXCONF_TIMEZONE_AUSTRALIA) += "Australia"
+TIMEZONE-$(PTXCONF_TIMEZONE_BRAZIL) += "Brazil"
+TIMEZONE-$(PTXCONF_TIMEZONE_CANADA) += "Canada"
TIMEZONE-$(PTXCONF_TIMEZONE_CHILE) += "Chile"
-TIMEZONE-$(PTXCONF_TIMEZONE_EGYPT) += "Egypt"
-TIMEZONE-$(PTXCONF_TIMEZONE_GB) += "GB"
+TIMEZONE-$(PTXCONF_TIMEZONE_ETC) += "Etc"
+TIMEZONE-$(PTXCONF_TIMEZONE_EUROPE) += "Europe"
TIMEZONE-$(PTXCONF_TIMEZONE_INDIAN) += "Indian"
-TIMEZONE-$(PTXCONF_TIMEZONE_KWAJALEIN) += "Kwajalein"
TIMEZONE-$(PTXCONF_TIMEZONE_MEXICO) += "Mexico"
-TIMEZONE-$(PTXCONF_TIMEZONE_PRC) += "PRC"
-TIMEZONE-$(PTXCONF_TIMEZONE_ROC) += "ROC"
-TIMEZONE-$(PTXCONF_TIMEZONE_UCT) += "UCT"
-TIMEZONE-$(PTXCONF_TIMEZONE_WET) += "WET"
-TIMEZONE-$(PTXCONF_TIMEZONE_ANTARCTICA) += "Antarctica"
-TIMEZONE-$(PTXCONF_TIMEZONE_BRAZIL) += "Brazil"
-TIMEZONE-$(PTXCONF_TIMEZONE_CUBA) += "Cuba"
-TIMEZONE-$(PTXCONF_TIMEZONE_EIRE) += "Eire"
-TIMEZONE-$(PTXCONF_TIMEZONE_IRAN) += "Iran"
-TIMEZONE-$(PTXCONF_TIMEZONE_LIBYA) += "Libya"
-TIMEZONE-$(PTXCONF_TIMEZONE_PST8PDT) += "PST8PDT"
-TIMEZONE-$(PTXCONF_TIMEZONE_ROK) += "ROK"
+TIMEZONE-$(PTXCONF_TIMEZONE_PACIFIC) += "Pacific"
TIMEZONE-$(PTXCONF_TIMEZONE_US) += "US"
-TIMEZONE-$(PTXCONF_TIMEZONE_ZULU) += "Zulu"
-TIMEZONE-$(PTXCONF_TIMEZONE_ARCTIC) += "Arctic"
TIMEZONE-$(PTXCONF_TIMEZONE_CET) += "CET"
+TIMEZONE-$(PTXCONF_TIMEZONE_CST6CDT) += "CST6CDT"
+TIMEZONE-$(PTXCONF_TIMEZONE_CUBA) += "Cuba"
TIMEZONE-$(PTXCONF_TIMEZONE_EET) += "EET"
-TIMEZONE-$(PTXCONF_TIMEZONE_ETC) += "Etc"
+TIMEZONE-$(PTXCONF_TIMEZONE_EGYPT) += "Egypt"
+TIMEZONE-$(PTXCONF_TIMEZONE_EIRE) += "Eire"
+TIMEZONE-$(PTXCONF_TIMEZONE_EST) += "EST"
+TIMEZONE-$(PTXCONF_TIMEZONE_EST5EDT) += "EST5EDT"
+TIMEZONE-$(PTXCONF_TIMEZONE_FACTORY) += "Factory"
+TIMEZONE-$(PTXCONF_TIMEZONE_GB) += "GB"
TIMEZONE-$(PTXCONF_TIMEZONE_GMT) += "GMT"
+TIMEZONE-$(PTXCONF_TIMEZONE_GMT0) += "GMT-0" "GMT0" "GMT+0"
+TIMEZONE-$(PTXCONF_TIMEZONE_HONGKONG) += "Hongkong"
TIMEZONE-$(PTXCONF_TIMEZONE_HST) += "HST"
+TIMEZONE-$(PTXCONF_TIMEZONE_ICELAND) += "Iceland"
+TIMEZONE-$(PTXCONF_TIMEZONE_IRAN) += "Iran"
TIMEZONE-$(PTXCONF_TIMEZONE_ISRAEL) += "Israel"
-TIMEZONE-$(PTXCONF_TIMEZONE_MET) += "MET"
-TIMEZONE-$(PTXCONF_TIMEZONE_NZ) += "NZ"
-TIMEZONE-$(PTXCONF_TIMEZONE_PACIFIC) += "Pacific"
-TIMEZONE-$(PTXCONF_TIMEZONE_SINGAPORE) += "Singapore"
-TIMEZONE-$(PTXCONF_TIMEZONE_UTC) += "UTC"
-TIMEZONE-$(PTXCONF_TIMEZONE_ASIA) += "Asia"
-TIMEZONE-$(PTXCONF_TIMEZONE_CST6CDT) += "CST6CDT"
-TIMEZONE-$(PTXCONF_TIMEZONE_EST) += "EST"
-TIMEZONE-$(PTXCONF_TIMEZONE_HONGKONG) += "Hongkong"
TIMEZONE-$(PTXCONF_TIMEZONE_JAMAICA) += "Jamaica"
+TIMEZONE-$(PTXCONF_TIMEZONE_JAPAN) += "Japan"
+TIMEZONE-$(PTXCONF_TIMEZONE_KWAJALEIN) += "Kwajalein"
+TIMEZONE-$(PTXCONF_TIMEZONE_LIBYA) += "Libya"
+TIMEZONE-$(PTXCONF_TIMEZONE_MET) += "MET"
TIMEZONE-$(PTXCONF_TIMEZONE_MST) += "MST"
+TIMEZONE-$(PTXCONF_TIMEZONE_MST7MDT) += "MST7MDT"
+TIMEZONE-$(PTXCONF_TIMEZONE_NAVAJO) += "Navajo"
+TIMEZONE-$(PTXCONF_TIMEZONE_NZ) += "NZ"
TIMEZONE-$(PTXCONF_TIMEZONE_NZ_CHAT) += "NZ-CHAT"
+TIMEZONE-$(PTXCONF_TIMEZONE_PRC) += "PRC"
+TIMEZONE-$(PTXCONF_TIMEZONE_PST8PDT) += "PST8PDT"
+TIMEZONE-$(PTXCONF_TIMEZONE_ROC) += "ROC"
+TIMEZONE-$(PTXCONF_TIMEZONE_ROK) += "ROK"
+TIMEZONE-$(PTXCONF_TIMEZONE_SINGAPORE) += "Singapore"
+TIMEZONE-$(PTXCONF_TIMEZONE_UCT) += "UCT"
TIMEZONE-$(PTXCONF_TIMEZONE_UNIVERSAL) += "Universal"
+TIMEZONE-$(PTXCONF_TIMEZONE_UTC) += "UTC"
+TIMEZONE-$(PTXCONF_TIMEZONE_WET) += "WET"
+TIMEZONE-$(PTXCONF_TIMEZONE_WSU) += "W-SU"
+TIMEZONE-$(PTXCONF_TIMEZONE_ZULU) += "Zulu"
# ----------------------------------------------------------------------------
# Install
--
2.11.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2018-06-26 6:56 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-26 6:56 [ptxdist] [PATCH 0/6] timezone cleanup and tz update Alexander Dahl
2018-06-26 6:56 ` [ptxdist] [PATCH 1/6] timezone: Remove menu entry 'Mideast' Alexander Dahl
2018-06-26 6:56 ` [ptxdist] [PATCH 2/6] timezone: Cleanup timezone file removal Alexander Dahl
2018-06-26 13:50 ` Roland Hieber
2018-06-26 14:01 ` Alexander Dahl
2018-06-26 14:04 ` Alexander Dahl
2018-06-26 14:05 ` Roland Hieber
2018-06-26 6:56 ` Alexander Dahl [this message]
2018-06-26 6:56 ` [ptxdist] [PATCH 4/6] timezone: Add missing zoneinfo entries Alexander Dahl
2018-06-26 6:56 ` [ptxdist] [PATCH 5/6] tz: version bump 2017c -> 2018e Alexander Dahl
2018-06-26 14:02 ` Roland Hieber
2018-06-26 6:56 ` [ptxdist] [PATCH 6/6] Revert "host-tz-database: use snprintf provided by the host compiler" Alexander Dahl
2018-06-26 14:03 ` Roland Hieber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180626065652.18064-4-ada@thorsis.com \
--to=ada@thorsis.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox