* [ptxdist] [PATCH 1/6] timezone: Remove menu entry 'Mideast'
2018-06-26 6:56 [ptxdist] [PATCH 0/6] timezone cleanup and tz update Alexander Dahl
@ 2018-06-26 6:56 ` Alexander Dahl
2018-06-26 6:56 ` [ptxdist] [PATCH 2/6] timezone: Cleanup timezone file removal Alexander Dahl
` (4 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Alexander Dahl @ 2018-06-26 6:56 UTC (permalink / raw)
To: ptxdist
In ptxdist 2016.08.0 only the line in timezone.make causing trouble was
removed.
Fixes: 76060f6d5f11009fbb964acfa1c504e6b4df376a
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
rules/timezone.in | 4 ----
1 file changed, 4 deletions(-)
diff --git a/rules/timezone.in b/rules/timezone.in
index 941e56127..0b87c01dc 100644
--- a/rules/timezone.in
+++ b/rules/timezone.in
@@ -145,10 +145,6 @@ config TIMEZONE_LIBYA
bool
prompt "Libya"
-config TIMEZONE_MIDEAST
- bool
- prompt "Mideast"
-
config TIMEZONE_PST8PDT
bool
prompt "PST8PDT"
--
2.11.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 13+ messages in thread
* [ptxdist] [PATCH 2/6] timezone: Cleanup timezone file removal
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 ` Alexander Dahl
2018-06-26 13:50 ` Roland Hieber
2018-06-26 6:56 ` [ptxdist] [PATCH 3/6] timezone: Order entries Alexander Dahl
` (3 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Alexander Dahl @ 2018-06-26 6:56 UTC (permalink / raw)
To: ptxdist
The targetinstall of the file was removed ptxdist 2017.10.0, but not the
file itself. Also the help text in menu was not updated.
Fixes: 3ee522b06e41b3b4da9490b06859a62a23fca18e
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
projectroot/etc/timezone | 1 -
rules/timezone.in | 6 ++----
2 files changed, 2 insertions(+), 5 deletions(-)
delete mode 100644 projectroot/etc/timezone
diff --git a/projectroot/etc/timezone b/projectroot/etc/timezone
deleted file mode 100644
index f7437836d..000000000
--- a/projectroot/etc/timezone
+++ /dev/null
@@ -1 +0,0 @@
-@TIMEZONE@
diff --git a/rules/timezone.in b/rules/timezone.in
index 0b87c01dc..633c15020 100644
--- a/rules/timezone.in
+++ b/rules/timezone.in
@@ -13,15 +13,13 @@ if TIMEZONE
comment "Timezone support"
config TIMEZONE_LOCALTIME
- prompt "Timezone for /etc/localtime and /etc/timezone"
+ prompt "Timezone for /etc/localtime"
default "Europe/Berlin"
string
help
Where should /etc/localtime point to? (e.g. put in "Europe/Berlin"
here to let it point to /usr/share/zoneinfo/Europe/Berlin)
- Additionally this value is written to /etc/timezone like on Debian
- or for systemd. Note: if you leave this empty /etc/timezone and
- /etc/localtime are NOT created.
+ Note: if you leave this empty /etc/localtime is NOT created.
config TIMEZONE_AFRICA
bool
--
2.11.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [ptxdist] [PATCH 2/6] timezone: Cleanup timezone file removal
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
0 siblings, 1 reply; 13+ messages in thread
From: Roland Hieber @ 2018-06-26 13:50 UTC (permalink / raw)
To: ptxdist
On Tue, Jun 26, 2018 at 08:56:48AM +0200, Alexander Dahl wrote:
> config TIMEZONE_LOCALTIME
> - prompt "Timezone for /etc/localtime and /etc/timezone"
> + prompt "Timezone for /etc/localtime"
> default "Europe/Berlin"
By the way, is this still a reasonable default for most users, or should
we set it to UTC instead?
(I'm thinking about localized defaults that leak into production systems
unnoticed, like once upon a time when most MySQL tables on production
servers were created with Swedish collation order by default... :-))
- Roland
--
Roland Hieber | r.hieber@pengutronix.de |
Pengutronix e.K. | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [ptxdist] [PATCH 2/6] timezone: Cleanup timezone file removal
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
0 siblings, 2 replies; 13+ messages in thread
From: Alexander Dahl @ 2018-06-26 14:01 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Hei hei,
Am Dienstag, 26. Juni 2018, 15:50:53 CEST schrieb Roland Hieber:
> On Tue, Jun 26, 2018 at 08:56:48AM +0200, Alexander Dahl wrote:
> > config TIMEZONE_LOCALTIME
> >
> > - prompt "Timezone for /etc/localtime and /etc/timezone"
> > + prompt "Timezone for /etc/localtime"
> >
> > default "Europe/Berlin"
>
> By the way, is this still a reasonable default for most users, or should
> we set it to UTC instead?
I actually set this to UTC here this week. o.O
This should be put to an additional patch then.
> (I'm thinking about localized defaults that leak into production systems
> unnoticed, like once upon a time when most MySQL tables on production
> servers were created with Swedish collation order by default... :-))
You never know where the device ends up, and I think UTC is the only
reasonable default. Should we make installation of the UTC zoneinfo file
mandatory then?
Greets
Alex
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [ptxdist] [PATCH 2/6] timezone: Cleanup timezone file removal
2018-06-26 14:01 ` Alexander Dahl
@ 2018-06-26 14:04 ` Alexander Dahl
2018-06-26 14:05 ` Roland Hieber
1 sibling, 0 replies; 13+ messages in thread
From: Alexander Dahl @ 2018-06-26 14:04 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Hello,
Am Dienstag, 26. Juni 2018, 16:01:03 CEST schrieb Alexander Dahl:
> You never know where the device ends up, and I think UTC is the only
> reasonable default. Should we make installation of the UTC zoneinfo file
> mandatory then?
Wait, this can be set to an empty string (see help text), so that would also
be a valid default.
Alex
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [ptxdist] [PATCH 2/6] timezone: Cleanup timezone file removal
2018-06-26 14:01 ` Alexander Dahl
2018-06-26 14:04 ` Alexander Dahl
@ 2018-06-26 14:05 ` Roland Hieber
1 sibling, 0 replies; 13+ messages in thread
From: Roland Hieber @ 2018-06-26 14:05 UTC (permalink / raw)
To: ptxdist
On Tue, Jun 26, 2018 at 04:01:03PM +0200, Alexander Dahl wrote:
> Hei hei,
>
> Am Dienstag, 26. Juni 2018, 15:50:53 CEST schrieb Roland Hieber:
> > On Tue, Jun 26, 2018 at 08:56:48AM +0200, Alexander Dahl wrote:
> > > config TIMEZONE_LOCALTIME
> > >
> > > - prompt "Timezone for /etc/localtime and /etc/timezone"
> > > + prompt "Timezone for /etc/localtime"
> > >
> > > default "Europe/Berlin"
> >
> > By the way, is this still a reasonable default for most users, or should
> > we set it to UTC instead?
>
> I actually set this to UTC here this week. o.O
>
> This should be put to an additional patch then.
>
> > (I'm thinking about localized defaults that leak into production systems
> > unnoticed, like once upon a time when most MySQL tables on production
> > servers were created with Swedish collation order by default... :-))
>
> You never know where the device ends up, and I think UTC is the only
> reasonable default. Should we make installation of the UTC zoneinfo file
> mandatory then?
I guess so. Right now, not even Europe is installed by default, even if
it is chosen as the default... :)
--
Roland Hieber | r.hieber@pengutronix.de |
Pengutronix e.K. | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 13+ messages in thread
* [ptxdist] [PATCH 3/6] timezone: Order entries
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 6:56 ` Alexander Dahl
2018-06-26 6:56 ` [ptxdist] [PATCH 4/6] timezone: Add missing zoneinfo entries Alexander Dahl
` (2 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Alexander Dahl @ 2018-06-26 6:56 UTC (permalink / raw)
To: ptxdist
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
^ permalink raw reply [flat|nested] 13+ messages in thread
* [ptxdist] [PATCH 4/6] timezone: Add missing zoneinfo entries
2018-06-26 6:56 [ptxdist] [PATCH 0/6] timezone cleanup and tz update Alexander Dahl
` (2 preceding siblings ...)
2018-06-26 6:56 ` [ptxdist] [PATCH 3/6] timezone: Order entries Alexander Dahl
@ 2018-06-26 6:56 ` Alexander Dahl
2018-06-26 6:56 ` [ptxdist] [PATCH 5/6] tz: version bump 2017c -> 2018e Alexander Dahl
2018-06-26 6:56 ` [ptxdist] [PATCH 6/6] Revert "host-tz-database: use snprintf provided by the host compiler" Alexander Dahl
5 siblings, 0 replies; 13+ messages in thread
From: Alexander Dahl @ 2018-06-26 6:56 UTC (permalink / raw)
To: ptxdist
Note: these are somehow redundant as many other entries are, too.
Poland → Europe/Warsaw
Portugal → Europe/Lisbon
Turkey → Europe/Istanbul
However, we already have e.g.
Eire → Europe/Dublin
Egypt → Africa/Cairo
…
As far as I can tell, tz uses hardlinks here. (Debian does some magic in
its 'tzdata' package to convert those hardlinks into symlinks.)
So to be consistent we could also introduce some magic and look for
duplicates where tz considers one zone as link to another or for
simplifying things we could just add everything. This patch takes the
second approach.
Note: if the user selects e.g. 'Poland' and 'Europe/Warsaw' that would
waste space on the target, because the same file is copied twice without
symbolic or hard link.
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
rules/timezone.in | 12 ++++++++++++
rules/timezone.make | 3 +++
2 files changed, 15 insertions(+)
diff --git a/rules/timezone.in b/rules/timezone.in
index 7d5b8e736..378a05b68 100644
--- a/rules/timezone.in
+++ b/rules/timezone.in
@@ -195,6 +195,14 @@ config TIMEZONE_NZ_CHAT
bool
prompt "NZ-CHAT"
+config TIMEZONE_POLAND
+ bool
+ prompt "Poland"
+
+config TIMEZONE_PORTUGAL
+ bool
+ prompt "Portugal"
+
config TIMEZONE_PRC
bool
prompt "PRC"
@@ -215,6 +223,10 @@ config TIMEZONE_SINGAPORE
bool
prompt "Singapore"
+config TIMEZONE_TURKEY
+ bool
+ prompt "Turkey"
+
config TIMEZONE_UCT
bool
prompt "UCT"
diff --git a/rules/timezone.make b/rules/timezone.make
index b978bc843..b6cb33ce7 100644
--- a/rules/timezone.make
+++ b/rules/timezone.make
@@ -65,11 +65,14 @@ 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_POLAND) += "Poland"
+TIMEZONE-$(PTXCONF_TIMEZONE_PORTUGAL) += "Portugal"
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_TURKEY) += "Turkey"
TIMEZONE-$(PTXCONF_TIMEZONE_UCT) += "UCT"
TIMEZONE-$(PTXCONF_TIMEZONE_UNIVERSAL) += "Universal"
TIMEZONE-$(PTXCONF_TIMEZONE_UTC) += "UTC"
--
2.11.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 13+ messages in thread
* [ptxdist] [PATCH 5/6] tz: version bump 2017c -> 2018e
2018-06-26 6:56 [ptxdist] [PATCH 0/6] timezone cleanup and tz update Alexander Dahl
` (3 preceding siblings ...)
2018-06-26 6:56 ` [ptxdist] [PATCH 4/6] timezone: Add missing zoneinfo entries Alexander Dahl
@ 2018-06-26 6:56 ` 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
5 siblings, 1 reply; 13+ messages in thread
From: Alexander Dahl @ 2018-06-26 6:56 UTC (permalink / raw)
To: ptxdist
This includes the usual changes to past and future timestamps.
Additional things of interest:
* Since 2018a builders no longer heed to specify -DHAVE_SNPRINTF, we may
want to revert ee06ca66eb later.
* Since 2018a default install locations of the upstream package changed.
However we already set and use TZDIR and that should still be
sufficient for the ptxdist use case.
* Since 2018 parallelized builds with -j should be safe.
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
rules/host-tz-database.make | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/rules/host-tz-database.make b/rules/host-tz-database.make
index ce245feb5..03b4bd906 100644
--- a/rules/host-tz-database.make
+++ b/rules/host-tz-database.make
@@ -20,8 +20,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_TZ_DATABASE) += host-tz-database
HOST_TZ_DATABASE := tz-database
HOST_TZ_DATABASE_DIR := $(HOST_BUILDDIR)/$(HOST_TZ_DATABASE)
-TZCODE_VERSION := 2017c
-TZCODE_MD5 := 2fe6986231db5182c61d565021a0cd7b
+TZCODE_VERSION := 2018e
+TZCODE_MD5 := c4d7df0fff7ba5588b32c5f27e2caf97
TZCODE := tzcode$(TZCODE_VERSION)
TZCODE_SUFFIX := tar.gz
TZCODE_URL := \
@@ -31,8 +31,8 @@ $(TZCODE_SOURCE) := TZCODE
TZCODE_DIR := $(HOST_TZ_DATABASE_DIR)
TZCODE_STRIP_LEVEL := 0
-TZDATA_VERSION := 2017c
-TZDATA_MD5 := 1e751e7e08f8b68530674f04619d894d
+TZDATA_VERSION := 2018e
+TZDATA_MD5 := 97d654f4d7253173b3eeb76a836dd65e
TZDATA := tzdata$(TZDATA_VERSION)
TZDATA_SUFFIX := tar.gz
TZDATA_URL := \
--
2.11.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [ptxdist] [PATCH 5/6] tz: version bump 2017c -> 2018e
2018-06-26 6:56 ` [ptxdist] [PATCH 5/6] tz: version bump 2017c -> 2018e Alexander Dahl
@ 2018-06-26 14:02 ` Roland Hieber
0 siblings, 0 replies; 13+ messages in thread
From: Roland Hieber @ 2018-06-26 14:02 UTC (permalink / raw)
To: ptxdist
On Tue, Jun 26, 2018 at 08:56:51AM +0200, Alexander Dahl wrote:
> This includes the usual changes to past and future timestamps.
>
> Additional things of interest:
>
> * Since 2018a builders no longer heed to specify -DHAVE_SNPRINTF, we may
> want to revert ee06ca66eb later.
>
> * Since 2018a default install locations of the upstream package changed.
> However we already set and use TZDIR and that should still be
> sufficient for the ptxdist use case.
>
> * Since 2018 parallelized builds with -j should be safe.
>
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
Tested-by: Roland Hieber <r.hieber@pengutronix.de>
> ---
> rules/host-tz-database.make | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/rules/host-tz-database.make b/rules/host-tz-database.make
> index ce245feb5..03b4bd906 100644
> --- a/rules/host-tz-database.make
> +++ b/rules/host-tz-database.make
> @@ -20,8 +20,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_TZ_DATABASE) += host-tz-database
> HOST_TZ_DATABASE := tz-database
> HOST_TZ_DATABASE_DIR := $(HOST_BUILDDIR)/$(HOST_TZ_DATABASE)
>
> -TZCODE_VERSION := 2017c
> -TZCODE_MD5 := 2fe6986231db5182c61d565021a0cd7b
> +TZCODE_VERSION := 2018e
> +TZCODE_MD5 := c4d7df0fff7ba5588b32c5f27e2caf97
> TZCODE := tzcode$(TZCODE_VERSION)
> TZCODE_SUFFIX := tar.gz
> TZCODE_URL := \
> @@ -31,8 +31,8 @@ $(TZCODE_SOURCE) := TZCODE
> TZCODE_DIR := $(HOST_TZ_DATABASE_DIR)
> TZCODE_STRIP_LEVEL := 0
>
> -TZDATA_VERSION := 2017c
> -TZDATA_MD5 := 1e751e7e08f8b68530674f04619d894d
> +TZDATA_VERSION := 2018e
> +TZDATA_MD5 := 97d654f4d7253173b3eeb76a836dd65e
> TZDATA := tzdata$(TZDATA_VERSION)
> TZDATA_SUFFIX := tar.gz
> TZDATA_URL := \
> --
> 2.11.0
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Roland Hieber | r.hieber@pengutronix.de |
Pengutronix e.K. | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 13+ messages in thread
* [ptxdist] [PATCH 6/6] Revert "host-tz-database: use snprintf provided by the host compiler"
2018-06-26 6:56 [ptxdist] [PATCH 0/6] timezone cleanup and tz update Alexander Dahl
` (4 preceding siblings ...)
2018-06-26 6:56 ` [ptxdist] [PATCH 5/6] tz: version bump 2017c -> 2018e Alexander Dahl
@ 2018-06-26 6:56 ` Alexander Dahl
2018-06-26 14:03 ` Roland Hieber
5 siblings, 1 reply; 13+ messages in thread
From: Alexander Dahl @ 2018-06-26 6:56 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
This reverts commit ee06ca66eb191271c937e9b0325a85a3c19dafc8.
Quote from the 2018a NEWS:
> Builders no longer need to specify -DHAVE_SNPRINTF on platforms that
> have snprintf and use pre-C99 compilers. (Problem reported by Jon
> Skeet.)
Cc: Roland Hieber <r.hieber@pengutronix.de>
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
rules/host-tz-database.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/host-tz-database.make b/rules/host-tz-database.make
index 03b4bd906..c15d0feb7 100644
--- a/rules/host-tz-database.make
+++ b/rules/host-tz-database.make
@@ -66,8 +66,8 @@ $(STATEDIR)/host-tz-database.extract:
HOST_TZ_DATABASE_PATH := PATH=$(HOST_PATH)
HOST_TZ_DATABASE_CONF_TOOL := NO
HOST_TZ_DATABASE_MAKE_OPT := \
- zic TZDIR=/usr/share/zoneinfo CFLAGS="-DSTD_INSPIRED -DHAVE_SNPRINTF"
+ zic TZDIR=/usr/share/zoneinfo CFLAGS=-DSTD_INSPIRED
HOST_TZ_DATABASE_INSTALL_OPT := \
- posix_only TZDIR=/usr/share/zoneinfo CFLAGS="-DHAVE_SNPRINTF"
+ posix_only TZDIR=/usr/share/zoneinfo
# vim: syntax=make
--
2.11.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [ptxdist] [PATCH 6/6] Revert "host-tz-database: use snprintf provided by the host compiler"
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
0 siblings, 0 replies; 13+ messages in thread
From: Roland Hieber @ 2018-06-26 14:03 UTC (permalink / raw)
To: ptxdist
On Tue, Jun 26, 2018 at 08:56:52AM +0200, Alexander Dahl wrote:
> This reverts commit ee06ca66eb191271c937e9b0325a85a3c19dafc8.
>
> Quote from the 2018a NEWS:
>
> > Builders no longer need to specify -DHAVE_SNPRINTF on platforms that
> > have snprintf and use pre-C99 compilers. (Problem reported by Jon
> > Skeet.)
>
> Cc: Roland Hieber <r.hieber@pengutronix.de>
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
Tested-by: Roland Hieber <r.hieber@pengutronix.de>
> ---
> rules/host-tz-database.make | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/rules/host-tz-database.make b/rules/host-tz-database.make
> index 03b4bd906..c15d0feb7 100644
> --- a/rules/host-tz-database.make
> +++ b/rules/host-tz-database.make
> @@ -66,8 +66,8 @@ $(STATEDIR)/host-tz-database.extract:
> HOST_TZ_DATABASE_PATH := PATH=$(HOST_PATH)
> HOST_TZ_DATABASE_CONF_TOOL := NO
> HOST_TZ_DATABASE_MAKE_OPT := \
> - zic TZDIR=/usr/share/zoneinfo CFLAGS="-DSTD_INSPIRED -DHAVE_SNPRINTF"
> + zic TZDIR=/usr/share/zoneinfo CFLAGS=-DSTD_INSPIRED
> HOST_TZ_DATABASE_INSTALL_OPT := \
> - posix_only TZDIR=/usr/share/zoneinfo CFLAGS="-DHAVE_SNPRINTF"
> + posix_only TZDIR=/usr/share/zoneinfo
>
> # vim: syntax=make
> --
> 2.11.0
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Roland Hieber | r.hieber@pengutronix.de |
Pengutronix e.K. | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 13+ messages in thread