| 1 |
commit: 506fa59bf815b0f8a10313227e6cc54cc69b1c42 |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 9 14:30:25 2016 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 9 15:10:13 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=506fa59b |
| 7 |
|
| 8 |
app-emulation/libvirt: Update kernel checks for kernels > 4.4, bug #587758 |
| 9 |
|
| 10 |
Thanks to Nicolas Bock for the patch. |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.28 |
| 13 |
|
| 14 |
app-emulation/libvirt/libvirt-1.2.21-r2.ebuild | 8 +++++++- |
| 15 |
app-emulation/libvirt/libvirt-1.3.5-r1.ebuild | 7 ++++++- |
| 16 |
app-emulation/libvirt/libvirt-9999.ebuild | 8 +++++++- |
| 17 |
3 files changed, 20 insertions(+), 3 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-emulation/libvirt/libvirt-1.2.21-r2.ebuild b/app-emulation/libvirt/libvirt-1.2.21-r2.ebuild |
| 20 |
index f786958..fd5a3d8 100644 |
| 21 |
--- a/app-emulation/libvirt/libvirt-1.2.21-r2.ebuild |
| 22 |
+++ b/app-emulation/libvirt/libvirt-1.2.21-r2.ebuild |
| 23 |
@@ -174,7 +174,13 @@ pkg_setup() { |
| 24 |
~!GRKERNSEC_CHROOT_CAPS" |
| 25 |
# Handle specific kernel versions for different features |
| 26 |
kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" |
| 27 |
- kernel_is ge 3 6 && CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM" |
| 28 |
+ kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" |
| 29 |
+ if $(kernel_is ge 3 6); then |
| 30 |
+ CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP " |
| 31 |
+ if $(kernel_is lt 4 5); then |
| 32 |
+ CONFIG_CHECK+=" ~MEMCG_KMEM " |
| 33 |
+ fi |
| 34 |
+ fi |
| 35 |
|
| 36 |
use macvtap && CONFIG_CHECK+=" |
| 37 |
~MACVTAP" |
| 38 |
|
| 39 |
diff --git a/app-emulation/libvirt/libvirt-1.3.5-r1.ebuild b/app-emulation/libvirt/libvirt-1.3.5-r1.ebuild |
| 40 |
index 1ba6a84..c5f3f23 100644 |
| 41 |
--- a/app-emulation/libvirt/libvirt-1.3.5-r1.ebuild |
| 42 |
+++ b/app-emulation/libvirt/libvirt-1.3.5-r1.ebuild |
| 43 |
@@ -174,7 +174,12 @@ pkg_setup() { |
| 44 |
~!GRKERNSEC_CHROOT_CAPS" |
| 45 |
# Handle specific kernel versions for different features |
| 46 |
kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" |
| 47 |
- kernel_is ge 3 6 && CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM" |
| 48 |
+ if $(kernel_is ge 3 6); then |
| 49 |
+ CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP " |
| 50 |
+ if $(kernel_is lt 4 5); then |
| 51 |
+ CONFIG_CHECK+=" ~MEMCG_KMEM " |
| 52 |
+ fi |
| 53 |
+ fi |
| 54 |
|
| 55 |
use macvtap && CONFIG_CHECK+=" |
| 56 |
~MACVTAP" |
| 57 |
|
| 58 |
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild |
| 59 |
index 5c96eaf..655075e 100644 |
| 60 |
--- a/app-emulation/libvirt/libvirt-9999.ebuild |
| 61 |
+++ b/app-emulation/libvirt/libvirt-9999.ebuild |
| 62 |
@@ -173,8 +173,14 @@ pkg_setup() { |
| 63 |
~!GRKERNSEC_CHROOT_CHMOD |
| 64 |
~!GRKERNSEC_CHROOT_CAPS" |
| 65 |
# Handle specific kernel versions for different features |
| 66 |
+ krnel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" |
| 67 |
kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" |
| 68 |
- kernel_is ge 3 6 && CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM" |
| 69 |
+ if $(kernel_is ge 3 6); then |
| 70 |
+ CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP " |
| 71 |
+ if $(kernel_is lt 4 5); then |
| 72 |
+ CONFIG_CHECK+=" ~MEMCG_KMEM " |
| 73 |
+ fi |
| 74 |
+ fi |
| 75 |
|
| 76 |
use macvtap && CONFIG_CHECK+=" |
| 77 |
~MACVTAP" |
Archives