| Message ID | 1523290081-35341-1-git-send-email-james.byrne@origamienergy.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v3] Makefile: Avoid executing 'git log' each time SOURCE_DATE_EPOCH is used | expand |
James, All, On 2018-04-09 17:08 +0100, James Byrne spake thusly: > If SOURCE_DATE_EPOCH is not defined it was given a definition that > caused 'git log' to be executed each time the variable is referenced, > which is not very efficient given that the answer cannot change. > > This commit moves the definition of BR2_VERSION_GIT_EPOCH after the > inclusion of Makefile.in (so that GIT is defined) and makes it a simply > expanded variable so that it is only evaluated once. > > Signed-off-by: James Byrne <james.byrne@origamienergy.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Thanks for the respin! :-) Regards, Yann E. MORIN. > --- > Makefile | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/Makefile b/Makefile > index 0724f28..cd53362 100644 > --- a/Makefile > +++ b/Makefile > @@ -247,8 +247,6 @@ export TZ = UTC > export LANG = C > export LC_ALL = C > export GZIP = -n > -BR2_VERSION_GIT_EPOCH = $(shell GIT_DIR=$(TOPDIR)/.git $(GIT) log -1 --format=%at) > -export SOURCE_DATE_EPOCH ?= $(if $(wildcard $(TOPDIR)/.git),$(BR2_VERSION_GIT_EPOCH),$(BR2_VERSION_EPOCH)) > endif > > # To put more focus on warnings, be less verbose as default > @@ -504,6 +502,14 @@ include support/dependencies/dependencies.mk > include $(sort $(wildcard toolchain/*.mk)) > include $(sort $(wildcard toolchain/*/*.mk)) > > +ifeq ($(BR2_REPRODUCIBLE),y) > +# If SOURCE_DATE_EPOCH has not been set then use the commit date, or the last > +# release date if the source tree is not within a Git repository. > +# See: https://reproducible-builds.org/specs/source-date-epoch/ > +BR2_VERSION_GIT_EPOCH := $(shell $(GIT) --git-dir=$(TOPDIR)/.git log -1 --format=%at 2> /dev/null) > +export SOURCE_DATE_EPOCH ?= $(or $(BR2_VERSION_GIT_EPOCH),$(BR2_VERSION_EPOCH)) > +endif > + > # Include the package override file if one has been provided in the > # configuration. > PACKAGE_OVERRIDE_FILE = $(call qstrip,$(BR2_PACKAGE_OVERRIDE_FILE)) > -- > 2.7.4 > > The contents of this email and any attachment are confidential to the intended recipient(s). If you are not an intended recipient: (i) do not use, disclose, distribute, copy or publish this email or its contents; (ii) please contact the sender immediately; and (iii) delete this email. Origami Energy Limited (company number 8619644); Origami Storage Limited (company number 10436515) and OSSPV001 Limited (company number 10933403), each registered in England and each with a registered office at: Ashcombe Court, Woolsack Way, Godalming, GU7 1LQ.
Hello, On Mon, 9 Apr 2018 17:08:01 +0100, James Byrne wrote: > If SOURCE_DATE_EPOCH is not defined it was given a definition that > caused 'git log' to be executed each time the variable is referenced, > which is not very efficient given that the answer cannot change. > > This commit moves the definition of BR2_VERSION_GIT_EPOCH after the > inclusion of Makefile.in (so that GIT is defined) and makes it a simply > expanded variable so that it is only evaluated once. > > Signed-off-by: James Byrne <james.byrne@origamienergy.com> > --- > Makefile | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas
diff --git a/Makefile b/Makefile index 0724f28..cd53362 100644 --- a/Makefile +++ b/Makefile @@ -247,8 +247,6 @@ export TZ = UTC export LANG = C export LC_ALL = C export GZIP = -n -BR2_VERSION_GIT_EPOCH = $(shell GIT_DIR=$(TOPDIR)/.git $(GIT) log -1 --format=%at) -export SOURCE_DATE_EPOCH ?= $(if $(wildcard $(TOPDIR)/.git),$(BR2_VERSION_GIT_EPOCH),$(BR2_VERSION_EPOCH)) endif # To put more focus on warnings, be less verbose as default @@ -504,6 +502,14 @@ include support/dependencies/dependencies.mk include $(sort $(wildcard toolchain/*.mk)) include $(sort $(wildcard toolchain/*/*.mk)) +ifeq ($(BR2_REPRODUCIBLE),y) +# If SOURCE_DATE_EPOCH has not been set then use the commit date, or the last +# release date if the source tree is not within a Git repository. +# See: https://reproducible-builds.org/specs/source-date-epoch/ +BR2_VERSION_GIT_EPOCH := $(shell $(GIT) --git-dir=$(TOPDIR)/.git log -1 --format=%at 2> /dev/null) +export SOURCE_DATE_EPOCH ?= $(or $(BR2_VERSION_GIT_EPOCH),$(BR2_VERSION_EPOCH)) +endif + # Include the package override file if one has been provided in the # configuration. PACKAGE_OVERRIDE_FILE = $(call qstrip,$(BR2_PACKAGE_OVERRIDE_FILE))
If SOURCE_DATE_EPOCH is not defined it was given a definition that caused 'git log' to be executed each time the variable is referenced, which is not very efficient given that the answer cannot change. This commit moves the definition of BR2_VERSION_GIT_EPOCH after the inclusion of Makefile.in (so that GIT is defined) and makes it a simply expanded variable so that it is only evaluated once. Signed-off-by: James Byrne <james.byrne@origamienergy.com> --- Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -- 2.7.4 The contents of this email and any attachment are confidential to the intended recipient(s). If you are not an intended recipient: (i) do not use, disclose, distribute, copy or publish this email or its contents; (ii) please contact the sender immediately; and (iii) delete this email. Origami Energy Limited (company number 8619644); Origami Storage Limited (company number 10436515) and OSSPV001 Limited (company number 10933403), each registered in England and each with a registered office at: Ashcombe Court, Woolsack Way, Godalming, GU7 1LQ.