Skip to contentSkip to conversation

tzdata-related fixes (branch yem/tz)

PATCH New Yann E. MORIN 2 participants 5 messages May 4, 2014

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

v2 cover tzdata-related fixes (branch yem/tz)

From: "Yann E. MORIN" <[email protected]>

Hello All!

This series installs missing timzone data files.

Changes v1 -> v2:
- proper install location for host-tzdata
- combine both previous patches in this series

Regards,
Yann E. MORIN.

The following changes since commit dd5dbe627f4d66603e03ae2fdb09d4fe34d34dc7:

clapack: new package (2014-05-04 09:10:55 +0200)

are available in the git repository at:

git://gitorious.org/buildroot/buildroot.git yem/tz

for you to fetch changes up to c976aa8f37ac787ecec903272d8c5fed7a75b833:

package/tz: install missing files (2014-05-04 17:59:34 +0200)

----------------------------------------------------------------
Yann E. MORIN (2):
package/tzdata: install missing files
package/tz: install missing files

 package/tz/tz.mk         | 4 ++++
 package/tzdata/tzdata.mk | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
author
#1 lore raw

PATCH v2 1/2 package/tzdata: install missing files

From: "Yann E. MORIN" <[email protected]>

Install two files:
- zone.tab : {country-code,coordinates,timezone} tuples
- iso3166.tab: {country-code,country} tuples

Reported-by Maxime Hadjinlian <[email protected]>
Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/tzdata/tzdata.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
package/tzdata/tzdata.mk +4 -2
index 05a82a2..411d424 100644
@@ -37,7 +37,8 @@ define TZDATA_BUILD_CMDS
 endef
 
 define TZDATA_INSTALL_TARGET_CMDS
-	mkdir -p $(TARGET_DIR)/usr/share/zoneinfo
+	$(INSTALL) -D -m 0644 $(@D)/zone.tab $(TARGET_DIR)/usr/share/zoneinfo/zone.tab
+	$(INSTALL) -D -m 0644 $(@D)/iso3166.tab $(TARGET_DIR)/usr/share/zoneinfo/iso3166.tab
 	cp -a $(@D)/_output/* $(TARGET_DIR)/usr/share/zoneinfo
 	cd $(TARGET_DIR)/usr/share/zoneinfo;    \
 	for zone in posix/*; do                 \

@@ -65,7 +66,8 @@ define HOST_TZDATA_BUILD_CMDS
 endef
 
 define HOST_TZDATA_INSTALL_CMDS
-	mkdir -p $(HOST_DIR)/usr/share/zoneinfo
+	$(INSTALL) -D -m 0644 $(@D)/zone.tab $(HOST_DIR)/usr/share/zoneinfo/zone.tab
+	$(INSTALL) -D -m 0644 $(@D)/iso3166.tab $(HOST_DIR)/usr/share/zoneinfo/iso3166.tab
 	cp -a $(@D)/_output/* $(HOST_DIR)/usr/share/zoneinfo
 endef
Signature · 1 line
1.8.3.2
#2 lore raw

PATCH 1/2 package/tzdata: install missing files

Quoted 18 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

From: "Yann E. MORIN" <[email protected]>
Install two files:
- zone.tab : {country-code,coordinates,timezone} tuples
- iso3166.tab: {country-code,country} tuples

Reported-by Maxime Hadjinlian <[email protected]>
Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/tzdata/tzdata.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
package/tzdata/tzdata.mk +0 -0
index 05a82a2..411d424 100644

package/tzdata/tzdata.mk define TZDATA_BUILD_CMDS · line 42

Quoted 7 lines
package/tzdata/tzdata.mk +2 -1
@@ -37,7 +37,8 @@ define TZDATA_BUILD_CMDS
 endef
 
 define TZDATA_INSTALL_TARGET_CMDS
-	mkdir -p $(TARGET_DIR)/usr/share/zoneinfo
+	$(INSTALL) -D -m 0644 $(@D)/zone.tab $(TARGET_DIR)/usr/share/zoneinfo/zone.tab
+	$(INSTALL) -D -m 0644 $(@D)/iso3166.tab $(TARGET_DIR)/usr/share/zoneinfo/iso3166.tab
 	cp -a $(@D)/_output/* $(TARGET_DIR)/usr/share/zoneinfo

It's imho nicer to just copy it together with the rest, so I've just added $(@D)/*.tab to the above cp -a line and committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#3 lore raw

PATCH v2 2/2 package/tz: install missing files

In reply to Yann E. MORIN

From: "Yann E. MORIN" <[email protected]>

As for the tzdata package, install the missing files:
- zone.tab : {country-code,coordinates,timezone} tuples
- iso3166.tab: {country-code,country} tuples

Reported-by Maxime Hadjinlian <[email protected]>
Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/tz/tz.mk | 4 ++++
 1 file changed, 4 insertions(+)
package/tz/tz.mk +4 -0
index a762acd..865ba3b 100644
@@ -20,6 +20,10 @@ define TZ_BUILD_CMDS
 endef
 
 define TZ_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0644 $(HOST_DIR)/usr/share/zoneinfo/zone.tab \
+			      $(TARGET_DIR)/usr/share/zoneinfo/zone.tab
+	$(INSTALL) -D -m 0644 $(HOST_DIR)/usr/share/zoneinfo/iso3166.tab \
+			      $(TARGET_DIR)/usr/share/zoneinfo/iso3166.tab
 	mkdir -p $(TARGET_DIR)/usr/share/zoneinfo/uclibc
 	cp -a $(@D)/output/* $(TARGET_DIR)/usr/share/zoneinfo/uclibc
 	if [ -n "$(TZ_LOCALTIME)" ]; then                               \
Signature · 1 line
1.8.3.2
#4 lore raw

PATCH 2/2 package/tz: install missing files

Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

From: "Yann E. MORIN" <[email protected]> As for the tzdata package, install the missing files:
- zone.tab : {country-code,coordinates,timezone} tuples
- iso3166.tab: {country-code,country} tuples

Reported-by Maxime Hadjinlian <[email protected]>
Signed-off-by "Yann E. MORIN" <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard