From 493caf3b881d23b6f36ad782dfb2ce316a4032e6 Mon Sep 17 00:00:00 2001 From: Marcela Rosales Date: Wed, 6 Feb 2019 09:41:53 -0600 Subject: [PATCH] Standardize Makefile install target name for service-mgmt/sm-db Change-Id: I0de8158fd83ed8dbb000425671c6c409eafc49f1 Story: 2004043 Task: 27541 Signed-off-by: Marcela Rosales --- service-mgmt/sm-db-1.0.0/Makefile | 2 +- service-mgmt/sm-db-1.0.0/centos/sm-db.spec | 37 +--------------------- service-mgmt/sm-db-1.0.0/database/Makefile | 6 +++- service-mgmt/sm-db-1.0.0/src/Makefile | 2 +- 4 files changed, 8 insertions(+), 39 deletions(-) diff --git a/service-mgmt/sm-db-1.0.0/Makefile b/service-mgmt/sm-db-1.0.0/Makefile index c9dace30..ec0c307b 100644 --- a/service-mgmt/sm-db-1.0.0/Makefile +++ b/service-mgmt/sm-db-1.0.0/Makefile @@ -6,7 +6,7 @@ build: @(cd src; make build VER=$(VER) VER_MJR=$(VER_MJR)) -install_non_bb: +install: @(cd src; make $@) @(cd database; make $@) diff --git a/service-mgmt/sm-db-1.0.0/centos/sm-db.spec b/service-mgmt/sm-db-1.0.0/centos/sm-db.spec index fde5042e..aa102a8f 100644 --- a/service-mgmt/sm-db-1.0.0/centos/sm-db.spec +++ b/service-mgmt/sm-db-1.0.0/centos/sm-db.spec @@ -19,23 +19,6 @@ BuildRequires: libuuid-devel %description Service Managment Databases -#%package -n sm-db-dbg -#Summary: Service Management Databases - Debugging files -#Group: devel -#Suggests: libsqlite3-dbg -#Suggests: libgcc-s-dbg(x86_64) -#Suggests: libglib-2.0-dbg(x86_64) -#Suggests: libstdc++-dbg(x86_64) -#Suggests: libc6-dbg(x86_64) -#Suggests: util-linux-libuuid-dbg -#Suggests: sm-common-dbg(x86_64) -#Recommends: sm-db = 1.0.0-r16.0 -#Provides: sm-db-dbg(x86_64) = 1.0.0-r16.0 - -#%description -n sm-db-dbg -#Service Managment Databases This package contains ELF symbols and related -#sources for debugging purposes. - %package dev Summary: Service Management Databases - Development files Group: devel @@ -60,7 +43,7 @@ make VER=${VER} VER_MJR=$MAJOR rm -rf $RPM_BUILD_ROOT VER=%{version} MAJOR=`echo $VER | awk -F . '{print $1}'` -make DEST_DIR=$RPM_BUILD_ROOT VER=$VER VER_MJR=$MAJOR install_non_bb +make DEST_DIR=$RPM_BUILD_ROOT VER=$VER VER_MJR=$MAJOR install %files %license LICENSE @@ -71,25 +54,7 @@ make DEST_DIR=$RPM_BUILD_ROOT VER=$VER VER_MJR=$MAJOR install_non_bb %config(noreplace)"/var/lib/sm/sm.db" "/var/lib/sm/patches/sm-patch.sql" -#%files -n sm-db-dbg -#%defattr(-,-,-,-) -#%dir "/usr" -#%dir "/usr/lib64" -#%dir "/usr/bin" -#%dir "/usr/src" -#%dir "/usr/lib64/.debug" -#"/usr/lib64/.debug/libsm_db.so.1.0.0" -#%dir "/usr/bin/.debug" -#%dir "/usr/src/debug" -#%dir "/usr/src/debug/sm-db" -#%dir "/usr/src/debug/sm-db/1.0.0-r16" -#%dir "/usr/src/debug/sm-db/1.0.0-r16/src" -#/usr/src/debug/sm-db/1.0.0-r16/src/*.h -#/usr/src/debug/sm-db/1.0.0-r16/src/*.c - %files dev %defattr(-,root,root,-) /usr/lib64/libsm_db.so /usr/include/*.h - - diff --git a/service-mgmt/sm-db-1.0.0/database/Makefile b/service-mgmt/sm-db-1.0.0/database/Makefile index 7b227d80..037eb80c 100644 --- a/service-mgmt/sm-db-1.0.0/database/Makefile +++ b/service-mgmt/sm-db-1.0.0/database/Makefile @@ -1,4 +1,8 @@ -install_non_bb: +# +## SPDX-License-Identifier: Apache-2.0 +# + +install: install -d ${DEST_DIR}/var/lib/sm install -d ${DEST_DIR}/var/lib/sm/patches install sm.hb.db ${DEST_DIR}/var/lib/sm diff --git a/service-mgmt/sm-db-1.0.0/src/Makefile b/service-mgmt/sm-db-1.0.0/src/Makefile index b3bfc9d7..a29b1aca 100644 --- a/service-mgmt/sm-db-1.0.0/src/Makefile +++ b/service-mgmt/sm-db-1.0.0/src/Makefile @@ -50,7 +50,7 @@ libsm_db.so.$(VER): ${OBJS} sm_db_build: ${OBJS} $(CXX) $(INCLUDES) $(CCFLAGS) $(EXTRACCFLAGS) $(OBJS) $(LDLIBS) -o sm_db_build -install_non_bb: +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