X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=version.sh;h=83cda7a01a816a9ba656ca15927fc33e00ee440f;hp=4d96d11250beb4351c1d9a190f27533c6383116f;hb=cf9e0cd6f7caf7b171457f7bf9f56f23ec3e478c;hpb=5a3a05b2b0c0d417a2a5ab57a0caaa0e6b7a26af

diff --git a/version.sh b/version.sh
index 4d96d11..83cda7a 100755
--- a/version.sh
+++ b/version.sh
@@ -5,23 +5,34 @@
 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})
+	tag=$(git describe --tags 2>/dev/null)
+	version=$(printf "%s%s" ${tag} ${suffix})
 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