diff options
Diffstat (limited to 'import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch')
-rw-r--r-- | import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch b/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch index 16c3a16bc..02ddf68eb 100644 --- a/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch +++ b/import-layers/meta-virtualization/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch @@ -1,3 +1,9 @@ +Upstream-Status: Inappropriate [configuration] + +Update context for version 1.3.5. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- From dd915e7f70e676aea93f750c75d16ce646e71e4b Mon Sep 17 00:00:00 2001 From: Mark Asselstine <mark.asselstine@windriver.com> Date: Wed, 9 Sep 2015 11:52:44 -0400 @@ -24,20 +30,20 @@ diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 2dbe81b..41ea2db 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am -@@ -445,7 +445,7 @@ endif ! LIBVIRT_INIT_SCRIPT_UPSTART +@@ -449,7 +449,7 @@ endif ! LIBVIRT_INIT_SCRIPT_UPSTART if LIBVIRT_INIT_SCRIPT_SYSTEMD -SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system +SYSTEMD_UNIT_DIR = /lib/systemd/system - BUILT_SOURCES += libvirtd.service libvirtd.socket + BUILT_SOURCES += libvirtd.service - install-init-systemd: install-sysconfig libvirtd.service libvirtd.socket + install-init-systemd: install-sysconfig libvirtd.service diff --git a/src/Makefile.am b/src/Makefile.am index a316b4d..d271291 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -2594,7 +2594,7 @@ EXTRA_DIST += \ +@@ -2633,7 +2633,7 @@ EXTRA_DIST += \ if WITH_LIBVIRTD if LIBVIRT_INIT_SCRIPT_SYSTEMD @@ -50,7 +56,7 @@ diff --git a/tools/Makefile.am b/tools/Makefile.am index b3227a7..0e58f73 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am -@@ -356,7 +356,7 @@ libvirt-guests.init: libvirt-guests.init.in libvirt-guests.sh +@@ -380,7 +380,7 @@ libvirt-guests.init: libvirt-guests.init.in libvirt-guests.sh EXTRA_DIST += libvirt-guests.service.in |