| 1 |
cardoe 12/10/29 07:16:29 |
| 2 |
|
| 3 |
Modified: ChangeLog libvirt-0.10.2-r3.ebuild |
| 4 |
Log: |
| 5 |
Handle kernel CONFIG option rename for 3.6 and newer. Clean up kernel CONFIG option checking as well. bug #437370 |
| 6 |
|
| 7 |
(Portage version: 2.1.11.9/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.225 app-emulation/libvirt/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/ChangeLog?rev=1.225&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/ChangeLog?rev=1.225&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/ChangeLog?r1=1.224&r2=1.225 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v |
| 19 |
retrieving revision 1.224 |
| 20 |
retrieving revision 1.225 |
| 21 |
diff -u -r1.224 -r1.225 |
| 22 |
--- ChangeLog 24 Oct 2012 23:03:49 -0000 1.224 |
| 23 |
+++ ChangeLog 29 Oct 2012 07:16:29 -0000 1.225 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for app-emulation/libvirt |
| 26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.224 2012/10/24 23:03:49 cardoe Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.225 2012/10/29 07:16:29 cardoe Exp $ |
| 29 |
+ |
| 30 |
+ 29 Oct 2012; Doug Goldstein <cardoe@g.o> libvirt-0.10.2-r3.ebuild: |
| 31 |
+ Handle kernel CONFIG option rename for 3.6 and newer. Clean up kernel CONFIG |
| 32 |
+ option checking as well. bug #437370 |
| 33 |
|
| 34 |
24 Oct 2012; Doug Goldstein <cardoe@g.o> -libvirt-0.10.2-r2.ebuild: |
| 35 |
Remove version that no one wants to use. |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.2 app-emulation/libvirt/libvirt-0.10.2-r3.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-0.10.2-r3.ebuild?rev=1.2&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-0.10.2-r3.ebuild?rev=1.2&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-0.10.2-r3.ebuild?r1=1.1&r2=1.2 |
| 44 |
|
| 45 |
Index: libvirt-0.10.2-r3.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.10.2-r3.ebuild,v |
| 48 |
retrieving revision 1.1 |
| 49 |
retrieving revision 1.2 |
| 50 |
diff -u -r1.1 -r1.2 |
| 51 |
--- libvirt-0.10.2-r3.ebuild 23 Oct 2012 16:55:52 -0000 1.1 |
| 52 |
+++ libvirt-0.10.2-r3.ebuild 29 Oct 2012 07:16:29 -0000 1.2 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2012 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.10.2-r3.ebuild,v 1.1 2012/10/23 16:55:52 cardoe Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.10.2-r3.ebuild,v 1.2 2012/10/29 07:16:29 cardoe Exp $ |
| 58 |
|
| 59 |
EAPI=4 |
| 60 |
|
| 61 |
@@ -113,7 +113,6 @@ |
| 62 |
~CPUSETS |
| 63 |
~CGROUP_CPUACCT |
| 64 |
~RESOURCE_COUNTERS |
| 65 |
- ~CGROUP_MEM_RES_CTLR |
| 66 |
~CGROUP_SCHED |
| 67 |
~BLK_CGROUP |
| 68 |
~NAMESPACES |
| 69 |
@@ -155,9 +154,13 @@ |
| 70 |
gpasswd -a qemu kvm |
| 71 |
fi |
| 72 |
|
| 73 |
+ # Handle specific kernel versions for different features |
| 74 |
+ kernel_is lt 3 5 && LXC_CONFIG_CHECK+=" ~USER_NS" |
| 75 |
+ kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" || \ |
| 76 |
+ LXC_CONFIG_CHECK+=" ~MEMCG" |
| 77 |
+ |
| 78 |
CONFIG_CHECK="" |
| 79 |
use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}" |
| 80 |
- kernel_is lt 3 5 && use lxc && CONFIG_CHECK+=" ~USER_NS" |
| 81 |
use macvtap && CONFIG_CHECK+="${MACVTAP}" |
| 82 |
use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}" |
| 83 |
if [[ -n ${CONFIG_CHECK} ]]; then |
Archives