| 1 |
commit: 470064cb7fb8c6cda0b5f2ea40fcb6542faf86de |
| 2 |
Author: Maciej S. Szmigiero <mail <AT> maciej <DOT> szmigiero <DOT> name> |
| 3 |
AuthorDate: Sun Feb 28 22:58:09 2021 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 28 23:24:08 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=470064cb |
| 7 |
|
| 8 |
app-emulation/qemu: Add /dev/vhost-vsock to udev rules |
| 9 |
|
| 10 |
The installed udev rules should also cover /dev/vhost-vsock just as they |
| 11 |
currently cover /dev/vhost-net. |
| 12 |
The upstream systemd rules will include vhost-vsock in systemd v248. |
| 13 |
|
| 14 |
Closes: https://bugs.gentoo.org/773286 |
| 15 |
Signed-off-by: Maciej S. Szmigiero <mail <AT> maciej.szmigiero.name> |
| 16 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 17 |
|
| 18 |
app-emulation/qemu/files/65-kvm.rules-r2 | 3 +++ |
| 19 |
app-emulation/qemu/{qemu-9999.ebuild => qemu-5.2.0-r3.ebuild} | 7 ++++--- |
| 20 |
app-emulation/qemu/qemu-9999.ebuild | 2 +- |
| 21 |
3 files changed, 8 insertions(+), 4 deletions(-) |
| 22 |
|
| 23 |
diff --git a/app-emulation/qemu/files/65-kvm.rules-r2 b/app-emulation/qemu/files/65-kvm.rules-r2 |
| 24 |
new file mode 100644 |
| 25 |
index 00000000000..15c89b20187 |
| 26 |
--- /dev/null |
| 27 |
+++ b/app-emulation/qemu/files/65-kvm.rules-r2 |
| 28 |
@@ -0,0 +1,3 @@ |
| 29 |
+KERNEL=="kvm", GROUP="kvm", MODE="0660" |
| 30 |
+KERNEL=="vhost-net", GROUP="kvm", MODE="0660", OPTIONS+="static_node=vhost-net" |
| 31 |
+KERNEL=="vhost-vsock", GROUP="kvm", MODE="0660", OPTIONS+="static_node=vhost-vsock" |
| 32 |
|
| 33 |
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-5.2.0-r3.ebuild |
| 34 |
similarity index 99% |
| 35 |
copy from app-emulation/qemu/qemu-9999.ebuild |
| 36 |
copy to app-emulation/qemu/qemu-5.2.0-r3.ebuild |
| 37 |
index dcde210564b..063ad7becb4 100644 |
| 38 |
--- a/app-emulation/qemu/qemu-9999.ebuild |
| 39 |
+++ b/app-emulation/qemu/qemu-5.2.0-r3.ebuild |
| 40 |
@@ -226,10 +226,11 @@ RDEPEND="${CDEPEND} |
| 41 |
|
| 42 |
PATCHES=( |
| 43 |
"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch |
| 44 |
- "${FILESDIR}"/${PN}-5.2.0-strings.patch |
| 45 |
"${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch |
| 46 |
"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch |
| 47 |
- "${FILESDIR}"/${PN}-9999-fix-firmware-path.patch |
| 48 |
+ "${FILESDIR}"/${PN}-5.2.0-strings.patch |
| 49 |
+ "${FILESDIR}"/${PN}-5.2.0-fix-firmware-path.patch |
| 50 |
+ "${FILESDIR}"/${PN}-5.2.0-no-pie-ld.patch |
| 51 |
) |
| 52 |
|
| 53 |
QA_PREBUILT=" |
| 54 |
@@ -722,7 +723,7 @@ src_install() { |
| 55 |
[[ -e check-report.html ]] && dodoc check-report.html |
| 56 |
|
| 57 |
if use kernel_linux; then |
| 58 |
- udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules |
| 59 |
+ udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules |
| 60 |
fi |
| 61 |
|
| 62 |
if use python; then |
| 63 |
|
| 64 |
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild |
| 65 |
index dcde210564b..1104aacd55d 100644 |
| 66 |
--- a/app-emulation/qemu/qemu-9999.ebuild |
| 67 |
+++ b/app-emulation/qemu/qemu-9999.ebuild |
| 68 |
@@ -722,7 +722,7 @@ src_install() { |
| 69 |
[[ -e check-report.html ]] && dodoc check-report.html |
| 70 |
|
| 71 |
if use kernel_linux; then |
| 72 |
- udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules |
| 73 |
+ udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules |
| 74 |
fi |
| 75 |
|
| 76 |
if use python; then |
Archives