Juan Hernandez has uploaded a new change for review.
Change subject: packaging: Move systemd install to its own target
......................................................................
packaging: Move systemd install to its own target
Currently we install systemd related files as part of the
install_service target, but this has the inconvenient that it makes it
difficult to execute "make PREFIX=/myprefix install" succeed. This patch
moves the systemd installation to its own target, so that a regular
"make install" won't try to do it. The Fedora .spec uses now "make
install install_systemd".
Change-Id: I556d35706bcc7c6c856bb10e879459e7e587416c
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M Makefile
M packaging/fedora/spec/ovirt-engine.spec.in
2 files changed, 9 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/28/10028/1
diff --git a/Makefile b/Makefile
index 2201831..312039f 100644
--- a/Makefile
+++ b/Makefile
@@ -209,8 +209,6 @@
@install -dm 755 $(DESTDIR)$(SYSCONF_DIR)/cron.daily
@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:
@@ -389,8 +387,11 @@
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
+install_systemd:
+ @echo "*** Deploying systemd"
+ install -dm 755 $(DESTDIR)/usr/lib/systemd/system
+ install -m 644 packaging/fedora/engine-service.systemd
$(DESTDIR)/usr/lib/systemd/system/ovirt-engine.service
diff --git a/packaging/fedora/spec/ovirt-engine.spec.in
b/packaging/fedora/spec/ovirt-engine.spec.in
index 68a4d49..8145a73 100644
--- a/packaging/fedora/spec/ovirt-engine.spec.in
+++ b/packaging/fedora/spec/ovirt-engine.spec.in
@@ -375,7 +375,11 @@
# Use the makefile to do the normal installation, after that we
# will need to replace jar files with links to their actual
# locations:
-make %{make_common_opts} install DESTDIR=%{buildroot}
+make \
+ %{make_common_opts} \
+ DESTDIR=%{buildroot} \
+ install \
+ install_systemd
install -dm 755 %{buildroot}/%{engine_state}/deployments
install -dm 755 %{buildroot}/%{engine_state}/content
--
To view, visit http://gerrit.ovirt.org/10028
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I556d35706bcc7c6c856bb10e879459e7e587416c
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
