[gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/

[Matthias Maier]

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"