starlingx/fault
Code Issues Proposed changes

Rework fm-mgr Makefile and spec

Browse Source 
Move service installation out of the Makefile.
This will let Debian build system control the service installation.

Test on CentOS:
PASS: build-pkgs && build-iso
PASS: install iso & fminit service exists
PASS: bootstrap & unlock

Story: 2009101
Task: 44321
Change-Id: I244c078b19fb0817fcd9ac3c2b026a32024dd1c9
Signed-off-by: Dan Voiculeasa <dan.voiculeasa@windriver.com>
This commit is contained in:
Dan Voiculeasa 2022-04-05 14:46:15 +03:00 committed by Al Bailey
parent 30e9761ede
commit be2ceec7a9
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,6 +41,7 @@ make DESTDIR=%{buildroot} \
UNITDIR=%{_unitdir} \ UNITDIR=%{_unitdir} \
MAJOR=$MAJOR MINOR=$MINOR \ MAJOR=$MAJOR MINOR=$MINOR \
install install
install -m 644 fminit.service %{buildroot}%{_unitdir}/fminit.service
%clean %clean
rm -rf %{buildroot} rm -rf %{buildroot}

2
fm-mgr/sources/Makefile
View File

@ -12,7 +12,6 @@ MINOR ?= 0
DESTDIR ?= / DESTDIR ?= /
BINDIR ?= /usr/local/bin BINDIR ?= /usr/local/bin
SYSCONFDIR ?= /etc SYSCONFDIR ?= /etc
UNITDIR ?= /usr/lib/systemd/system
build: fmManager build: fmManager
@ -35,4 +34,3 @@ install:
install -m 755 fminit $(DESTDIR)$(SYSCONFDIR)/init.d/fminit install -m 755 fminit $(DESTDIR)$(SYSCONFDIR)/init.d/fminit
install -m 755 fmManager $(DESTDIR)$(BINDIR)/fmManager install -m 755 fmManager $(DESTDIR)$(BINDIR)/fmManager
install -m 644 fm.logrotate $(DESTDIR)$(SYSCONFDIR)/logrotate.d/fm.logrotate install -m 644 fm.logrotate $(DESTDIR)$(SYSCONFDIR)/logrotate.d/fm.logrotate
install -m 644 fminit.service $(DESTDIR)$(UNITDIR)/fminit.service