commit: 421678f5e9215a5ba31dcc6ec6fa18b58e99884e Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Sat Jul 25 07:58:37 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sat Jul 25 07:58:54 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=421678f5
app-emulation/qemu: fix automagic sys-fs/multipath-tools Add USE=multipath to control optional sys-fs/multipath-tools dependency. Reported-by: Alessandro Barbieri Closes: https://bugs.gentoo.org/733820 Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> app-emulation/qemu/metadata.xml | 2 ++ app-emulation/qemu/qemu-5.0.0-r1.ebuild | 5 ++++- app-emulation/qemu/qemu-5.0.0-r2.ebuild | 5 ++++- app-emulation/qemu/qemu-5.0.0.ebuild | 5 ++++- app-emulation/qemu/qemu-9999.ebuild | 5 ++++- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml index eda19489ec9..465aadf67d4 100644 --- a/app-emulation/qemu/metadata.xml +++ b/app-emulation/qemu/metadata.xml @@ -29,6 +29,8 @@ <pkg>net-libs/libiscsi</pkg> instead of indirectly via the Linux block layer that <pkg>sys-block/open-iscsi</pkg> does.</flag> <flag name="io-uring">Enable efficient I/O via <pkg>sys-libs/liburing</pkg>.</flag> + <flag name="multipath">Enable multipath persistent reservation passthrough via + <pkg>sys-fs/multipath-tools</pkg>.</flag> <flag name="ncurses">Enable the ncurses-based console</flag> <flag name="nfs">Enable NFS support</flag> <flag name="numa">Enable NUMA support</flag> diff --git a/app-emulation/qemu/qemu-5.0.0-r1.ebuild b/app-emulation/qemu/qemu-5.0.0-r1.ebuild index 19aad2860de..a9b5ba7a037 100644 --- a/app-emulation/qemu/qemu-5.0.0-r1.ebuild +++ b/app-emulation/qemu/qemu-5.0.0-r1.ebuild @@ -36,7 +36,8 @@ SLOT="0" IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc +fdt glusterfs gnutls gtk infiniband iscsi io-uring jemalloc +jpeg kernel_linux - kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs + kernel_FreeBSD lzo multipath + ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen @@ -124,6 +125,7 @@ SOFTMMU_TOOLS_DEPEND=" jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) + multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] @@ -460,6 +462,7 @@ qemu_src_configure() { $(conf_notuser jpeg vnc-jpeg) $(conf_notuser kernel_linux kvm) $(conf_notuser lzo) + $(conf_notuser multipath mpath) $(conf_notuser ncurses curses) $(conf_notuser nfs libnfs) $(conf_notuser numa) diff --git a/app-emulation/qemu/qemu-5.0.0-r2.ebuild b/app-emulation/qemu/qemu-5.0.0-r2.ebuild index 5e8c64c3905..dc684209e13 100644 --- a/app-emulation/qemu/qemu-5.0.0-r2.ebuild +++ b/app-emulation/qemu/qemu-5.0.0-r2.ebuild @@ -35,7 +35,8 @@ SLOT="0" IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc +fdt glusterfs gnutls gtk infiniband iscsi io-uring jemalloc +jpeg kernel_linux - kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs + kernel_FreeBSD lzo multipath + ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap tci test usb @@ -124,6 +125,7 @@ SOFTMMU_TOOLS_DEPEND=" jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) + multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] @@ -462,6 +464,7 @@ qemu_src_configure() { $(conf_notuser jpeg vnc-jpeg) $(conf_notuser kernel_linux kvm) $(conf_notuser lzo) + $(conf_notuser multipath mpath) $(conf_notuser ncurses curses) $(conf_notuser nfs libnfs) $(conf_notuser numa) diff --git a/app-emulation/qemu/qemu-5.0.0.ebuild b/app-emulation/qemu/qemu-5.0.0.ebuild index d7fd0d7eafa..9b6ed199dba 100644 --- a/app-emulation/qemu/qemu-5.0.0.ebuild +++ b/app-emulation/qemu/qemu-5.0.0.ebuild @@ -36,7 +36,8 @@ SLOT="0" IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc +fdt glusterfs gnutls gtk infiniband iscsi io-uring jemalloc +jpeg kernel_linux - kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs + kernel_FreeBSD lzo multipath + ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen @@ -124,6 +125,7 @@ SOFTMMU_TOOLS_DEPEND=" jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) + multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] @@ -459,6 +461,7 @@ qemu_src_configure() { $(conf_notuser jpeg vnc-jpeg) $(conf_notuser kernel_linux kvm) $(conf_notuser lzo) + $(conf_notuser multipath mpath) $(conf_notuser ncurses curses) $(conf_notuser nfs libnfs) $(conf_notuser numa) diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index eca95e6c49e..7abd42909d8 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -35,7 +35,8 @@ SLOT="0" IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc +fdt glusterfs gnutls gtk infiniband iscsi io-uring jemalloc +jpeg kernel_linux - kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs + kernel_FreeBSD lzo multipath + ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap tci test usb @@ -124,6 +125,7 @@ SOFTMMU_TOOLS_DEPEND=" jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) + multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] @@ -460,6 +462,7 @@ qemu_src_configure() { $(conf_notuser jpeg vnc-jpeg) $(conf_notuser kernel_linux kvm) $(conf_notuser lzo) + $(conf_notuser multipath mpath) $(conf_notuser ncurses curses) $(conf_notuser nfs libnfs) $(conf_notuser numa)
