From db22eb686a8e45ccefbaf87ae18ac4588abea4f5 Mon Sep 17 00:00:00 2001 From: Michel Marti Date: Fri, 8 Apr 2016 10:23:27 +0200 Subject: [PATCH] tzdata: reorder zone list to avoid missing links 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 Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/tzdata/tzdata.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk index 69bae030b8..f50a83c411 100644 --- a/package/tzdata/tzdata.mk +++ b/package/tzdata/tzdata.mk @@ -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 -- 2.30.2