Merge pull request #254 from hnyman/luci-0.12

build: Backport "generate strictly increasing git revisions"
This commit is contained in:
Jo-Philipp Wich 2014-11-15 16:29:10 +01:00
commit 614a0f2a15

View file

@ -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"