Commit f03b283f authored Sep 12, 2008 by Trent Piepho Committed by Sam Ravnborg Oct 29, 2008

kbuild: tag with git revision when git describe is missing



setlocalversion used to use an abbreviated git commit sha1 to generate the
tag.  This was changed in commit d882421f
"kbuild: change CONFIG_LOCALVERSION_AUTO to use a git-describe-ish format"
to use git describe to come up with a tag.  Which is nice, but git describe
sometimes can't describe the revision.
Commit 56b2f070 ("setlocalversion: do not
describe if there is nothing to describe") addressed this, but there is still
no tag generated.

So, generate a plain abbreviated sha1 tag like setlocalversion used to when
git describe comes up short.

Signed-off-by: Trent Piepho <tpiepho@freescale.com>
CC: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

parent e6e6733e

scripts/setlocalversion

+3 −1

Original line number	Diff line number	Diff line
		@@ -9,11 +9,13 @@ usage() {
		cd "${1:-.}" \|\| usage

		# Check for git and a git repo.
		if head=`git rev-parse --verify HEAD 2>/dev/null`; then
		if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
		# Do we have an untagged version?
		if git name-rev --tags HEAD \| grep -E '^HEAD[[:space:]]+(.~[0-9]\|undefined)$' > /dev/null; then
		if tag=`git describe 2>/dev/null`; then
		echo $tag \| awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
		else
		printf '%s%s' -g $head
		fi
		fi

Admin message