| Patrick Williams | d849ec7 | 2016-08-17 14:59:38 -0500 | [diff] [blame^] | 1 | From dd915e7f70e676aea93f750c75d16ce646e71e4b Mon Sep 17 00:00:00 2001 |
| 2 | From: Mark Asselstine <mark.asselstine@windriver.com> |
| 3 | Date: Wed, 9 Sep 2015 11:52:44 -0400 |
| 4 | Subject: [PATCH] Revert "build: add $(prefix) to SYSTEMD_UNIT_DIR" |
| 5 | |
| 6 | This reverts upstream commit 00e9d6071b2450659ce01bc984f64ecb5d7ba62d |
| 7 | with minor context changes to allow it to apply. |
| 8 | |
| 9 | Yocto based builds use /lib/systemd/system for systemd unit files and |
| 10 | since upstream has chosen to use a mechanism for setting |
| 11 | SYSTEMD_UNIT_DIR which is not flexible we have to resort to reverting |
| 12 | this upstream commit to avoid having ${prefix} added to the path. |
| 13 | |
| 14 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> |
| 15 | [ywei: rebased to libvirt-1.3.2] |
| 16 | Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com> |
| 17 | --- |
| 18 | daemon/Makefile.am | 2 +- |
| 19 | src/Makefile.am | 2 +- |
| 20 | tools/Makefile.am | 2 +- |
| 21 | 3 files changed, 3 insertions(+), 3 deletions(-) |
| 22 | |
| 23 | diff --git a/daemon/Makefile.am b/daemon/Makefile.am |
| 24 | index 2dbe81b..41ea2db 100644 |
| 25 | --- a/daemon/Makefile.am |
| 26 | +++ b/daemon/Makefile.am |
| 27 | @@ -445,7 +445,7 @@ endif ! LIBVIRT_INIT_SCRIPT_UPSTART |
| 28 | |
| 29 | if LIBVIRT_INIT_SCRIPT_SYSTEMD |
| 30 | |
| 31 | -SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system |
| 32 | +SYSTEMD_UNIT_DIR = /lib/systemd/system |
| 33 | BUILT_SOURCES += libvirtd.service libvirtd.socket |
| 34 | |
| 35 | install-init-systemd: install-sysconfig libvirtd.service libvirtd.socket |
| 36 | diff --git a/src/Makefile.am b/src/Makefile.am |
| 37 | index a316b4d..d271291 100644 |
| 38 | --- a/src/Makefile.am |
| 39 | +++ b/src/Makefile.am |
| 40 | @@ -2594,7 +2594,7 @@ EXTRA_DIST += \ |
| 41 | if WITH_LIBVIRTD |
| 42 | if LIBVIRT_INIT_SCRIPT_SYSTEMD |
| 43 | |
| 44 | -SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system |
| 45 | +SYSTEMD_UNIT_DIR = /lib/systemd/system |
| 46 | |
| 47 | BUILT_SOURCES += virtlockd.service virtlockd.socket \ |
| 48 | virtlogd.service virtlogd.socket |
| 49 | diff --git a/tools/Makefile.am b/tools/Makefile.am |
| 50 | index b3227a7..0e58f73 100644 |
| 51 | --- a/tools/Makefile.am |
| 52 | +++ b/tools/Makefile.am |
| 53 | @@ -356,7 +356,7 @@ libvirt-guests.init: libvirt-guests.init.in libvirt-guests.sh |
| 54 | |
| 55 | |
| 56 | EXTRA_DIST += libvirt-guests.service.in |
| 57 | -SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system |
| 58 | +SYSTEMD_UNIT_DIR = /lib/systemd/system |
| 59 | |
| 60 | if LIBVIRT_INIT_SCRIPT_SYSTEMD |
| 61 | install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh |
| 62 | -- |
| 63 | 1.9.1 |
| 64 | |