| 1 |
commit: e60bfec050c5711b27af8fc6218b03ea2a0c5f1a |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 5 02:57:23 2016 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 5 02:57:48 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e60bfec0 |
| 7 |
|
| 8 |
app-emulation/libvirt: ebuild maintenance |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
app-emulation/libvirt/libvirt-2.1.0-r2.ebuild | 4 ---- |
| 13 |
app-emulation/libvirt/libvirt-2.2.0-r1.ebuild | 23 ++++++++++------------- |
| 14 |
app-emulation/libvirt/libvirt-2.3.0.ebuild | 6 +----- |
| 15 |
app-emulation/libvirt/libvirt-9999.ebuild | 19 ++++++++++--------- |
| 16 |
4 files changed, 21 insertions(+), 31 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-emulation/libvirt/libvirt-2.1.0-r2.ebuild b/app-emulation/libvirt/libvirt-2.1.0-r2.ebuild |
| 19 |
index 363d808..d8eecf6 100644 |
| 20 |
--- a/app-emulation/libvirt/libvirt-2.1.0-r2.ebuild |
| 21 |
+++ b/app-emulation/libvirt/libvirt-2.1.0-r2.ebuild |
| 22 |
@@ -318,10 +318,6 @@ src_configure() { |
| 23 |
# bug #377279 |
| 24 |
(cd .gnulib && git reset --hard > /dev/null) |
| 25 |
fi |
| 26 |
- |
| 27 |
- # Workaround: Sometimes this subdirectory is missing and leads to a |
| 28 |
- # build failure. |
| 29 |
- mkdir -p "${BUILD_DIR}"/docs/internals |
| 30 |
} |
| 31 |
|
| 32 |
src_test() { |
| 33 |
|
| 34 |
diff --git a/app-emulation/libvirt/libvirt-2.2.0-r1.ebuild b/app-emulation/libvirt/libvirt-2.2.0-r1.ebuild |
| 35 |
index 363d808..12eed00 100644 |
| 36 |
--- a/app-emulation/libvirt/libvirt-2.2.0-r1.ebuild |
| 37 |
+++ b/app-emulation/libvirt/libvirt-2.2.0-r1.ebuild |
| 38 |
@@ -155,7 +155,6 @@ pkg_setup() { |
| 39 |
~CGROUPS |
| 40 |
~CGROUP_SCHED |
| 41 |
~CPUSETS |
| 42 |
- ~DEVPTS_MULTIPLE_INSTANCES |
| 43 |
~IPC_NS |
| 44 |
~MACVLAN |
| 45 |
~NAMESPACES |
| 46 |
@@ -172,14 +171,9 @@ pkg_setup() { |
| 47 |
~!GRKERNSEC_CHROOT_PIVOT |
| 48 |
~!GRKERNSEC_CHROOT_CHMOD |
| 49 |
~!GRKERNSEC_CHROOT_CAPS" |
| 50 |
- # Handle specific kernel versions for different features |
| 51 |
- kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" |
| 52 |
- if $(kernel_is ge 3 6); then |
| 53 |
- CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP " |
| 54 |
- if $(kernel_is lt 4 5); then |
| 55 |
- CONFIG_CHECK+=" ~MEMCG_KMEM " |
| 56 |
- fi |
| 57 |
- fi |
| 58 |
+ |
| 59 |
+ kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" |
| 60 |
+ ~DEVPTS_MULTIPLE_INSTANCES" |
| 61 |
|
| 62 |
use macvtap && CONFIG_CHECK+=" |
| 63 |
~MACVTAP" |
| 64 |
@@ -201,6 +195,13 @@ pkg_setup() { |
| 65 |
~NET_SCH_INGRESS |
| 66 |
~NET_SCH_SFQ" |
| 67 |
|
| 68 |
+ # Handle specific kernel versions for different features |
| 69 |
+ kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" |
| 70 |
+ if kernel_is ge 3 6; then |
| 71 |
+ CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP " |
| 72 |
+ kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM " |
| 73 |
+ fi |
| 74 |
+ |
| 75 |
ERROR_USER_NS="Optional depending on LXC configuration." |
| 76 |
|
| 77 |
if [[ -n ${CONFIG_CHECK} ]]; then |
| 78 |
@@ -318,10 +319,6 @@ src_configure() { |
| 79 |
# bug #377279 |
| 80 |
(cd .gnulib && git reset --hard > /dev/null) |
| 81 |
fi |
| 82 |
- |
| 83 |
- # Workaround: Sometimes this subdirectory is missing and leads to a |
| 84 |
- # build failure. |
| 85 |
- mkdir -p "${BUILD_DIR}"/docs/internals |
| 86 |
} |
| 87 |
|
| 88 |
src_test() { |
| 89 |
|
| 90 |
diff --git a/app-emulation/libvirt/libvirt-2.3.0.ebuild b/app-emulation/libvirt/libvirt-2.3.0.ebuild |
| 91 |
index a8eacec..12eed00 100644 |
| 92 |
--- a/app-emulation/libvirt/libvirt-2.3.0.ebuild |
| 93 |
+++ b/app-emulation/libvirt/libvirt-2.3.0.ebuild |
| 94 |
@@ -172,7 +172,7 @@ pkg_setup() { |
| 95 |
~!GRKERNSEC_CHROOT_CHMOD |
| 96 |
~!GRKERNSEC_CHROOT_CAPS" |
| 97 |
|
| 98 |
- kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" |
| 99 |
+ kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" |
| 100 |
~DEVPTS_MULTIPLE_INSTANCES" |
| 101 |
|
| 102 |
use macvtap && CONFIG_CHECK+=" |
| 103 |
@@ -319,10 +319,6 @@ src_configure() { |
| 104 |
# bug #377279 |
| 105 |
(cd .gnulib && git reset --hard > /dev/null) |
| 106 |
fi |
| 107 |
- |
| 108 |
- # Workaround: Sometimes this subdirectory is missing and leads to a |
| 109 |
- # build failure. |
| 110 |
- mkdir -p "${BUILD_DIR}"/docs/internals |
| 111 |
} |
| 112 |
|
| 113 |
src_test() { |
| 114 |
|
| 115 |
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild |
| 116 |
index d8eecf6..12eed00 100644 |
| 117 |
--- a/app-emulation/libvirt/libvirt-9999.ebuild |
| 118 |
+++ b/app-emulation/libvirt/libvirt-9999.ebuild |
| 119 |
@@ -155,7 +155,6 @@ pkg_setup() { |
| 120 |
~CGROUPS |
| 121 |
~CGROUP_SCHED |
| 122 |
~CPUSETS |
| 123 |
- ~DEVPTS_MULTIPLE_INSTANCES |
| 124 |
~IPC_NS |
| 125 |
~MACVLAN |
| 126 |
~NAMESPACES |
| 127 |
@@ -172,14 +171,9 @@ pkg_setup() { |
| 128 |
~!GRKERNSEC_CHROOT_PIVOT |
| 129 |
~!GRKERNSEC_CHROOT_CHMOD |
| 130 |
~!GRKERNSEC_CHROOT_CAPS" |
| 131 |
- # Handle specific kernel versions for different features |
| 132 |
- kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" |
| 133 |
- if $(kernel_is ge 3 6); then |
| 134 |
- CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP " |
| 135 |
- if $(kernel_is lt 4 5); then |
| 136 |
- CONFIG_CHECK+=" ~MEMCG_KMEM " |
| 137 |
- fi |
| 138 |
- fi |
| 139 |
+ |
| 140 |
+ kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" |
| 141 |
+ ~DEVPTS_MULTIPLE_INSTANCES" |
| 142 |
|
| 143 |
use macvtap && CONFIG_CHECK+=" |
| 144 |
~MACVTAP" |
| 145 |
@@ -201,6 +195,13 @@ pkg_setup() { |
| 146 |
~NET_SCH_INGRESS |
| 147 |
~NET_SCH_SFQ" |
| 148 |
|
| 149 |
+ # Handle specific kernel versions for different features |
| 150 |
+ kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" |
| 151 |
+ if kernel_is ge 3 6; then |
| 152 |
+ CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP " |
| 153 |
+ kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM " |
| 154 |
+ fi |
| 155 |
+ |
| 156 |
ERROR_USER_NS="Optional depending on LXC configuration." |
| 157 |
|
| 158 |
if [[ -n ${CONFIG_CHECK} ]]; then |
Archives