deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

tzdata: reorder zone list to avoid missing links

Browse source 
The 'backward' zone references entries from other zones (e.g. Pacific/*)
that have not yet been compiled, leading to missing links. To fix this,
take-over the zone list sort order from upstream 'tzdata' and also ensure
that make fails if zic terminates with a non-zero exit code.

Signed-off-by: Michel Marti <mma@objectxp.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Michel Marti 2016-04-08 10:23:27 +02:00 committed by Thomas Petazzoni
parent 0b467c6b95
commit db22eb686a
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
package/tzdata/tzdata.mk
View file

@ -12,9 +12,11 @@ TZDATA_DEPENDENCIES = host-tzdata
HOST_TZDATA_DEPENDENCIES = host-zic
TZDATA_LICENSE = Public domain
# Take care when re-ordering this list since this might break zone
# dependencies
TZDATA_DEFAULT_ZONELIST = \
africa antarctica asia australasia backward etcetera \
europe factory northamerica pacificnew southamerica
africa antarctica asia australasia europe northamerica \
southamerica pacificnew etcetera backward systemv factory
ifeq ($(call qstrip,$(BR2_TARGET_TZ_ZONELIST)),default)
TZDATA_ZONELIST = $(TZDATA_DEFAULT_ZONELIST)
@ -49,8 +51,8 @@ endef
define HOST_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; \
$(ZIC) -d _output/posix -y yearistype.sh $$zone || exit 1; \
$(ZIC) -d _output/right -L leapseconds -y yearistype.sh $$zone || exit 1; \
done; \
)
endef