discover: Handle and track plugin_options

[petitboot] / version.sh

diff --git a/version.sh b/version.sh
index 4f6f8619502917ca8b4cd02b022cf49025272f08..bf91f707147d90c086c49bf51b39b80c2e4be3f7 100755 (executable)
--- a/version.sh
+++ b/version.sh
@@ -5,7 +5,7 @@
 version=
 datefmt='%Y%m%d'
 
-export GIT_DIR=$(basename $0)/.git/
+export GIT_DIR=$(dirname $0)/.git/
 
 if head=$(git rev-parse --short=8 --verify HEAD 2>/dev/null); then
 
@@ -23,11 +23,24 @@ if head=$(git rev-parse --short=8 --verify HEAD 2>/dev/null); then
                # 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})
+               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