From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6B8571382C5 for ; Sun, 28 Feb 2021 23:24:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1464E095A; Sun, 28 Feb 2021 23:24:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A54B6E095A for ; Sun, 28 Feb 2021 23:24:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C4E9934116E for ; Sun, 28 Feb 2021 23:24:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7771E2A9 for ; Sun, 28 Feb 2021 23:24:17 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1614554648.470064cb7fb8c6cda0b5f2ea40fcb6542faf86de.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/files/, app-emulation/qemu/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/qemu/files/65-kvm.rules-r2 app-emulation/qemu/qemu-5.2.0-r3.ebuild app-emulation/qemu/qemu-9999.ebuild X-VCS-Directories: app-emulation/qemu/ app-emulation/qemu/files/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 470064cb7fb8c6cda0b5f2ea40fcb6542faf86de X-VCS-Branch: master Date: Sun, 28 Feb 2021 23:24:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 30119f35-8d2b-4c74-8c85-e48847147bbe X-Archives-Hash: 44d598a3aabc2d22130ae30368cc96be commit: 470064cb7fb8c6cda0b5f2ea40fcb6542faf86de Author: Maciej S. Szmigiero maciej szmigiero name> AuthorDate: Sun Feb 28 22:58:09 2021 +0000 Commit: Sergei Trofimovich gentoo 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 maciej.szmigiero.name> Signed-off-by: Sergei Trofimovich 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