summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-02-04 23:12:33 +0000
committerGerrit Code Review <review@openstack.org>2019-02-04 23:12:33 +0000
commit4851c8658a4846bd1211d36cee7e95c285530f78 (patch)
tree7e0f8d7ebd192108e9f9360a9174b48ced695512
parent920a5e2e5db339631216af7bc6352d2a395d3bae (diff)
parent3d478b6e27b76f628939bf07ce05852fd861a7a7 (diff)
Merge "Standardizing Makefile install target name for service-mgmt/sm"
-rw-r--r--service-mgmt/sm-1.0.0/Makefile2
-rw-r--r--service-mgmt/sm-1.0.0/centos/sm.spec20
-rw-r--r--service-mgmt/sm-1.0.0/scripts/Makefile2
-rw-r--r--service-mgmt/sm-1.0.0/src/Makefile2
4 files changed, 5 insertions, 21 deletions
diff --git a/service-mgmt/sm-1.0.0/Makefile b/service-mgmt/sm-1.0.0/Makefile
index fe76b58..b1ba351 100644
--- a/service-mgmt/sm-1.0.0/Makefile
+++ b/service-mgmt/sm-1.0.0/Makefile
@@ -6,7 +6,7 @@
6build: 6build:
7 @(cd src; make build ) 7 @(cd src; make build )
8 8
9install_non_bb: 9install:
10 @(cd src; make $@) 10 @(cd src; make $@)
11 @(cd scripts; make $@) 11 @(cd scripts; make $@)
12 12
diff --git a/service-mgmt/sm-1.0.0/centos/sm.spec b/service-mgmt/sm-1.0.0/centos/sm.spec
index c8ccd17..27f97f3 100644
--- a/service-mgmt/sm-1.0.0/centos/sm.spec
+++ b/service-mgmt/sm-1.0.0/centos/sm.spec
@@ -59,10 +59,10 @@ MAJOR=`echo $VER | awk -F . '{print $1}'`
59make -j"%(nproc)" 59make -j"%(nproc)"
60 60
61%install 61%install
62rm -rf $RPM_BUILD_ROOT 62rm -rf %{buildroot}
63VER=%{version} 63VER=%{version}
64MAJOR=`echo $VER | awk -F . '{print $1}'` 64MAJOR=`echo $VER | awk -F . '{print $1}'`
65make DEST_DIR=$RPM_BUILD_ROOT UNIT_DIR=%{_unitdir} install_non_bb 65make DEST_DIR=%{buildroot} UNIT_DIR=%{_unitdir} install
66 66
67%post 67%post
68/usr/bin/systemctl enable sm.service >/dev/null 2>&1 68/usr/bin/systemctl enable sm.service >/dev/null 2>&1
@@ -81,19 +81,3 @@ make DEST_DIR=$RPM_BUILD_ROOT UNIT_DIR=%{_unitdir} install_non_bb
81"/etc/init.d/sm-shutdown" 81"/etc/init.d/sm-shutdown"
82"/etc/pmon.d/sm.conf" 82"/etc/pmon.d/sm.conf"
83"/etc/logrotate.d/sm.logrotate" 83"/etc/logrotate.d/sm.logrotate"
84
85#%files -n sm-dbg
86#%defattr(-,-,-,-)
87#%dir "/usr"
88#%dir "/usr/bin"
89#%dir "/usr/src"
90#%dir "/usr/bin/.debug"
91#"/usr/bin/.debug/sm"
92#%dir "/usr/src/debug"
93#%dir "/usr/src/debug/sm"
94#%dir "/usr/src/debug/sm/1.0.0-r10"
95#%dir "/usr/src/debug/sm/1.0.0-r10/src"
96#/usr/src/debug/sm/1.0.0-r10/src/*.c
97#/usr/src/debug/sm/1.0.0-r10/src/*.h
98
99
diff --git a/service-mgmt/sm-1.0.0/scripts/Makefile b/service-mgmt/sm-1.0.0/scripts/Makefile
index 6471cf3..cbaa6b7 100644
--- a/service-mgmt/sm-1.0.0/scripts/Makefile
+++ b/service-mgmt/sm-1.0.0/scripts/Makefile
@@ -1,4 +1,4 @@
1install_non_bb: 1install:
2 install -d ${DEST_DIR}/etc/init.d 2 install -d ${DEST_DIR}/etc/init.d
3 install sm ${DEST_DIR}/etc/init.d/sm 3 install sm ${DEST_DIR}/etc/init.d/sm
4 install sm.shutdown ${DEST_DIR}/etc/init.d/sm-shutdown 4 install sm.shutdown ${DEST_DIR}/etc/init.d/sm-shutdown
diff --git a/service-mgmt/sm-1.0.0/src/Makefile b/service-mgmt/sm-1.0.0/src/Makefile
index 045da61..dde94ae 100644
--- a/service-mgmt/sm-1.0.0/src/Makefile
+++ b/service-mgmt/sm-1.0.0/src/Makefile
@@ -130,7 +130,7 @@ LDFLAGS = -rdynamic
130build: $(OBJS) 130build: $(OBJS)
131 $(CXX) $(CCFLAGS) $(EXTRACCFLAGS) $(OBJS) ${LDFLAGS} $(LDLIBS) -o sm 131 $(CXX) $(CCFLAGS) $(EXTRACCFLAGS) $(OBJS) ${LDFLAGS} $(LDLIBS) -o sm
132 132
133install_non_bb: 133install:
134 install -d 755 ${DEST_DIR}/usr/bin 134 install -d 755 ${DEST_DIR}/usr/bin
135 install -m 755 sm ${DEST_DIR}/usr/bin/sm 135 install -m 755 sm ${DEST_DIR}/usr/bin/sm
136 136