diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2014-05-23 00:21:47 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-06-02 08:36:19 +0200 |
| commit | 7aad5daa5db2120b923716cd7d61052fd528d824 (patch) | |
| tree | a0fb813800dcbe5605bb58280f53443b987f72f3 /package/tzdata | |
| parent | 0be303cacc41283d2da85be2e6b9d3fdd6d5caf0 (diff) | |
| download | buildroot-7aad5daa5db2120b923716cd7d61052fd528d824.tar.gz buildroot-7aad5daa5db2120b923716cd7d61052fd528d824.zip | |
package/tzdata: only compile the zoneinfo once
We already compile the zoneinfo once for the host, so there is
no need to recompile it for the target, we can just re-use the
host files.
This has no impact on tz (the uClibc counterpart of tzdata), since
it already made use of the host files anyway.
This means we no longer need to extract the target variant of
tzdata, too.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/tzdata')
| -rw-r--r-- | package/tzdata/tzdata.mk | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk index 58b5f130e4..b619851556 100644 --- a/package/tzdata/tzdata.mk +++ b/package/tzdata/tzdata.mk @@ -7,7 +7,8 @@ TZDATA_VERSION = 2014a TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz TZDATA_SITE = ftp://ftp.iana.org/tz/releases -TZDATA_DEPENDENCIES = host-zic +TZDATA_DEPENDENCIES = host-tzdata +HOST_TZDATA_DEPENDENCIES = host-zic TZDATA_LICENSE = Public domain TZDATA_DEFAULT_ZONELIST = africa antarctica asia australasia backward etcetera \ @@ -21,24 +22,12 @@ endif TZDATA_LOCALTIME = $(call qstrip,$(BR2_TARGET_LOCALTIME)) -# Don't strip any path components during extraction. -define TZDATA_EXTRACT_CMDS - gzip -d -c $(DL_DIR)/$(TZDATA_SOURCE) \ - | $(TAR) --strip-components=0 -C $(@D) -xf - -endef - -define TZDATA_BUILD_CMDS - (cd $(@D); \ - for zone in $(TZDATA_ZONELIST); do \ - $(ZIC) -d _output/posix -y yearistype.sh $$zone; \ - $(ZIC) -d _output/right -L leapseconds -y yearistype.sh $$zone; \ - done; \ - ) -endef +# No need to extract for target, we're using the host-installed files +TZDATA_EXTRACT_CMDS = define TZDATA_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/share/zoneinfo - cp -a $(@D)/_output/* $(@D)/*.tab $(TARGET_DIR)/usr/share/zoneinfo + $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/share + cp -a $(HOST_DIR)/usr/share/zoneinfo $(TARGET_DIR)/usr/share/zoneinfo cd $(TARGET_DIR)/usr/share/zoneinfo; \ for zone in posix/*; do \ ln -sfn "$${zone}" "$${zone##*/}"; \ |
