From 42c2b3e496788ec15420bee621fd61f1ef5f085e Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Wed, 24 Jul 2019 08:40:03 -0700 Subject: [PATCH] [stable-2.8] Fix nightly rpm release The nightly rpm builds were using a timestamp from the last git commit in their Release field. Unfortunately, that was using author timestamp which is nonsequential. Change to using commit timestamp which is sequential. note that this still has a cornercase if the branch's history is ever rewritten. (cherry picked from commit 97edfcc) Co-authored-by: Toshio Kuratomi --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e004d8d1a0f..ce506edfcee 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ RELEASE ?= 1 # Get the branch information from git ifneq ($(shell which git),) -GIT_DATE := $(shell git log -n 1 --format="%ai") +GIT_DATE := $(shell git log -n 1 --format="%ci") GIT_HASH := $(shell git log -n 1 --format="%h") GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD | sed 's/[-_.\/]//g') GITINFO = .$(GIT_HASH).$(GIT_BRANCH) @@ -60,7 +60,7 @@ GITINFO = "" endif ifeq ($(shell echo $(OS) | egrep -c 'Darwin|FreeBSD|OpenBSD|DragonFly'),1) -DATE := $(shell date -j -r $(shell git log -n 1 --format="%at") +%Y%m%d%H%M) +DATE := $(shell date -j -r $(shell git log -n 1 --format="%ct") +%Y%m%d%H%M) CPUS ?= $(shell sysctl hw.ncpu|awk '{print $$2}') else DATE := $(shell date --utc --date="$(GIT_DATE)" +%Y%m%d%H%M)