From 506fa59bf815b0f8a10313227e6cc54cc69b1c42 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Sat, 9 Jul 2016 09:30:25 -0500 Subject: [PATCH] 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 f7869587d333..fd5a3d8ced88 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 1ba6a8487585..c5f3f23ac351 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 5c96eaf26581..655075e53377 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" -- 2.26.2