diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2016-10-21 12:21:40 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2016-10-21 12:43:45 +0200 |
| commit | 8cc922411561dfa6f65fbb492a7bdb6fb9bbb6d5 (patch) | |
| tree | 9fc8a0c515525e0ba8f47e607e260e5d03425498 | |
| parent | 3b26a5bb15978914118a7958764f5c8079bf72f9 (diff) | |
| download | upstream-8cc922411561dfa6f65fbb492a7bdb6fb9bbb6d5.tar.gz upstream-8cc922411561dfa6f65fbb492a7bdb6fb9bbb6d5.tar.bz2 upstream-8cc922411561dfa6f65fbb492a7bdb6fb9bbb6d5.zip | |
sdk: predefine SOURCE_DATE_EPOCH
When building packages within the SDK, there is no Git revision history
available so prepopulate SOURCE_DATE_EPOCH in version.mk, similar to
how we handle REVISION already.
Acked-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
| -rw-r--r-- | include/toplevel.mk | 3 | ||||
| -rw-r--r-- | include/version.mk | 1 | ||||
| -rw-r--r-- | target/sdk/Makefile | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/include/toplevel.mk b/include/toplevel.mk index e13acafe9c..81329ac414 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -16,13 +16,14 @@ ifeq ($(SDK),1) include $(TOPDIR)/include/version.mk else REVISION:=$(shell $(TOPDIR)/scripts/getver.sh) + SOURCE_DATE_EPOCH:=$(shell $(TOPDIR)/scripts/get_source_date_epoch.sh) endif HOSTCC ?= $(CC) export REVISION +export SOURCE_DATE_EPOCH export GIT_CONFIG_PARAMETERS='core.autocrlf=false' export MAKE_JOBSERVER=$(filter --jobserver%,$(MAKEFLAGS)) -export SOURCE_DATE_EPOCH:=$(shell $(TOPDIR)/scripts/get_source_date_epoch.sh) # prevent perforce from messing with the patch utility unexport P4PORT P4USER P4CONFIG P4CLIENT diff --git a/include/version.mk b/include/version.mk index b54eaab485..4beaca6460 100644 --- a/include/version.mk +++ b/include/version.mk @@ -8,6 +8,7 @@ # Substituted by SDK, do not remove # REVISION:=x +# SOURCE_DATE_EPOCH:=x RELEASE:=Reboot diff --git a/target/sdk/Makefile b/target/sdk/Makefile index 77695ee285..06889044ea 100644 --- a/target/sdk/Makefile +++ b/target/sdk/Makefile @@ -118,6 +118,7 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean cat $(TOPDIR)/feeds.conf.default >> $(SDK_BUILD_DIR)/feeds.conf.default; \ fi $(SED) 's,^# REVISION:=.*,REVISION:=$(REVISION),g' $(SDK_BUILD_DIR)/include/version.mk + $(SED) 's,^# SOURCE_DATE_EPOCH:=.*,SOURCE_DATE_EPOCH:=$(SOURCE_DATE_EPOCH),g' $(SDK_BUILD_DIR)/include/version.mk $(SED) '/LINUX_VERMAGIC:=/ { s,unknown,$(LINUX_VERMAGIC),g }' $(SDK_BUILD_DIR)/include/kernel.mk find $(SDK_BUILD_DIR) -name .git | $(XARGS) rm -rf find $(SDK_BUILD_DIR) -name .svn | $(XARGS) rm -rf |