diff options
-rw-r--r-- | common/environment/configure/timestamp-macros.sh | 4 | ||||
-rw-r--r-- | common/environment/setup/git.sh | 6 | ||||
-rw-r--r-- | common/hooks/pre-pkg/90-set-timestamps.sh | 8 | ||||
-rw-r--r-- | common/xbps-src/shutils/chroot.sh | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/common/environment/configure/timestamp-macros.sh b/common/environment/configure/timestamp-macros.sh index c9133029345..5daa1691dba 100644 --- a/common/environment/configure/timestamp-macros.sh +++ b/common/environment/configure/timestamp-macros.sh @@ -1,9 +1,9 @@ -if [ -n "$XBPS_COMMIT_TIMESTAMP" ]; then +if [ -n "$SOURCE_DATE_EPOCH" ]; then CFLAGS+=" -Wno-builtin-macro-redefined -include $XBPS_STATEDIR/timestamp-macros.h" CXXFLAGS+=" -Wno-builtin-macro-redefined -include $XBPS_STATEDIR/timestamp-macros.h" for i in "DATE,%b %d %Y" "TIME,%H:%M:%S" "DATETIME,%b %d %Y %H:%M:%S"; do mcr=${i%%,*} - val=$(LC_ALL=C date --date "$XBPS_COMMIT_TIMESTAMP" +"${i#*,}") + val=$(LC_ALL=C date --date "@$SOURCE_DATE_EPOCH" +"${i#*,}") cat >> $XBPS_STATEDIR/timestamp-macros.h <<EOF #undef __${mcr}__ #define __${mcr}__ "${val}" diff --git a/common/environment/setup/git.sh b/common/environment/setup/git.sh index 2447b1bb0e5..fc5c56225ef 100644 --- a/common/environment/setup/git.sh +++ b/common/environment/setup/git.sh @@ -1,10 +1,10 @@ # If XBPS_USE_BUILD_MTIME is enabled in conf file don't continue. -# only run this, if XBPS_COMMIT_TIMESTAMP isn't set -if [ -z "$XBPS_USE_BUILD_MTIME" ] && [ -z "${XBPS_COMMIT_TIMESTAMP}" ]; then +# only run this, if SOURCE_DATE_EPOCH isn't set +if [ -z "$XBPS_USE_BUILD_MTIME" ] && [ -z "${SOURCE_DATE_EPOCH}" ]; then if command -v chroot-git &>/dev/null; then GIT_CMD=$(command -v chroot-git) elif command -v git &>/dev/null; then GIT_CMD=$(command -v git) fi - export XBPS_COMMIT_TIMESTAMP="$($GIT_CMD -C ${XBPS_SRCPKGDIR}/${basepkg} log --pretty='%ci' --date=iso -n1 .)" + export SOURCE_DATE_EPOCH="$($GIT_CMD -C ${XBPS_SRCPKGDIR}/${basepkg} log --pretty='%ct' -n1 .)" fi diff --git a/common/hooks/pre-pkg/90-set-timestamps.sh b/common/hooks/pre-pkg/90-set-timestamps.sh index 67d8bf4cbc3..2113b029944 100644 --- a/common/hooks/pre-pkg/90-set-timestamps.sh +++ b/common/hooks/pre-pkg/90-set-timestamps.sh @@ -2,9 +2,9 @@ # - sets the timestamps in a package to the commit date hook() { - # If XBPS_COMMIT_TIMESTAMP is set, set mtimes to that timestamp. - if [ -n "$XBPS_COMMIT_TIMESTAMP" ]; then - msg_normal "$pkgver: setting mtimes to %s\n" "$(date --date "$XBPS_COMMIT_TIMESTAMP")" - find $PKGDESTDIR -print0 | xargs -0 touch -h --date "$XBPS_COMMIT_TIMESTAMP" + # If SOURCE_DATE_EPOCH is set, set mtimes to that timestamp. + if [ -n "$SOURCE_DATE_EPOCH" ]; then + msg_normal "$pkgver: setting mtimes to %s\n" "$(date --date "@$SOURCE_DATE_EPOCH")" + find $PKGDESTDIR -print0 | xargs -0 touch -h --date "@$SOURCE_DATE_EPOCH" fi } diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh index 5df3348121d..729d9736eab 100644 --- a/common/xbps-src/shutils/chroot.sh +++ b/common/xbps-src/shutils/chroot.sh @@ -198,7 +198,7 @@ chroot_handler() { action="$arg $action" env -i PATH="/usr/bin:/usr/sbin:$PATH" SHELL=/bin/sh \ HOME=/tmp IN_CHROOT=1 LC_COLLATE=C LANG=en_US.UTF-8 \ - XBPS_COMMIT_TIMESTAMP="$XBPS_COMMIT_TIMESTAMP" \ + SOURCE_DATE_EPOCH="$SOURCE_DATE_EPOCH" \ $XBPS_COMMONDIR/chroot-style/${XBPS_CHROOT_CMD:=uunshare}.sh \ $XBPS_MASTERDIR $XBPS_DISTDIR "$XBPS_HOSTDIR" "$XBPS_CHROOT_CMD_ARGS" \ /void-packages/xbps-src $action $pkg |