From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-891369-garchives=archives.gentoo.org@lists.gentoo.org>
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 8A1611382FE
for <garchives@archives.gentoo.org>; Sat, 9 Jul 2016 15:10:35 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9460A21C09B;
Sat, 9 Jul 2016 15:10:29 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(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 5814F21C096
for <gentoo-commits@lists.gentoo.org>; Sat, 9 Jul 2016 15:10:28 +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 3B912340FAD
for <gentoo-commits@lists.gentoo.org>; Sat, 9 Jul 2016 15:10:27 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id DB329CEF
for <gentoo-commits@lists.gentoo.org>; Sat, 9 Jul 2016 15:10:23 +0000 (UTC)
From: "Matthias Maier" <tamiko@gentoo.org>
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" <tamiko@gentoo.org>
Message-ID: <1468077013.506fa59bf815b0f8a10313227e6cc54cc69b1c42.tamiko@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-emulation/libvirt/libvirt-1.2.21-r2.ebuild app-emulation/libvirt/libvirt-1.3.5-r1.ebuild app-emulation/libvirt/libvirt-9999.ebuild
X-VCS-Directories: app-emulation/libvirt/
X-VCS-Committer: tamiko
X-VCS-Committer-Name: Matthias Maier
X-VCS-Revision: 506fa59bf815b0f8a10313227e6cc54cc69b1c42
X-VCS-Branch: master
Date: Sat, 9 Jul 2016 15:10:23 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 1096e26a-6734-4509-8926-290b5fad6d03
X-Archives-Hash: c06025316551da27ce32cca35faf7de7
commit: 506fa59bf815b0f8a10313227e6cc54cc69b1c42
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 9 14:30:25 2016 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat Jul 9 15:10:13 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=506fa59b
app-emulation/libvirt: Update kernel checks for kernels > 4.4, bug #587758
Thanks to Nicolas Bock for the patch.
Package-Manager: portage-2.2.28
app-emulation/libvirt/libvirt-1.2.21-r2.ebuild | 8 +++++++-
app-emulation/libvirt/libvirt-1.3.5-r1.ebuild | 7 ++++++-
app-emulation/libvirt/libvirt-9999.ebuild | 8 +++++++-
3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/app-emulation/libvirt/libvirt-1.2.21-r2.ebuild b/app-emulation/libvirt/libvirt-1.2.21-r2.ebuild
index f786958..fd5a3d8 100644
--- a/app-emulation/libvirt/libvirt-1.2.21-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.21-r2.ebuild
@@ -174,7 +174,13 @@ pkg_setup() {
~!GRKERNSEC_CHROOT_CAPS"
# Handle specific kernel versions for different features
kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
- kernel_is ge 3 6 && CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
+ kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+ if $(kernel_is ge 3 6); then
+ CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
+ if $(kernel_is lt 4 5); then
+ CONFIG_CHECK+=" ~MEMCG_KMEM "
+ fi
+ fi
use macvtap && CONFIG_CHECK+="
~MACVTAP"
diff --git a/app-emulation/libvirt/libvirt-1.3.5-r1.ebuild b/app-emulation/libvirt/libvirt-1.3.5-r1.ebuild
index 1ba6a84..c5f3f23 100644
--- a/app-emulation/libvirt/libvirt-1.3.5-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-1.3.5-r1.ebuild
@@ -174,7 +174,12 @@ pkg_setup() {
~!GRKERNSEC_CHROOT_CAPS"
# Handle specific kernel versions for different features
kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
- kernel_is ge 3 6 && CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
+ if $(kernel_is ge 3 6); then
+ CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
+ if $(kernel_is lt 4 5); then
+ CONFIG_CHECK+=" ~MEMCG_KMEM "
+ fi
+ fi
use macvtap && CONFIG_CHECK+="
~MACVTAP"
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 5c96eaf..655075e 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -173,8 +173,14 @@ pkg_setup() {
~!GRKERNSEC_CHROOT_CHMOD
~!GRKERNSEC_CHROOT_CAPS"
# Handle specific kernel versions for different features
+ krnel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
- kernel_is ge 3 6 && CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
+ if $(kernel_is ge 3 6); then
+ CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
+ if $(kernel_is lt 4 5); then
+ CONFIG_CHECK+=" ~MEMCG_KMEM "
+ fi
+ fi
use macvtap && CONFIG_CHECK+="
~MACVTAP"