commit:     470064cb7fb8c6cda0b5f2ea40fcb6542faf86de
Author:     Maciej S. Szmigiero <mail <AT> maciej <DOT> szmigiero <DOT> name>
AuthorDate: Sun Feb 28 22:58:09 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 23:24:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=470064cb

app-emulation/qemu: Add /dev/vhost-vsock to udev rules

The installed udev rules should also cover /dev/vhost-vsock just as they
currently cover /dev/vhost-net.
The upstream systemd rules will include vhost-vsock in systemd v248.

Closes: https://bugs.gentoo.org/773286
Signed-off-by: Maciej S. Szmigiero <mail <AT> maciej.szmigiero.name>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-emulation/qemu/files/65-kvm.rules-r2                      | 3 +++
 app-emulation/qemu/{qemu-9999.ebuild => qemu-5.2.0-r3.ebuild} | 7 ++++---
 app-emulation/qemu/qemu-9999.ebuild                           | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app-emulation/qemu/files/65-kvm.rules-r2 
b/app-emulation/qemu/files/65-kvm.rules-r2
new file mode 100644
index 00000000000..15c89b20187
--- /dev/null
+++ b/app-emulation/qemu/files/65-kvm.rules-r2
@@ -0,0 +1,3 @@
+KERNEL=="kvm", GROUP="kvm", MODE="0660"
+KERNEL=="vhost-net", GROUP="kvm", MODE="0660", OPTIONS+="static_node=vhost-net"
+KERNEL=="vhost-vsock", GROUP="kvm", MODE="0660", 
OPTIONS+="static_node=vhost-vsock"

diff --git a/app-emulation/qemu/qemu-9999.ebuild 
b/app-emulation/qemu/qemu-5.2.0-r3.ebuild
similarity index 99%
copy from app-emulation/qemu/qemu-9999.ebuild
copy to app-emulation/qemu/qemu-5.2.0-r3.ebuild
index dcde210564b..063ad7becb4 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-5.2.0-r3.ebuild
@@ -226,10 +226,11 @@ RDEPEND="${CDEPEND}
 
 PATCHES=(
        "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
-       "${FILESDIR}"/${PN}-5.2.0-strings.patch
        "${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch
        "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
-       "${FILESDIR}"/${PN}-9999-fix-firmware-path.patch
+       "${FILESDIR}"/${PN}-5.2.0-strings.patch
+       "${FILESDIR}"/${PN}-5.2.0-fix-firmware-path.patch
+       "${FILESDIR}"/${PN}-5.2.0-no-pie-ld.patch
 )
 
 QA_PREBUILT="
@@ -722,7 +723,7 @@ src_install() {
                [[ -e check-report.html ]] && dodoc check-report.html
 
                if use kernel_linux; then
-                       udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
+                       udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules
                fi
 
                if use python; then

diff --git a/app-emulation/qemu/qemu-9999.ebuild 
b/app-emulation/qemu/qemu-9999.ebuild
index dcde210564b..1104aacd55d 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -722,7 +722,7 @@ src_install() {
                [[ -e check-report.html ]] && dodoc check-report.html
 
                if use kernel_linux; then
-                       udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
+                       udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules
                fi
 
                if use python; then

Reply via email to