forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
app-emulation/libvirt: Version bump to 4.1.0
Bug: https://bugs.gentoo.org/650018 Package-Manager: Portage-2.3.24, Repoman-2.3.6
- Loading branch information
Showing
3 changed files
with
589 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| DIST libvirt-4.0.0.tar.xz 15002248 BLAKE2B 066794909d02be04a7d70ebd5e6d423736fdaf95b7521edd47ef19f9bec4f16d6d3e64117356394ce5916761ad77d5afab84ace2f4828c1f97373d0053b6924b SHA512 c99ea305f427859eb070b5f0c43de48645a5c53a2aa8efc60f54f278ec3fa0b504307861309e1852f8d7bff4436afe00c859aac27691366a0c36c91341cea7a1 | ||
| DIST libvirt-4.1.0.tar.xz 15046956 BLAKE2B e5d4fb47d6308b2f74d464b8a4b236fcda96ca71357847ce7bc9c787e89111ed99538e9f7815287d14af24db1bc774012682843edc1e067cdf710e82d0b349c9 SHA512 62d1a228adf3270cc6defe3cbf92dac8c4ce2c434c4d97219571ccef799a4f6304cfd1ba9938338356641285f53ac71145d7b398523021c5ea1dc8e3d49cf894 |
204 changes: 204 additions & 0 deletions
204
app-emulation/libvirt/files/libvirt-4.1.0-do_not_use_sysconf.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,204 @@ | ||
| diff --git a/src/Makefile.am b/src/Makefile.am | ||
| index 3bf2da5..6b3f37a 100644 | ||
| --- a/src/Makefile.am | ||
| +++ b/src/Makefile.am | ||
| @@ -2165,23 +2165,6 @@ EXTRA_DIST += \ | ||
| $(SYSCONF_FILES) \ | ||
| $(NULL) | ||
|
|
||
| -install-sysconfig: | ||
| - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig | ||
| - for f in $(SYSCONF_FILES:%.sysconf=%) ; \ | ||
| - do \ | ||
| - tgt=`basename $$f`; \ | ||
| - $(INSTALL_SCRIPT) $(srcdir)/$$f.sysconf \ | ||
| - $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ | ||
| - done | ||
| - | ||
| -uninstall-sysconfig: | ||
| - for f in $(SYSCONF_FILES:%.sysconf=%) ; \ | ||
| - do \ | ||
| - tgt=`basename $$f`; \ | ||
| - rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ | ||
| - done | ||
| - rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : | ||
| - | ||
| SYSVINIT_FILES_IN = \ | ||
| locking/virtlockd.init.in \ | ||
| logging/virtlogd.init.in \ | ||
| @@ -2268,14 +2251,14 @@ uninstall-polkit:: | ||
| endif ! WITH_POLKIT | ||
|
|
||
| if LIBVIRT_INIT_SCRIPT_RED_HAT | ||
| -install-init:: $(SYSVINIT_FILES) install-sysconfig | ||
| +install-init:: $(SYSVINIT_FILES) | ||
| $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d | ||
| for f in $(SYSVINIT_FILES:%.init=%) ; \ | ||
| do \ | ||
| $(INSTALL_SCRIPT) $$f.init $(DESTDIR)$(sysconfdir)/rc.d/init.d/$$f; \ | ||
| done | ||
|
|
||
| -uninstall-init:: uninstall-sysconfig | ||
| +uninstall-init:: | ||
| rm -f $(SYSVINIT_FILES:%.init=$(DESTDIR)$(sysconfdir)/rc.d/init.d/%) | ||
| rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d || : | ||
|
|
||
| diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in | ||
| index 3c9d587..2449b20 100644 | ||
| --- a/src/locking/virtlockd.service.in | ||
| +++ b/src/locking/virtlockd.service.in | ||
| @@ -7,8 +7,7 @@ Documentation=man:virtlockd(8) | ||
| Documentation=https://libvirt.org | ||
|
|
||
| [Service] | ||
| -EnvironmentFile=-/etc/sysconfig/virtlockd | ||
| -ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS | ||
| +ExecStart=@sbindir@/virtlockd | ||
| ExecReload=/bin/kill -USR1 $MAINPID | ||
| # Loosing the locks is a really bad thing that will | ||
| # cause the machine to be fenced (rebooted), so make | ||
| diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in | ||
| index 3d9ae36..4373619 100644 | ||
| --- a/src/logging/virtlogd.service.in | ||
| +++ b/src/logging/virtlogd.service.in | ||
| @@ -7,8 +7,7 @@ Documentation=man:virtlogd(8) | ||
| Documentation=https://libvirt.org | ||
|
|
||
| [Service] | ||
| -EnvironmentFile=-/etc/sysconfig/virtlogd | ||
| -ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS | ||
| +ExecStart=@sbindir@/virtlogd | ||
| ExecReload=/bin/kill -USR1 $MAINPID | ||
| # Loosing the logs is a really bad thing that will | ||
| # cause the machine to be fenced (rebooted), so make | ||
| diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in | ||
| index 769702e..1830c72 100644 | ||
| --- a/src/remote/libvirtd.service.in | ||
| +++ b/src/remote/libvirtd.service.in | ||
| @@ -21,8 +21,7 @@ Documentation=https://libvirt.org | ||
|
|
||
| [Service] | ||
| Type=notify | ||
| -EnvironmentFile=-/etc/sysconfig/libvirtd | ||
| -ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS | ||
| +ExecStart=@sbindir@/libvirtd | ||
| ExecReload=/bin/kill -HUP $MAINPID | ||
| KillMode=process | ||
| Restart=on-failure | ||
| diff --git a/tools/Makefile.am b/tools/Makefile.am | ||
| index 85e640b..99b9fa1 100644 | ||
| --- a/tools/Makefile.am | ||
| +++ b/tools/Makefile.am | ||
| @@ -336,15 +336,6 @@ install-data-local: install-init install-systemd install-nss \ | ||
| uninstall-local: uninstall-init uninstall-systemd uninstall-nss \ | ||
| uninstall-bash-completion | ||
|
|
||
| -install-sysconfig: | ||
| - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig | ||
| - $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \ | ||
| - $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests | ||
| - | ||
| -uninstall-sysconfig: | ||
| - rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests | ||
| - rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||: | ||
| - | ||
| EXTRA_DIST += libvirt-guests.sh.in libvirt-guests.init.in | ||
|
|
||
| install-initscript: libvirt-guests.init | ||
| @@ -359,8 +350,8 @@ uninstall-initscript: | ||
|
|
||
| if LIBVIRT_INIT_SCRIPT_RED_HAT | ||
| BUILT_SOURCES += libvirt-guests.init | ||
| -install-init: install-sysconfig install-initscript | ||
| -uninstall-init: uninstall-sysconfig uninstall-initscript | ||
| +install-init: install-initscript | ||
| +uninstall-init: uninstall-initscript | ||
| else ! LIBVIRT_INIT_SCRIPT_RED_HAT | ||
| install-init: | ||
| uninstall-init: | ||
| diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in | ||
| index 491ca62..f0f417b 100644 | ||
| --- a/tools/libvirt-guests.service.in | ||
| +++ b/tools/libvirt-guests.service.in | ||
| @@ -10,7 +10,7 @@ Documentation=man:libvirtd(8) | ||
| Documentation=https://libvirt.org | ||
|
|
||
| [Service] | ||
| -EnvironmentFile=-/etc/sysconfig/libvirt-guests | ||
| +EnvironmentFile=-/etc/libvirt/libvirt-guests.conf | ||
| # Hack just call traditional service until we factor | ||
| # out the code | ||
| ExecStart=@libexecdir@/libvirt-guests.sh start | ||
| diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf | ||
| index 08204ca..2da172b 100644 | ||
| --- a/tools/libvirt-guests.sysconf | ||
| +++ b/tools/libvirt-guests.sysconf | ||
| @@ -1,3 +1,10 @@ | ||
| +# | ||
| +# Warning: This configuration file is only sourced by the systemd | ||
| +# libvirt-guests.service unit. The coresponding openrc facility is in | ||
| +# /etc/init.d/libvirtd and /etc/conf.d/libvirtd | ||
| +# | ||
| + | ||
| + | ||
| # URIs to check for running guests | ||
| # example: URIS='default xen:/// vbox+tcp://host/system lxc:///' | ||
| #URIS=default | ||
| diff --git a/src/Makefile.am b/src/Makefile.am | ||
| index 6b3f37a..48e7133 100644 | ||
| --- a/src/Makefile.am | ||
| +++ b/src/Makefile.am | ||
| @@ -2417,14 +2417,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%)) | ||
| BUILT_SOURCES += $(SYSTEMD_UNIT_FILES) | ||
| DISTCLEANFILES += $(SYSTEMD_UNIT_FILES) | ||
|
|
||
| -install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig | ||
| +install-systemd: $(SYSTEMD_UNIT_FILES) | ||
| $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) | ||
| for f in $(SYSTEMD_UNIT_FILES); \ | ||
| do \ | ||
| $(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \ | ||
| done | ||
|
|
||
| -uninstall-systemd: uninstall-sysconfig | ||
| +uninstall-systemd: | ||
| rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%) | ||
| rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : | ||
| else ! LIBVIRT_INIT_SCRIPT_SYSTEMD | ||
| @@ -2496,7 +2496,7 @@ EXTRA_DIST += $(UPSTART_FILES) | ||
| if WITH_LIBVIRTD | ||
| if LIBVIRT_INIT_SCRIPT_UPSTART | ||
|
|
||
| -install-upstart: install-sysconfig | ||
| +install-upstart: | ||
| $(MKDIR_P) $(DESTDIR)$(sysconfdir)/event.d | ||
| for f in $(UPSTART_FILES:%.upstart=%); \ | ||
| do \ | ||
| @@ -2505,7 +2505,7 @@ install-upstart: install-sysconfig | ||
| $(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \ | ||
| done | ||
|
|
||
| -uninstall-upstart: uninstall-sysconfig | ||
| +uninstall-upstart: | ||
| for f in $(UPSTART_FILES:%.upstart=%); \ | ||
| do \ | ||
| tgt=`basename $$f` ; \ | ||
| diff --git a/tools/Makefile.am b/tools/Makefile.am | ||
| index 99b9fa1..37e037c 100644 | ||
| --- a/tools/Makefile.am | ||
| +++ b/tools/Makefile.am | ||
| @@ -382,12 +382,12 @@ EXTRA_DIST += libvirt-guests.service.in | ||
| SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system | ||
|
|
||
| if LIBVIRT_INIT_SCRIPT_SYSTEMD | ||
| -install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh | ||
| +install-systemd: libvirt-guests.service libvirt-guests.sh | ||
| $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) | ||
| $(INSTALL_DATA) libvirt-guests.service \ | ||
| $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service | ||
|
|
||
| -uninstall-systemd: uninstall-sysconfig | ||
| +uninstall-systemd: | ||
| rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service | ||
| rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||: | ||
|
|
Oops, something went wrong.