Remove version from sm-db folder

The sm-db component had the 1.0.0 version in the folder name, this
change removes that version and updates the centos_pkg_dirs.

Story: 2006623
Task: 36829

Depends-On: https://review.opendev.org/#/c/685127
Change-Id: Ia6025337529f4f48a89c175bb524548d81bc993f
Signed-off-by: Erich Cordoba <erich.cordoba.malibran@intel.com>
This commit is contained in:
Erich Cordoba 2019-09-26 11:23:05 -05:00
parent 44f220a3b8
commit 54a16057ff
51 changed files with 6 additions and 6 deletions

View File

@ -1,5 +1,5 @@
service-mgmt/sm-common
service-mgmt/sm-db-1.0.0
service-mgmt/sm-db
service-mgmt/sm-1.0.0
service-mgmt-api
service-mgmt-client

View File

@ -52,8 +52,8 @@ function build_sm {
# CCFLAGS= -g -O2 -Wall -Werror -Wformat -std=c++11
make \
CCFLAGS="-g -O2 -Wall -Wformat -Wunused-result -std=c++11" \
INCLUDES="-I$STX_HA_DIR/service-mgmt/sm-common/src -I$STX_HA_DIR/service-mgmt/sm-db-${STX_SM_DB_VERSION}/src -I/usr/lib64/glib-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I$/usr/local/include" \
LDLIBS="-L $STX_HA_DIR/service-mgmt/sm-common/src -L $STX_HA_DIR/service-mgmt/sm-db-${STX_SM_DB_VERSION}/src -lsqlite3 -lglib-2.0 -luuid -lpthread -lrt -lsm_common -lsm_db -lfmcommon -ljson-c -lcrypto -lssl" \
INCLUDES="-I$STX_HA_DIR/service-mgmt/sm-common/src -I$STX_HA_DIR/service-mgmt/sm-db/src -I/usr/lib64/glib-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I$/usr/local/include" \
LDLIBS="-L $STX_HA_DIR/service-mgmt/sm-common/src -L $STX_HA_DIR/service-mgmt/sm-db/src -lsqlite3 -lglib-2.0 -luuid -lpthread -lrt -lsm_common -lsm_db -lfmcommon -ljson-c -lcrypto -lssl" \
build
popd
@ -83,7 +83,7 @@ function build_sm_common {
}
function build_sm_db {
pushd $STX_HA_DIR/service-mgmt/sm-db-${STX_SM_DB_VERSION}
pushd $STX_HA_DIR/service-mgmt/sm-db
# INCLUDES because we need /usr/lib/x86_64-linux-gnu/glib-2.0/include
make \
@ -170,7 +170,7 @@ function cleanup_sm_common {
}
function cleanup_sm_db {
pushd $STX_HA_DIR/service-mgmt/sm-db-${STX_SM_DB_VERSION}
pushd $STX_HA_DIR/service-mgmt/sm-db
make clean
@ -357,7 +357,7 @@ function install_sm_common {
}
function install_sm_db {
pushd $STX_HA_DIR/service-mgmt/sm-db-${STX_SM_DB_VERSION}
pushd $STX_HA_DIR/service-mgmt/sm-db
build_sm_db