Message ID | 1480775787-28111-2-git-send-email-martin@barkynet.com |
---|---|
State | Accepted |
Headers | show |
Hello, On Sat, 3 Dec 2016 14:36:26 +0000, Martin Bark wrote: > +$(VERISON_DEPS) includes dependencies from tzdata meaning applications > +such as zic can't build from tzcode on their own. Remove the dependency > +to $(VERISON_DEPS) since it is not necessary to check for version updates > +in released code. This solves building zic from tzcode without needing > +tzdata. Not clear what you mean here. Is this a new problem introduced by version 2016j ? Could you explain a bit more what's happening ? Also, there's two times the same typo: VERISON_DEPS -> VERSION_DEPS. Thomas
Thomas, The release of the timezone database is split into 2 files. One is tzcode that we use to build zic for the host, the other is tzdata which contains the the actual timezone data needed for the target. When be extract tzcode to build zic we have not extracted tzdata (there is no need to), however, recent changes to tzcode means VERSION_DEPS in Makefile depends on files that are only in tzdata. This breaks building zic when only using tzcode as we do. The patch removes the dependency on VERSION_DEPS because it's not necessary for us. We are building released code so there is no need for dependencies to check if the version number needs updating which is clearly only needed for development. Hope that makes sense. Sorry for the typos, I'll resubmit with them corrected Thanks Martin On 3 December 2016 at 15:02, Thomas Petazzoni < thomas.petazzoni@free-electrons.com> wrote: > Hello, > > On Sat, 3 Dec 2016 14:36:26 +0000, Martin Bark wrote: > > > +$(VERISON_DEPS) includes dependencies from tzdata meaning applications > > +such as zic can't build from tzcode on their own. Remove the dependency > > +to $(VERISON_DEPS) since it is not necessary to check for version > updates > > +in released code. This solves building zic from tzcode without needing > > +tzdata. > > Not clear what you mean here. Is this a new problem introduced by > version 2016j ? Could you explain a bit more what's happening ? > > Also, there's two times the same typo: VERISON_DEPS -> VERSION_DEPS. > > Thomas > -- > Thomas Petazzoni, CTO, Free Electrons > Embedded Linux and Kernel engineering > http://free-electrons.com >
Hello, On Sat, 3 Dec 2016 15:16:10 +0000, Martin Bark wrote: > The release of the timezone database is split into 2 files. One is tzcode > that we use to build zic for the host, the other is tzdata which contains > the the actual timezone data needed for the target. When be extract tzcode > to build zic we have not extracted tzdata (there is no need to), however, > recent changes to tzcode means VERSION_DEPS in Makefile depends on files > that are only in tzdata. This breaks building zic when only using tzcode > as we do. > > The patch removes the dependency on VERSION_DEPS because it's not necessary > for us. We are building released code so there is no need for dependencies > to check if the version number needs updating which is clearly only needed > for development. So it really is an upstream bug? Did you try to send the patch to the upstream developers? > Hope that makes sense. Sorry for the typos, I'll resubmit with them > corrected No need to resend just to fix the typos, I can fix them while applying. Thanks! Thomas
Thomas On 3 December 2016 at 15:35, Thomas Petazzoni < thomas.petazzoni@free-electrons.com> wrote: > Hello, > > On Sat, 3 Dec 2016 15:16:10 +0000, Martin Bark wrote: > > > The release of the timezone database is split into 2 files. One is tzcode > > that we use to build zic for the host, the other is tzdata which contains > > the the actual timezone data needed for the target. When be extract > tzcode > > to build zic we have not extracted tzdata (there is no need to), however, > > recent changes to tzcode means VERSION_DEPS in Makefile depends on files > > that are only in tzdata. This breaks building zic when only using tzcode > > as we do. > > > > The patch removes the dependency on VERSION_DEPS because it's not > necessary > > for us. We are building released code so there is no need for > dependencies > > to check if the version number needs updating which is clearly only > needed > > for development. > > So it really is an upstream bug? Did you try to send the patch to the > upstream developers? > Yes. Not yet, i'm still thinking about a proper fix to suggest to them. My patch is good enough for us but it's not a solution for upstream. > > > Hope that makes sense. Sorry for the typos, I'll resubmit with them > > corrected > No need to resend just to fix the typos, I can fix them while applying. > Thanks > > Thanks! > > Thomas > -- > Thomas Petazzoni, CTO, Free Electrons > Embedded Linux and Kernel engineering > http://free-electrons.com >
diff --git a/package/zic/0001-remove-dependency-check-on-version-file.patch b/package/zic/0001-remove-dependency-check-on-version-file.patch new file mode 100644 index 0000000..02989b3 --- /dev/null +++ b/package/zic/0001-remove-dependency-check-on-version-file.patch @@ -0,0 +1,32 @@ +From 4ad8932f93c490d15586b1def3863e9580e6eceb Mon Sep 17 00:00:00 2001 +From: Martin Bark <martin@barkynet.com> +Date: Sat, 3 Dec 2016 13:51:50 +0000 +Subject: [PATCH] remove dependency check on version file + +$(VERISON_DEPS) includes dependencies from tzdata meaning applications +such as zic can't build from tzcode on their own. Remove the dependency +to $(VERISON_DEPS) since it is not necessary to check for version updates +in released code. This solves building zic from tzcode without needing +tzdata. + +Signed-off-by: Martin Bark <martin@barkynet.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 1b714a8..00d2c09 100644 +--- a/Makefile ++++ b/Makefile +@@ -437,7 +437,7 @@ INSTALL: ALL install date.1 + cp date $(DESTDIR)$(BINDIR)/. + cp -f date.1 $(DESTDIR)$(MANDIR)/man1/. + +-version: $(VERSION_DEPS) ++version: + { (type git) >/dev/null 2>&1 && \ + V=`git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \ + --abbrev=7 --dirty` || \ +-- +2.7.4 + diff --git a/package/zic/zic.hash b/package/zic/zic.hash index 360575a..6fe27bd 100644 --- a/package/zic/zic.hash +++ b/package/zic/zic.hash @@ -1,2 +1,2 @@ -# From http://mm.icann.org/pipermail/tz-announce/2016-July/000040.html -sha512 97d084f4b0a688fef097dca256083ca9948393848d77c8ee637bdd26f859150cce7d2b26fc1165a3b44b28cc1c9075e10192332261ed68990b4b21a85438b023 tzcode2016f.tar.gz +# From http://mm.icann.org/pipermail/tz-announce/2016-November/000044.html +sha512 cac19dded22ff80cd784641ac239358c28cce535ac1eb60b52b7e51c6e9e5fe5f795ea0252daf32c949dddb9c5b24d7e4456d7869aa2725d49c5af58b564822a tzcode2016j.tar.gz diff --git a/package/zic/zic.mk b/package/zic/zic.mk index 8a0c8dc..ed7b04e 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZIC_VERSION = 2016f +ZIC_VERSION = 2016j ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz ZIC_SITE = http://www.iana.org/time-zones/repository/releases ZIC_STRIP_COMPONENTS = 0
Signed-off-by: Martin Bark <martin@barkynet.com> --- ...1-remove-dependency-check-on-version-file.patch | 32 ++++++++++++++++++++++ package/zic/zic.hash | 4 +-- package/zic/zic.mk | 2 +- 3 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 package/zic/0001-remove-dependency-check-on-version-file.patch