starlingx
/
fault
Code Issues Proposed changes

Merge "Stardardize makefile for fm-mgr"

This commit is contained in:
Zuul 2018-12-10 14:30:40 +00:00 committed by Gerrit Code Review
parent cb0c7c68b1 81dccc9b83
commit 93f316da16
2 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fm-mgr/centos/fm-mgr.spec
View File

@ -16,7 +16,7 @@ BuildRequires: libuuid-devel
%description %description
CGTS platform Fault Manager that serves the client CGTS platform Fault Manager that serves the client
application fault management requests and raise/clear/update application fault management requests and raise/clear/update
alarms in the active alarm database. alarms in the active alarm database.
%prep %prep
@ -29,14 +29,19 @@ MINOR=`echo $VER | awk -F . '{print $2}'`
make MAJOR=$MAJOR MINOR=$MINOR %{?_smp_mflags} make MAJOR=$MAJOR MINOR=$MINOR %{?_smp_mflags}
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf %{buildroot}
VER=%{version} VER=%{version}
MAJOR=`echo $VER | awk -F . '{print $1}'` MAJOR=`echo $VER | awk -F . '{print $1}'`
MINOR=`echo $VER | awk -F . '{print $2}'` MINOR=`echo $VER | awk -F . '{print $2}'`
make DEST_DIR=$RPM_BUILD_ROOT BIN_DIR=%{local_bindir} LIB_DIR=%{_libdir} INC_DIR=%{_includedir} MAJOR=$MAJOR MINOR=$MINOR install_non_bb make DESTDIR=%{buildroot} \
BINDIR=%{local_bindir} \
SYSCONFDIR=%{_sysconfdir} \
UNITDIR=%{_unitdir} \
MAJOR=$MAJOR MINOR=$MINOR \
install
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf %{buildroot}
%files %files
@ -46,4 +51,3 @@ rm -rf $RPM_BUILD_ROOT
%_sysconfdir/init.d/fminit %_sysconfdir/init.d/fminit
%{_unitdir}/fminit.service %{_unitdir}/fminit.service
%config(noreplace) %{_sysconfdir}/logrotate.d/fm.logrotate %config(noreplace) %{_sysconfdir}/logrotate.d/fm.logrotate

34
fm-mgr/sources/Makefile
View File

@ -1,10 +1,19 @@
SRCS = fm_main.cpp SRCS = fm_main.cpp
OBJS = fm_main.o OBJS = fm_main.o
OBJS = $(SRCS:.cpp=.o) OBJS = $(SRCS:.cpp=.o)
INCLUDES = -I. INCLUDES = -I.
CCFLAGS = -g -O2 -Wall -Werror CCFLAGS = -g -O2 -Wall -Werror
MAJOR ?= 1
MINOR ?= 0
DESTDIR ?= /
BINDIR ?= /usr/local/bin
SYSCONFDIR ?= /etc
UNITDIR ?= /usr/lib/systemd/system
build: fmManager build: fmManager
.cpp.o: .cpp.o:
@ -16,14 +25,13 @@ fmManager: $(OBJS)
clean: clean:
@rm -f $(OBJS) @rm -f $(OBJS)
install_non_bb: install:
mkdir -p $(DEST_DIR)/usr/lib/systemd/system mkdir -p $(DESTDIR)/usr/lib/systemd/system
install -m 755 -d $(DEST_DIR)/etc install -m 755 -d $(DESTDIR)$(SYSCONFDIR)
install -m 755 -d $(DEST_DIR)/etc/init.d install -m 755 -d $(DESTDIR)$(SYSCONFDIR)/init.d
install -m 755 -d $(DEST_DIR)/etc/logrotate.d install -m 755 -d $(DESTDIR)$(SYSCONFDIR)/logrotate.d
install -m 755 -d $(DEST_DIR)/usr/local install -m 755 -d $(DESTDIR)$(BINDIR)
install -m 755 -d $(DEST_DIR)/usr/local/bin install -m 755 fminit $(DESTDIR)$(SYSCONFDIR)/init.d/fminit
install -m 755 fminit $(DEST_DIR)/etc/init.d/fminit install -m 755 fmManager $(DESTDIR)$(BINDIR)/fmManager
install -m 755 fmManager $(DEST_DIR)/usr/local/bin/fmManager install -m 644 fm.logrotate $(DESTDIR)$(SYSCONFDIR)/logrotate.d/fm.logrotate
install -m 644 fm.logrotate $(DEST_DIR)/etc/logrotate.d/fm.logrotate install -m 644 fminit.service $(DESTDIR)$(UNITDIR)/fminit.service
install -m 644 fminit.service $(DEST_DIR)/usr/lib/systemd/system/fminit.service