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 953EB139695 for ; Thu, 23 Feb 2017 20:24:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ABDB221C22F; Thu, 23 Feb 2017 20:24:31 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7FD4621C22F for ; Thu, 23 Feb 2017 20:24:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7E120341641 for ; Thu, 23 Feb 2017 20:24:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E4DC6522D for ; Thu, 23 Feb 2017 20:24:28 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1487881459.1e24caf48e8abc0e6410256fc5c20acc7d862b9a.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/qemu/qemu-9999.ebuild X-VCS-Directories: app-emulation/qemu/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 1e24caf48e8abc0e6410256fc5c20acc7d862b9a X-VCS-Branch: master Date: Thu, 23 Feb 2017 20:24:28 +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-Archives-Salt: 60e82fe0-b1fb-42ed-9b87-97dfd37489c1 X-Archives-Hash: 88658a4f549a7ed06e2ba83b2e203a2c commit: 1e24caf48e8abc0e6410256fc5c20acc7d862b9a Author: Matthias Maier gentoo org> AuthorDate: Thu Feb 23 19:52:33 2017 +0000 Commit: Matthias Maier gentoo org> CommitDate: Thu Feb 23 20:24:19 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e24caf4 app-emulation/qemu: Update readme in 9999 to reflect latest changes Package-Manager: Portage-2.3.3, Repoman-2.3.1 app-emulation/qemu/qemu-9999.ebuild | 50 ++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 3f97bbab45..b919ffecd6 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -212,27 +212,26 @@ QA_WX_LOAD="usr/bin/qemu-i386 usr/bin/qemu-s390x usr/bin/qemu-unicore32" -DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure -you have the kernel module loaded before running kvm. The easiest way to -ensure that the kernel module is loaded is to load it on boot.\n -For AMD CPUs the module is called 'kvm-amd'.\n -For Intel CPUs the module is called 'kvm-intel'.\n -Please review /etc/conf.d/modules for how to load these.\n\n -Make sure your user is in the 'kvm' group\n -Just run 'gpasswd -a kvm', then have re-login.\n\n -For brand new installs, the default permissions on /dev/kvm might not let you -access it. You can tell udev to reset ownership/perms:\n -udevadm trigger -c add /dev/kvm" - -qemu_support_kvm() { - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \ - use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \ - use qemu_softmmu_targets_s390x; then - return 0 - fi - - return 1 -} +DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the +kernel module loaded before running kvm. The easiest way to ensure that the +kernel module is loaded is to load it on boot. + For AMD CPUs the module is called 'kvm-amd'. + For Intel CPUs the module is called 'kvm-intel'. +Please review /etc/conf.d/modules for how to load these. + +Make sure your user is in the 'kvm' group. Just run + $ gpasswd -a kvm +then have re-login. + +For brand new installs, the default permissions on /dev/kvm might not let +you access it. You can tell udev to reset ownership/perms: + $ udevadm trigger -c add /dev/kvm + +If you want to register binfmt handlers for qemu user targets: +For openrc: + # rc-update add qemu-binfmt +For systemd: + # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf" pkg_pretend() { if use kernel_linux && kernel_is lt 2 6 25; then @@ -702,13 +701,14 @@ src_install() { fi fi - qemu_support_kvm && readme.gentoo_create_doc + DISABLE_AUTOFORMATTING=true + readme.gentoo_create_doc } pkg_postinst() { - if qemu_support_kvm; then - readme.gentoo_print_elog - fi + DISABLE_AUTOFORMATTING=true + FORCE_PRINT_ELOG=1 # remove for next version bump + readme.gentoo_print_elog if [[ -n ${softmmu_targets} ]] && use kernel_linux; then udev_reload