From fc31759423a6569b4544b8fdaedaed667c1b88dd Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 12 Feb 2019 16:38:27 -0500 Subject: [PATCH] Change debian/ubuntu build to use gitver --- build-ubunturepo | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build-ubunturepo b/build-ubunturepo index 76d981c21..39081fec2 100755 --- a/build-ubunturepo +++ b/build-ubunturepo @@ -194,7 +194,9 @@ then if ! grep -q 'Already up-to-date' $update_log; then code_change=1 fi - ver=`cat Version` + ver=${ver/-/.POST} + ver=${ver/-/.} + short_ver=`cat Version|cut -d. -f 1,2` short_short_ver=`cat Version|cut -d. -f 1` build_time=`date` @@ -215,7 +217,7 @@ then #the build introduce string build_string="Snap_Build" xcat_release="snap$(date '+%Y%m%d%H%M')" - pkg_version="${ver}-${xcat_release}" + pkg_version="${ver}" # -${xcat_release}" packages="xCAT-client xCAT-genesis-scripts perl-xCAT xCAT-server xCAT xCATsn xCAT-test xCAT-buildkit xCAT-vlan xCAT-confluent xCAT-probe" target_archs=(amd64 ppc64el)