From: Paul Spooren <mail@aparcar.org>
Date: Sat, 15 Aug 2020 20:57:02 +0000 (-1000)
Subject: build: store granular timestamps in packages
X-Git-Tag: v21.02.0-rc1~1726
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fd29f2bcd97f7af7de22ac95b1490a54f45d6c88;p=openwrt%2Fstaging%2Fchunkeey.git

build: store granular timestamps in packages

With the new `SOURCE` argument of `get_source_date_epoch` it is possible
to set package timestamps based on actual package changes rather thane
$TOPDIR changes.

This commit adds a new variable PKG_SOURCE_DATE_EPOCH which is used by
the `ipkg` build script. As a fallback the existing SOURCE_DATE_EPOCH is
used or as last resort the current time.

The redundant checks for `.git/` and `.svn/` are removed.

Signed-off-by: Paul Spooren <mail@aparcar.org>
---

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index d8b65433c2..808ac1c6e3 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -192,6 +192,7 @@ $(_endef)
     $$(IPKG_$(1)) : export CONTROL=$$(Package/$(1)/CONTROL)
     $$(IPKG_$(1)) : export DESCRIPTION=$$(Package/$(1)/description)
     $$(IPKG_$(1)) : export PATH=$$(TARGET_PATH_PKG)
+    $$(IPKG_$(1)) : export PKG_SOURCE_DATE_EPOCH=$(shell $(TOPDIR)/scripts/get_source_date_epoch.sh $(SOURCE))
     $(PKG_INFO_DIR)/$(1).provides $$(IPKG_$(1)): $(STAMP_BUILT) $(INCLUDE_DIR)/package-ipkg.mk
 	@rm -rf $$(IDIR_$(1)); \
 		$$(call remove_ipkg_files,$(1),$$(call opkg_package_files,$(call gen_ipkg_wildcard,$(1))))
diff --git a/scripts/ipkg-build b/scripts/ipkg-build
index 0cbab9074e..e3a9a882cf 100755
--- a/scripts/ipkg-build
+++ b/scripts/ipkg-build
@@ -16,16 +16,10 @@ TAR="${TAR:-$(command -v tar)}"
 GZIP="$(command -v gzip)"
 
 # try to use fixed source epoch
-if [ -n "$SOURCE_DATE_EPOCH" ]; then
+if [ -n "$PKG_SOURCE_DATE_EPOCH" ]; then
+	TIMESTAMP=$(date --date="@$PKG_SOURCE_DATE_EPOCH")
+elif [ -n "$SOURCE_DATE_EPOCH" ]; then
 	TIMESTAMP=$(date --date="@$SOURCE_DATE_EPOCH")
-
-# look up date of last commit
-elif [ -d "$TOPDIR/.git" ]; then
-	GIT="$(command -v git)"
-	TIMESTAMP=$(cd $TOPDIR; $GIT log -1 -s --format=%ci)
-elif [ -d "$TOPDIR/.svn" ]; then
-	SVN="$(command -v svn)"
-	TIMESTAMP=$($SVN info "$TOPDIR" | sed -n "s/^Last Changed Date: \(.*\)/\1/p")
 else
 	TIMESTAMP=$(date)
 fi