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

diff --git a/app-emulation/libvirt/libvirt-1.2.21-r2.ebuild b/app-emulation/libvirt/libvirt-1.2.21-r2.ebuild
index f7869587d333a2ece6c5443628f1b7ef8e0af9c4..fd5a3d8ced8824a2dc9e2103639136c514f8537e 100644 (file)
--- 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 1ba6a84875850a25d37850510d32bb36686b8df3..c5f3f23ac351c22b2f9f6f15da05f9b8102585dd 100644 (file)
--- 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 5c96eaf265813dbe815ad30bdfd6932e802eb94b..655075e53377dd11dd67bc0b72100be420ce3d54 100644 (file)
--- 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"