From f526361c1d36bce7aed5175b24816eed1a54da74 Mon Sep 17 00:00:00 2001
From: Li Xi <lixi@ddn.com>
Date: Wed, 9 Oct 2019 23:23:21 +0800
Subject: [PATCH] RM-620: add ddn tags to RPMs

The RPMs should have formats like following:

2.12.2_ddn0_334_g460f956

Change-Id: Ic7dd5290b4e9b439c8513150e3813ddeb23f1dfd
Signed-off-by: Wang Shilong <wshilong@ddn.com>
Signed-off-by: Li Xi <lixi@ddn.com>
Reviewed-on: https://review.whamcloud.com/41830
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
---
 LUSTRE-VERSION-GEN | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/LUSTRE-VERSION-GEN b/LUSTRE-VERSION-GEN
index 4b62a7c..80d0c9e 100755
--- a/LUSTRE-VERSION-GEN
+++ b/LUSTRE-VERSION-GEN
@@ -1,12 +1,14 @@
 #!/bin/sh
 
 DEFAULT_VERSION=2.14.0
+DDN_VERSION=ddn0
 LVF=LUSTRE-VERSION-FILE
 
 LF='
 '
 
 if test -d ${GIT_DIR:-.git} -o -f .git &&
+	S_VN=$(git describe --match "[0-9]*" --abbrev=0 HEAD 2>/dev/null) &&
         VN=$(git describe --match "[0-9]*" --abbrev=7 HEAD 2>/dev/null) &&
         case "$VN" in
         *$LF*) (exit 1) ;;
@@ -16,12 +18,13 @@ if test -d ${GIT_DIR:-.git} -o -f .git &&
                 VN="$VN-dirty" ;;
         esac
 then
+        S_VN=$(echo "$S_VN" | sed -e 's/-/_/g');
         VN=$(echo "$VN" | sed -e 's/-/_/g');
 elif test -r $LVF
 then
         VN=$(sed -e 's/^LUSTRE_VERSION = //' <$LVF)
 else
-        VN="$DEFAULT_VERSION"
+        VN=${DEFAULT_VERSION}_${DDN_VERSION}
 fi
 
 if test -r $LVF
@@ -30,6 +33,9 @@ then
 else
         VC=unset
 fi
+[ -z $S_VN ] && S_VN=$(echo $VN | awk -F '_' '{print $1}')
+echo $VN | grep ddn >&/dev/null ||
+        VN=$(echo "$VN" | sed -s "s#${S_VN}#${S_VN}_${DDN_VERSION}#")
 test "$VN" = "$VC" || {
         echo "LUSTRE_VERSION = $VN" >$LVF
 }
-- 
1.8.3.1