Debian: Remove conf files from etc-pmon.d
Removed conf files from /etc/pmon.d/ as they are being moved to another location. This is part of an effort to allow pmon conf files to be selected at runtime by kickstarts. The change is debian-only, since centos support will be dropped soon. Centos' pmon conf files remain in /etc/pmon.d/ Test Plan: PASS - deb doesn't install anything to /etc/pmon.d/ PASS - rpm files unchanged PASS - AIOSX unlocked-enabled-available PASS - Standard 2+2 unlocked-enabled-available Story: 2010211 Task: 46304 Depends-On: https://review.opendev.org/c/starlingx/metal/+/855095 Signed-off-by: Leonardo Fagundes Luz Serrano <Leonardo.FagundesLuzSerrano@windriver.com> Change-Id: Ie2f8e73f8664746d0213e98bba17e56d98d93b4f
This commit is contained in:
parent
199c1a8ba8
commit
f58f11ccba
|
@ -22,13 +22,11 @@ override_dh_install:
|
||||||
|
|
||||||
install -d $(ROOT)/etc/sm
|
install -d $(ROOT)/etc/sm
|
||||||
install -d $(ROOT)/etc/init.d
|
install -d $(ROOT)/etc/init.d
|
||||||
install -d $(ROOT)/etc/pmon.d
|
|
||||||
install -d $(ROOT)/$(PMONDIR)
|
install -d $(ROOT)/$(PMONDIR)
|
||||||
install -d $(ROOT)/lib/systemd/system/
|
install -d $(ROOT)/lib/systemd/system/
|
||||||
install -m 755 -p -D scripts/sm-api $(ROOT)/etc/init.d
|
install -m 755 -p -D scripts/sm-api $(ROOT)/etc/init.d
|
||||||
install -m 644 -p -D scripts/sm_api.ini $(ROOT)/etc/sm
|
install -m 644 -p -D scripts/sm_api.ini $(ROOT)/etc/sm
|
||||||
install -m 644 -p -D scripts/sm-api.conf $(ROOT)/$(PMONDIR)
|
install -m 644 -p -D scripts/sm-api.conf $(ROOT)/$(PMONDIR)
|
||||||
install -m 644 -p -D scripts/sm-api.conf $(ROOT)/etc/pmon.d
|
|
||||||
install -m 644 -p -D scripts/sm-api.service $(ROOT)/lib/systemd/system/
|
install -m 644 -p -D scripts/sm-api.service $(ROOT)/lib/systemd/system/
|
||||||
|
|
||||||
dh_install
|
dh_install
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
debian/systemd/00-sm-api.preset etc/systemd/system-preset
|
debian/systemd/00-sm-api.preset etc/systemd/system-preset
|
||||||
etc/init.d/sm-api
|
etc/init.d/sm-api
|
||||||
etc/pmon.d/sm-api.conf
|
|
||||||
etc/sm/sm_api.ini
|
etc/sm/sm_api.ini
|
||||||
etc/sm-api/policy.json
|
etc/sm-api/policy.json
|
||||||
lib/systemd/system/*
|
lib/systemd/system/*
|
||||||
|
|
|
@ -11,14 +11,14 @@ build:
|
||||||
|
|
||||||
install:
|
install:
|
||||||
@(cd src; make DEST_DIR=$(DEST_DIR) BIN_DIR=$(BIN_DIR) LIB_DIR=$(LIB_DIR) INC_DIR=$(INC_DIR) VER=$(VER) VER_MJR=$(VER_MJR) install)
|
@(cd src; make DEST_DIR=$(DEST_DIR) BIN_DIR=$(BIN_DIR) LIB_DIR=$(LIB_DIR) INC_DIR=$(INC_DIR) VER=$(VER) VER_MJR=$(VER_MJR) install)
|
||||||
@(cd scripts; make DEST_DIR=$(DEST_DIR) UNIT_DIR=$(UNIT_DIR) install)
|
@(cd scripts; make DEST_DIR=$(DEST_DIR) PMONDIR=$(PMONDIR) UNIT_DIR=$(UNIT_DIR) install)
|
||||||
install -m 750 -d $(DEST_DIR)/usr
|
install -m 750 -d $(DEST_DIR)/usr
|
||||||
install -m 750 -d $(DEST_DIR)/usr/bin
|
install -m 750 -d $(DEST_DIR)/usr/bin
|
||||||
install -m 750 -p -D $(BUILDSUBDIR)/src/sm_eru $(DEST_DIR)/$(BIN_DIR)/sm-eru
|
install -m 750 -p -D $(BUILDSUBDIR)/src/sm_eru $(DEST_DIR)/$(BIN_DIR)/sm-eru
|
||||||
install -m 750 -p -D $(BUILDSUBDIR)/src/sm_eru_dump $(DEST_DIR)/$(BIN_DIR)/sm-eru-dump
|
install -m 750 -p -D $(BUILDSUBDIR)/src/sm_eru_dump $(DEST_DIR)/$(BIN_DIR)/sm-eru-dump
|
||||||
install -m 644 -p -D $(BUILDSUBDIR)/scripts/sm-eru.service $(DEST_DIR)/$(UNIT_DIR)/sm-eru.service
|
install -m 644 -p -D $(BUILDSUBDIR)/scripts/sm-eru.service $(DEST_DIR)/$(UNIT_DIR)/sm-eru.service
|
||||||
install -m 750 -d $(DEST_DIR)/$(ETC_DIR)/pmon.d
|
install -m 750 -d $(DEST_DIR)$(PMONDIR)
|
||||||
install -m 640 -p -D $(BUILDSUBDIR)/scripts/sm-eru.conf $(DEST_DIR)/$(ETC_DIR)/pmon.d/sm-eru.conf
|
install -m 640 -p -D $(BUILDSUBDIR)/scripts/sm-eru.conf $(DEST_DIR)$(PMONDIR)/sm-eru.conf
|
||||||
install -m 750 -p -D $(BUILDSUBDIR)/scripts/sm-eru $(DEST_DIR)/$(ETC_DIR)/init.d/sm-eru
|
install -m 750 -p -D $(BUILDSUBDIR)/scripts/sm-eru $(DEST_DIR)/$(ETC_DIR)/init.d/sm-eru
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
|
|
|
@ -84,12 +84,14 @@ make VER=${VER} VER_MJR=$MAJOR %{?_smp_mflags}
|
||||||
|
|
||||||
%global _buildsubdir %{_builddir}/%{name}-%{version}
|
%global _buildsubdir %{_builddir}/%{name}-%{version}
|
||||||
|
|
||||||
|
%define pmondir /etc/pmon.d
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf %{buildroot}
|
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=%{buildroot} BIN_DIR=%{_bindir} UNIT_DIR=%{_unitdir} LIB_DIR=%{_libdir} INC_DIR=%{_includedir} BUILDSUBDIR=%{_buildsubdir} VER=$VER VER_MJR=$MAJOR install
|
make DEST_DIR=%{buildroot} BIN_DIR=%{_bindir} PMONDIR=%{pmondir} UNIT_DIR=%{_unitdir} LIB_DIR=%{_libdir} INC_DIR=%{_includedir} BUILDSUBDIR=%{_buildsubdir} VER=$VER VER_MJR=$MAJOR install
|
||||||
|
|
||||||
%post -n sm-eru
|
%post -n sm-eru
|
||||||
/usr/bin/systemctl enable sm-eru.service >/dev/null 2>&1
|
/usr/bin/systemctl enable sm-eru.service >/dev/null 2>&1
|
||||||
|
@ -110,7 +112,7 @@ make DEST_DIR=%{buildroot} BIN_DIR=%{_bindir} UNIT_DIR=%{_unitdir} LIB_DIR=%{_li
|
||||||
%files -n sm-eru
|
%files -n sm-eru
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
/etc/init.d/sm-eru
|
/etc/init.d/sm-eru
|
||||||
/etc/pmon.d/sm-eru.conf
|
%{pmondir}/sm-eru.conf
|
||||||
/usr/bin/sm-eru
|
/usr/bin/sm-eru
|
||||||
/usr/bin/sm-eru-dump
|
/usr/bin/sm-eru-dump
|
||||||
/usr/lib/systemd/system/sm-eru.service
|
/usr/lib/systemd/system/sm-eru.service
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/usr/bin/make -f
|
#!/usr/bin/make -f
|
||||||
|
|
||||||
export ROOT = $(CURDIR)/debian/tmp
|
export ROOT = $(CURDIR)/debian/tmp
|
||||||
export PMONDIR = usr/share/starlingx/pmon.d
|
export PMONDIR = /usr/share/starlingx/pmon.d
|
||||||
|
|
||||||
export VER = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
|
export VER = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
|
||||||
export VER_MJR = $(shell echo $(VER) | cut -d. -f1)
|
export VER_MJR = $(shell echo $(VER) | cut -d. -f1)
|
||||||
|
@ -18,13 +18,11 @@ override_dh_auto_install:
|
||||||
INC_DIR=/usr/include \
|
INC_DIR=/usr/include \
|
||||||
BUILDSUBDIR=$(CURDIR) \
|
BUILDSUBDIR=$(CURDIR) \
|
||||||
ETC_DIR=etc \
|
ETC_DIR=etc \
|
||||||
|
PMONDIR=${PMONDIR} \
|
||||||
VER=${VER} \
|
VER=${VER} \
|
||||||
VER_MJR=${VER_MJR} \
|
VER_MJR=${VER_MJR} \
|
||||||
install
|
install
|
||||||
|
|
||||||
install -m 750 -d $(ROOT)/$(PMONDIR)
|
|
||||||
install -m 640 -p -D scripts/sm-eru.conf $(ROOT)/$(PMONDIR)
|
|
||||||
|
|
||||||
# Prevents dh_fixperms from changing the permissions defined in the makefiles
|
# Prevents dh_fixperms from changing the permissions defined in the makefiles
|
||||||
override_dh_fixperms:
|
override_dh_fixperms:
|
||||||
dh_fixperms \
|
dh_fixperms \
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
debian/systemd/00-sm-eru.preset etc/systemd/system-preset
|
debian/systemd/00-sm-eru.preset etc/systemd/system-preset
|
||||||
etc/init.d/sm-eru
|
etc/init.d/sm-eru
|
||||||
etc/pmon.d/sm-eru.conf
|
|
||||||
lib/systemd/system/sm-eru.service
|
lib/systemd/system/sm-eru.service
|
||||||
usr/bin/sm-eru
|
usr/bin/sm-eru
|
||||||
usr/bin/sm-eru-dump
|
usr/bin/sm-eru-dump
|
||||||
|
|
|
@ -7,6 +7,6 @@ install:
|
||||||
install -m 644 *.service $(DEST_DIR)$(UNIT_DIR)
|
install -m 644 *.service $(DEST_DIR)$(UNIT_DIR)
|
||||||
install -d $(DEST_DIR)/etc/init.d
|
install -d $(DEST_DIR)/etc/init.d
|
||||||
install sm-eru $(DEST_DIR)/etc/init.d
|
install sm-eru $(DEST_DIR)/etc/init.d
|
||||||
install -d $(DEST_DIR)/etc/pmon.d
|
install -d $(DEST_DIR)$(PMONDIR)
|
||||||
install *.conf $(DEST_DIR)/etc/pmon.d
|
install *.conf $(DEST_DIR)$(PMONDIR)
|
||||||
|
|
||||||
|
|
|
@ -50,6 +50,8 @@ Service Managment
|
||||||
#Service Managment This package contains ELF symbols and related sources
|
#Service Managment This package contains ELF symbols and related sources
|
||||||
#for debugging purposes.
|
#for debugging purposes.
|
||||||
|
|
||||||
|
%define pmondir /etc/pmon.d
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup
|
%autosetup
|
||||||
|
|
||||||
|
@ -62,7 +64,7 @@ make -j"%(nproc)"
|
||||||
rm -rf %{buildroot}
|
rm -rf %{buildroot}
|
||||||
VER=%{version}
|
VER=%{version}
|
||||||
MAJOR=`echo $VER | awk -F . '{print $1}'`
|
MAJOR=`echo $VER | awk -F . '{print $1}'`
|
||||||
make DEST_DIR=%{buildroot} UNIT_DIR=%{_unitdir} install
|
make DEST_DIR=%{buildroot} PMONDIR=%{pmondir} UNIT_DIR=%{_unitdir} install
|
||||||
|
|
||||||
%post
|
%post
|
||||||
/usr/bin/systemctl enable sm.service >/dev/null 2>&1
|
/usr/bin/systemctl enable sm.service >/dev/null 2>&1
|
||||||
|
@ -79,5 +81,5 @@ make DEST_DIR=%{buildroot} UNIT_DIR=%{_unitdir} install
|
||||||
"/usr/local/sbin/sm-notification"
|
"/usr/local/sbin/sm-notification"
|
||||||
"/etc/init.d/sm"
|
"/etc/init.d/sm"
|
||||||
"/etc/init.d/sm-shutdown"
|
"/etc/init.d/sm-shutdown"
|
||||||
"/etc/pmon.d/sm.conf"
|
"%{pmondir}/sm.conf"
|
||||||
"/etc/logrotate.d/sm.logrotate"
|
"/etc/logrotate.d/sm.logrotate"
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
#!/usr/bin/make -f
|
#!/usr/bin/make -f
|
||||||
|
|
||||||
ROOT := $(CURDIR)/debian/tmp
|
ROOT := $(CURDIR)/debian/tmp
|
||||||
PMONDIR := usr/share/starlingx/pmon.d
|
PMONDIR := /usr/share/starlingx/pmon.d
|
||||||
|
UNIT_DIR := /lib/systemd/system
|
||||||
|
|
||||||
%:
|
%:
|
||||||
dh $@
|
dh $@
|
||||||
|
@ -12,12 +13,10 @@ override_dh_usrlocal:
|
||||||
|
|
||||||
override_dh_auto_install:
|
override_dh_auto_install:
|
||||||
$(MAKE) DEST_DIR=${ROOT} \
|
$(MAKE) DEST_DIR=${ROOT} \
|
||||||
UNIT_DIR=/lib/systemd/system \
|
PMONDIR=${PMONDIR} \
|
||||||
|
UNIT_DIR=${UNIT_DIR} \
|
||||||
install
|
install
|
||||||
|
|
||||||
install -d ${ROOT}/$(PMONDIR)
|
|
||||||
install -m 644 scripts/sm.conf ${ROOT}/$(PMONDIR)
|
|
||||||
|
|
||||||
dh_install
|
dh_install
|
||||||
|
|
||||||
override_dh_installsystemd:
|
override_dh_installsystemd:
|
||||||
|
|
|
@ -2,7 +2,6 @@ debian/systemd/00-sm.preset etc/systemd/system-preset
|
||||||
etc/init.d/sm
|
etc/init.d/sm
|
||||||
etc/init.d/sm-shutdown
|
etc/init.d/sm-shutdown
|
||||||
etc/logrotate.d/sm.logrotate
|
etc/logrotate.d/sm.logrotate
|
||||||
etc/pmon.d/sm.conf
|
|
||||||
lib/systemd/system/*
|
lib/systemd/system/*
|
||||||
usr/bin/sm
|
usr/bin/sm
|
||||||
usr/local/sbin/sm-notification
|
usr/local/sbin/sm-notification
|
||||||
|
|
|
@ -2,8 +2,6 @@ install:
|
||||||
install -d ${DEST_DIR}/etc/init.d
|
install -d ${DEST_DIR}/etc/init.d
|
||||||
install sm ${DEST_DIR}/etc/init.d/sm
|
install sm ${DEST_DIR}/etc/init.d/sm
|
||||||
install sm.shutdown ${DEST_DIR}/etc/init.d/sm-shutdown
|
install sm.shutdown ${DEST_DIR}/etc/init.d/sm-shutdown
|
||||||
install -d ${DEST_DIR}/etc/pmon.d
|
|
||||||
install -m 644 sm.conf ${DEST_DIR}/etc/pmon.d/sm.conf
|
|
||||||
install -d ${DEST_DIR}/etc/logrotate.d
|
install -d ${DEST_DIR}/etc/logrotate.d
|
||||||
install -m 644 sm.logrotate ${DEST_DIR}/etc/logrotate.d/sm.logrotate
|
install -m 644 sm.logrotate ${DEST_DIR}/etc/logrotate.d/sm.logrotate
|
||||||
install -d 755 ${DEST_DIR}/usr/local/sbin
|
install -d 755 ${DEST_DIR}/usr/local/sbin
|
||||||
|
@ -12,4 +10,6 @@ install:
|
||||||
install sm.notification ${DEST_DIR}/usr/local/sbin/sm-notification
|
install sm.notification ${DEST_DIR}/usr/local/sbin/sm-notification
|
||||||
install -d $(DEST_DIR)$(UNIT_DIR)
|
install -d $(DEST_DIR)$(UNIT_DIR)
|
||||||
install -m 644 *.service $(DEST_DIR)$(UNIT_DIR)
|
install -m 644 *.service $(DEST_DIR)$(UNIT_DIR)
|
||||||
|
install -d ${DEST_DIR}${PMONDIR}
|
||||||
|
install -m 644 sm.conf ${DEST_DIR}${PMONDIR}/sm.conf
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue