starlingx
/
ha
Code Issues Proposed changes

Merge "debian: Fix sm-db installation issues"

This commit is contained in:
Zuul 2022-03-09 01:52:34 +00:00 committed by Gerrit Code Review
parent 456f2ab374 011b2a2fa1
commit 3012c29a4a
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
service-mgmt/sm-db/debian/deb_folder/rules
View File

@ -13,7 +13,6 @@ override_dh_auto_build:
dh_auto_build
override_dh_auto_install:
rm -rf ${ROOT}
$(MAKE) DEST_DIR=${ROOT} \
VER=$(VER) \
VER_MJR=$(VER_MJR) \

2
service-mgmt/sm-db/debian/deb_folder/sm-db-dev.install
View File

@ -1,2 +1,2 @@
usr/lib64/libsm_db.so
usr/lib/libsm_db.so
usr/include/*.h

2
service-mgmt/sm-db/debian/deb_folder/sm-db.install
View File

@ -1,4 +1,4 @@
usr/lib64/libsm_db.so.*
usr/lib/libsm_db.so.*
var/lib/sm/patches/sm-patch.sql
# Marked on centos .spec file as "%config(noreplace)"

12
service-mgmt/sm-db/src/Makefile
View File

@ -33,6 +33,12 @@ CCFLAGS= -fPIC -g -O2 -Wall -Werror -std=c++11 -Wformat -Wformat-security -Wno-s
EXTRACCFLAGS= -D__STDC_FORMAT_MACROS
LDLIBS= -lsqlite3 -lglib-2.0 -luuid -lrt -lsm_common
LDFLAGS = -shared -rdynamic
OS_ID = $(shell grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
ifeq ($(OS_ID),debian)
LIBDIR = $(DEST_DIR)/usr/lib
else
LIBDIR = $(DEST_DIR)/usr/lib64
endif
build: libsm_db.so sm_db_build
@ -52,9 +58,9 @@ sm_db_build: ${OBJS}
$(CXX) $(INCLUDES) $(CCFLAGS) $(EXTRACCFLAGS) $(OBJS) $(LDLIBS) -o sm_db_build
install:
install -d ${DEST_DIR}/usr/lib64
install libsm_db.so.${VER} $(DEST_DIR)/usr/lib64
cp -P libsm_db.so libsm_db.so.$(VER_MJR) $(DEST_DIR)/usr/lib64
install -d $(LIBDIR)
install libsm_db.so.${VER} $(LIBDIR)
cp -P libsm_db.so libsm_db.so.$(VER_MJR) $(LIBDIR)
install -d ${DEST_DIR}/usr/include
install -m 0644 *.h ${DEST_DIR}/usr/include
install -d 755 ${DEST_DIR}/usr/bin