From be2ceec7a9109520e57209820e7780790da4c874 Mon Sep 17 00:00:00 2001 From: Dan Voiculeasa Date: Tue, 5 Apr 2022 14:46:15 +0300 Subject: [PATCH] Rework fm-mgr Makefile and spec 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 --- fm-mgr/centos/fm-mgr.spec | 1 + fm-mgr/sources/Makefile | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/fm-mgr/centos/fm-mgr.spec b/fm-mgr/centos/fm-mgr.spec index eea6cb89..acd2d8bc 100644 --- a/fm-mgr/centos/fm-mgr.spec +++ b/fm-mgr/centos/fm-mgr.spec @@ -41,6 +41,7 @@ make DESTDIR=%{buildroot} \ UNITDIR=%{_unitdir} \ MAJOR=$MAJOR MINOR=$MINOR \ install +install -m 644 fminit.service %{buildroot}%{_unitdir}/fminit.service %clean rm -rf %{buildroot} diff --git a/fm-mgr/sources/Makefile b/fm-mgr/sources/Makefile index 0d683c36..97c07f9c 100755 --- a/fm-mgr/sources/Makefile +++ b/fm-mgr/sources/Makefile @@ -12,7 +12,6 @@ MINOR ?= 0 DESTDIR ?= / BINDIR ?= /usr/local/bin SYSCONFDIR ?= /etc -UNITDIR ?= /usr/lib/systemd/system build: fmManager @@ -35,4 +34,3 @@ install: install -m 755 fminit $(DESTDIR)$(SYSCONFDIR)/init.d/fminit install -m 755 fmManager $(DESTDIR)$(BINDIR)/fmManager install -m 644 fm.logrotate $(DESTDIR)$(SYSCONFDIR)/logrotate.d/fm.logrotate - install -m 644 fminit.service $(DESTDIR)$(UNITDIR)/fminit.service