X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=version.sh;h=bf91f707147d90c086c49bf51b39b80c2e4be3f7;hp=4d96d11250beb4351c1d9a190f27533c6383116f;hb=591b8b6d39b2cf3c5a977afe99e3286166565096;hpb=5a3a05b2b0c0d417a2a5ab57a0caaa0e6b7a26af;ds=inline

diff --git a/version.sh b/version.sh
index 4d96d11..bf91f70 100755
--- a/version.sh
+++ b/version.sh
@@ -5,23 +5,42 @@
 version=
 datefmt='%Y%m%d'
 
-if head=$(git rev-parse --short=8 --verify HEAD 2>/dev/null); then
-
-	# If available, use the git commit revision for the package version,
-	# and add a date prefix for easy comparisons.
+export GIT_DIR=$(dirname $0)/.git/
 
-	date=$(git log --pretty=format:"%ct" -1 HEAD)
+if head=$(git rev-parse --short=8 --verify HEAD 2>/dev/null); then
 
 	suffix=''
-	# Add a '-dirty' postfix for uncommitted changes.
+	# Add a '-dirty' suffix for uncommitted changes.
 	if git diff-index HEAD | read dummy; then
 		suffix=-dirty
 	fi
 
-	version=$(printf "%($datefmt)T-g%s%s" ${date} ${head} ${suffix})
+	if tag=$(git describe --tags --exact-match 2>/dev/null); then
+		# use a tag; remove any 'v' prefix from v<VERSION> tags
+		tag=${tag#v}
+		version=$(printf "%s%s" ${tag} ${suffix})
+	else
+		# Use the git commit revision for the package version, and add
+		# a date prefix for easy comparisons.
+		date=$(git log --pretty=format:"%ct" -1 HEAD)
+		version=$(printf "%($datefmt)T.g%s%s" ${date} ${head} ${suffix})
+	fi
 else
-	# Default to current date and time.
-	version="$(date +dev-$datefmt)"
+	# Check if a specific version is set, eg: by buildroot
+	if [ ! -z "$PETITBOOT_VERSION" ];
+	then
+		# Full git hash
+		len=$(echo -n "${PETITBOOT_VERSION}" | wc -c)
+		if [[ ${len} == 40 ]]; then
+			version=`echo -n ${PETITBOOT_VERSION} | \
+				sed "s/^\([0-9a-f]\{7\}\).*/\1/;"`
+		else
+			version="$PETITBOOT_VERSION"
+		fi
+	else
+		# Default to current date and time.
+		version="$(date +dev.$datefmt)"
+	fi
 fi
 
 echo $version