aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar James Byrne <james.byrne@origamienergy.com>2018-04-10 11:28:12 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-04-12 23:32:32 +0200
commit49395dc0e5cc5642670d583b9269a3f92943756d (patch)
tree5cf62083f8410852604cc1f861b022473bec08cd
parent92fda8761aa8024be53a8edb8c102d1ba6401bce (diff)
downloadbuildroot-49395dc0e5cc5642670d583b9269a3f92943756d.tar.gz
buildroot-49395dc0e5cc5642670d583b9269a3f92943756d.tar.bz2
Makefile: take default SOURCE_DATE_EPOCH from repo containing Makefile
For reproducible builds, SOURCE_DATE_EPOCH will be set to the git commit date if it is not defined in the environment, but this was done by explicitly using $(TOPDIR)/.git as the git repository, which would not give the expected result if Buildroot had been put into a subdirectory of another repository. This commit removes that restriction, meaning that the default date will now be the date of the git commit that contains Makefile, regardless of what level above Makefile the repository is at. This works because the current directory when the 'git log' command is executed will always be the directory containing Makefile (it must be, since TOPDIR is set from CURDIR). In general this should be a sensible default, and in cases where a different date is required SOURCE_DATE_EPOCH can be defined in the environment before invoking make. Signed-off-by: James Byrne <james.byrne@origamienergy.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index cd533624ec..3b846b997a 100644
--- a/Makefile
+++ b/Makefile
@@ -506,7 +506,7 @@ 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)
+BR2_VERSION_GIT_EPOCH := $(shell $(GIT) log -1 --format=%at 2> /dev/null)
export SOURCE_DATE_EPOCH ?= $(or $(BR2_VERSION_GIT_EPOCH),$(BR2_VERSION_EPOCH))
endif