Juan Hernandez has uploaded a new change for review. Change subject: packaging: Move installation of systemd to .spec ......................................................................
packaging: Move installation of systemd to .spec Currently we install the systemd unit files from the Makefile, but as this is Fedora specific it is better placed in the Fedora .spec. Change-Id: Icd38fe7b33aff0d1c4d8b65121a218a69b35a41e Signed-off-by: Juan Hernandez <[email protected]> --- M Makefile M packaging/fedora/spec/ovirt-engine.spec.in 2 files changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/89/10889/1 diff --git a/Makefile b/Makefile index 45f8dc4..509b354 100644 --- a/Makefile +++ b/Makefile @@ -210,9 +210,6 @@ @install -dm 755 $(DESTDIR)$(SYSCONF_DIR)/security/limits.d @install -dm 755 $(DESTDIR)$(SYSCONF_DIR)/rc.d/init.d - @install -dm 755 $(DESTDIR)/usr/lib/systemd/system - @install -dm 755 $(DESTDIR)$(SYSCONF_DIR)/tmpfiles.d - install_artifacts: @echo "*** Deploying EAR to $(DESTDIR)" install -dm 755 $(DESTDIR)$(PKG_EAR_DIR) @@ -364,7 +361,6 @@ install -m 644 backend/manager/conf/engine.conf.defaults $(DESTDIR)$(DATA_DIR)/conf install -m 755 packaging/resources/ovirtlogrot.sh ${DESTDIR}$(DATA_DIR)/scripts/ install -m 755 packaging/resources/ovirt-cron ${DESTDIR}$(SYSCONF_DIR)/cron.daily/ - install -m 644 packaging/resources/ovirt-tmpfilesd ${DESTDIR}$(SYSCONF_DIR)/tmpfiles.d/$(ENGINE_NAME).conf # USB filter: install -m 644 frontend/usbfilter.txt $(DESTDIR)$(PKG_SYSCONF_DIR) @@ -389,7 +385,6 @@ install -m 755 packaging/fedora/engine-service.py $(DESTDIR)$(DATA_DIR)/service install -m 644 packaging/fedora/engine-service.sysconfig $(DESTDIR)$(SYSCONF_DIR)/sysconfig/ovirt-engine install -m 644 packaging/fedora/engine-service.limits $(DESTDIR)$(SYSCONF_DIR)/security/limits.d/10-$(ENGINE_NAME).conf - install -m 644 packaging/fedora/engine-service.systemd $(DESTDIR)/usr/lib/systemd/system/ovirt-engine.service # Install the links: ln -s $(DATA_DIR)/service/engine-service.py $(DESTDIR)$(BIN_DIR)/engine-service diff --git a/packaging/fedora/spec/ovirt-engine.spec.in b/packaging/fedora/spec/ovirt-engine.spec.in index f3c50f3..67aae80 100644 --- a/packaging/fedora/spec/ovirt-engine.spec.in +++ b/packaging/fedora/spec/ovirt-engine.spec.in @@ -498,6 +498,12 @@ find %{buildroot}%{engine_jboss_modules} -type d -exec chmod 755 {} \; find %{buildroot}%{engine_jboss_modules} -type f -exec chmod 644 {} \; +# Install the systemd files: +install -dm 755 %{buildroot}%{_unitdir} +install -m 644 packaging/fedora/engine-service.systemd %{buildroot}%{_unitdir}/%{engine_name}.service +install -dm 755 %{buildroot}%{_sysconfdir}/tmpfiles.d +install -m 644 packaging/resources/ovirt-tmpfilesd %{buildroot}%{_sysconfdir}/tmpfiles.d/ovirt-engine.conf + %preun if [ "$1" -eq 0 ] -- To view, visit http://gerrit.ovirt.org/10889 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icd38fe7b33aff0d1c4d8b65121a218a69b35a41e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
