From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Sat, 15 Nov 2014 10:11:46 +0000 (+0200)
Subject: build: Backport "generate strictly increasing git revisions"
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=refs%2Fpull%2F254%2Fhead;p=project%2Fluci.git

build: Backport "generate strictly increasing git revisions"

Enhance luci-0.12's build/mkrevision.sh by backporting
the code to generate strictly increasing git revisions:
https://github.com/openwrt/luci/commit/0856030c79f3febdafa627511cf1be4c72edf09b

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
---

diff --git a/build/mkrevision.sh b/build/mkrevision.sh
index 889ce75c24..02b7fa3710 100755
--- a/build/mkrevision.sh
+++ b/build/mkrevision.sh
@@ -14,7 +14,10 @@ TOPDIR="${0%mkrevision.sh}"
 	elif git log -1 >/dev/null 2>/dev/null; then
 		revision="svn-r$(LC_ALL=C git log -1 | sed -ne 's/.*git-svn-id: .*@\([0-9]\+\) .*/\1/p')"
 		if [ "$revision" = "svn-r" ]; then
-			revision="git-$(LC_ALL=C git log -1 --pretty=%h)"
+			set -- $(git log -1 --format="%ct %h")
+			secs="$(($1 % 86400))"
+			yday="$(date --utc --date="@$1" "+%y.%j")"
+			revision="$(printf 'git-%s.%05d-%s' "$yday" "$secs" "$2")"
 		fi
 	else
 		revision="unknown"