From: Michel Marti <mma@objectxp.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2 1/1] tzdata: Reorder zone list to avoid missing links
Date: Fri, 8 Apr 2016 10:23:27 +0200 [thread overview]
Message-ID: <1460103807-8770-1-git-send-email-mma@objectxp.com> (raw)
In-Reply-To: <1459939293-4711-1-git-send-email-mma@objectxp.com>
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>
---
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 1b3efb4..948ab4f 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.8.1
next prev parent reply other threads:[~2016-04-08 8:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-06 10:41 [Buildroot] [PATCH 1/1] tzdata: Reorder zone list to avoid missing links Michel Marti
2016-04-06 22:09 ` Arnout Vandecappelle
2016-04-08 8:23 ` Michel Marti [this message]
2016-04-19 21:16 ` [Buildroot] [PATCH v2 " Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1460103807-8770-1-git-send-email-mma@objectxp.com \
--to=mma@objectxp.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox