]> git.openfabrics.org - ~emulex/for-vlad/old/compat-rdma.git/commitdiff
admin_rdma.sh: Use setlocalversion instead of git describe
authorVladimir Sokolovsky <vlad@mellanox.com>
Wed, 14 Mar 2012 21:51:32 +0000 (23:51 +0200)
committerVladimir Sokolovsky <vlad@mellanox.com>
Wed, 14 Mar 2012 21:57:25 +0000 (23:57 +0200)
Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
scripts/admin_rdma.sh

index 82c5b4d0aafe9db4bebecf0e0b48f41bc4d33461..57a570dd10747837890e93c0deacf68da4cc33ed 100755 (executable)
@@ -371,7 +371,7 @@ done
 
 DIR="$PWD"
 cd $GIT_TREE
-GIT_DESCRIBE=$(git describe)
+GIT_DESCRIBE=$($DIR/scripts/setlocalversion $GIT_TREE)
 GIT_BRANCH=$(git branch --no-color |sed -n 's/^\* //p')
 GIT_BRANCH=${GIT_BRANCH:-master}
 GIT_REMOTE=$(git config branch.${GIT_BRANCH}.remote)
@@ -383,9 +383,9 @@ echo -e "Origin remote URL: ${CYAN}${GIT_REMOTE_URL}${NORMAL}"
 cd $DIR
 if [ -d ./.git ]; then
        if [[ ${POSTFIX_RELEASE_TAG} != "" ]]; then
-               echo -e "$(git describe)-${POSTFIX_RELEASE_TAG}" > compat_version
+               echo -e "$(./scripts/setlocalversion)-${POSTFIX_RELEASE_TAG}" > compat_version
        else
-               echo -e "$(git describe)" > compat_version
+               echo -e "$(./scripts/setlocalversion)" > compat_version
        fi
 
        cd $GIT_TREE