1 |
flameeyes 12/06/07 12:59:28 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: lxc-0.8.0_rc1-r5.ebuild |
5 |
Removed: lxc-0.8.0_rc1-r4.ebuild |
6 |
Log: |
7 |
Update init script to better handle x32 containers. |
8 |
|
9 |
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.40 app-emulation/lxc/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/lxc/ChangeLog?rev=1.40&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/lxc/ChangeLog?rev=1.40&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/lxc/ChangeLog?r1=1.39&r2=1.40 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v |
21 |
retrieving revision 1.39 |
22 |
retrieving revision 1.40 |
23 |
diff -u -r1.39 -r1.40 |
24 |
--- ChangeLog 31 May 2012 23:03:11 -0000 1.39 |
25 |
+++ ChangeLog 7 Jun 2012 12:59:27 -0000 1.40 |
26 |
@@ -1,6 +1,12 @@ |
27 |
# ChangeLog for app-emulation/lxc |
28 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.39 2012/05/31 23:03:11 zmedico Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.40 2012/06/07 12:59:27 flameeyes Exp $ |
31 |
+ |
32 |
+*lxc-0.8.0_rc1-r5 (07 Jun 2012) |
33 |
+ |
34 |
+ 07 Jun 2012; Diego E. Pettenò <flameeyes@g.o> +lxc-0.8.0_rc1-r5.ebuild, |
35 |
+ -lxc-0.8.0_rc1-r4.ebuild, files/lxc.initd.2: |
36 |
+ Update init script to better handle x32 containers. |
37 |
|
38 |
31 May 2012; Zac Medico <zmedico@g.o> lxc-0.8.0_rc1-r4.ebuild: |
39 |
tweak inherit so repoman can parse it |
40 |
|
41 |
|
42 |
|
43 |
1.1 app-emulation/lxc/lxc-0.8.0_rc1-r5.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/lxc/lxc-0.8.0_rc1-r5.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/lxc/lxc-0.8.0_rc1-r5.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: lxc-0.8.0_rc1-r5.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2012 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-0.8.0_rc1-r5.ebuild,v 1.1 2012/06/07 12:59:27 flameeyes Exp $ |
53 |
|
54 |
EAPI="4" |
55 |
|
56 |
MY_P="${P/_/-}" |
57 |
|
58 |
BACKPORTS=1 |
59 |
|
60 |
inherit eutils linux-info versionator flag-o-matic |
61 |
|
62 |
if [[ -n ${BACKPORTS} ]]; then |
63 |
inherit autotools |
64 |
fi |
65 |
|
66 |
DESCRIPTION="LinuX Containers userspace utilities" |
67 |
HOMEPAGE="http://lxc.sourceforge.net/" |
68 |
SRC_URI="http://lxc.sourceforge.net/download/lxc/${MY_P}.tar.gz |
69 |
${BACKPORTS:+http://dev.gentoo.org/~flameeyes/${PN}/${MY_P}-backports-${BACKPORTS}.tar.xz}" |
70 |
S="${WORKDIR}/${MY_P}" |
71 |
|
72 |
KEYWORDS="~amd64 ~ppc64 ~x86" |
73 |
|
74 |
LICENSE="LGPL-3" |
75 |
SLOT="0" |
76 |
IUSE="examples vanilla" |
77 |
|
78 |
RDEPEND="sys-libs/libcap" |
79 |
|
80 |
DEPEND="${RDEPEND} |
81 |
app-text/docbook-sgml-utils |
82 |
>=sys-kernel/linux-headers-3.2" |
83 |
|
84 |
# For init script, so protect with vanilla, they are not strictly |
85 |
# needed. |
86 |
RDEPEND="${RDEPEND} |
87 |
!vanilla? ( |
88 |
sys-apps/util-linux |
89 |
app-misc/pax-utils |
90 |
>=sys-apps/openrc-0.9.9.1 |
91 |
)" |
92 |
|
93 |
CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE |
94 |
~CPUSETS ~CGROUP_CPUACCT |
95 |
~RESOURCE_COUNTERS ~CGROUP_MEM_RES_CTLR |
96 |
~CGROUP_SCHED |
97 |
|
98 |
~NAMESPACES |
99 |
~IPC_NS ~USER_NS ~PID_NS |
100 |
|
101 |
~DEVPTS_MULTIPLE_INSTANCES |
102 |
~CGROUP_FREEZER |
103 |
~UTS_NS ~NET_NS |
104 |
~VETH ~MACVLAN |
105 |
|
106 |
~POSIX_MQUEUE |
107 |
~!NETPRIO_CGROUP |
108 |
|
109 |
~!GRKERNSEC_CHROOT_MOUNT |
110 |
~!GRKERNSEC_CHROOT_DOUBLE |
111 |
~!GRKERNSEC_CHROOT_PIVOT |
112 |
~!GRKERNSEC_CHROOT_CHMOD |
113 |
~!GRKERNSEC_CHROOT_CAPS |
114 |
" |
115 |
|
116 |
ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container" |
117 |
|
118 |
ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers" |
119 |
|
120 |
ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info" |
121 |
ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network" |
122 |
|
123 |
ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking" |
124 |
ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking" |
125 |
|
126 |
ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command" |
127 |
|
128 |
ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP: as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting." |
129 |
|
130 |
ERROR_GRKERNSEC_CHROOT_MOUNT=":CONFIG_GRKERNSEC_CHROOT_MOUNT some GRSEC features make LXC unusable see postinst notes" |
131 |
ERROR_GRKERNSEC_CHROOT_DOUBLE=":CONFIG_GRKERNSEC_CHROOT_DOUBLE some GRSEC features make LXC unusable see postinst notes" |
132 |
ERROR_GRKERNSEC_CHROOT_PIVOT=":CONFIG_GRKERNSEC_CHROOT_PIVOT some GRSEC features make LXC unusable see postinst notes" |
133 |
ERROR_GRKERNSEC_CHROOT_CHMOD=":CONFIG_GRKERNSEC_CHROOT_CHMOD some GRSEC features make LXC unusable see postinst notes" |
134 |
ERROR_GRKERNSEC_CHROOT_CAPS=":CONFIG_GRKERNSEC_CHROOT_CAPS some GRSEC features make LXC unusable see postinst notes" |
135 |
|
136 |
DOCS=(AUTHORS CONTRIBUTING MAINTAINERS TODO README doc/FAQ.txt) |
137 |
|
138 |
src_prepare() { |
139 |
if [[ -n ${BACKPORTS} ]]; then |
140 |
epatch "${S}"/patches/* |
141 |
eautoreconf |
142 |
fi |
143 |
} |
144 |
|
145 |
src_configure() { |
146 |
append-flags -fno-strict-aliasing |
147 |
|
148 |
econf \ |
149 |
--localstatedir=/var \ |
150 |
--bindir=/usr/sbin \ |
151 |
--docdir=/usr/share/doc/${PF} \ |
152 |
--with-config-path=/etc/lxc \ |
153 |
--with-rootfs-path=/usr/lib/lxc/rootfs \ |
154 |
--enable-doc \ |
155 |
$(use_enable examples) |
156 |
} |
157 |
|
158 |
src_install() { |
159 |
default |
160 |
|
161 |
rm -r "${D}"/usr/sbin/lxc-{setcap,ls} \ |
162 |
"${D}"/usr/share/man/man1/lxc-ls.1 \ |
163 |
|| die "unable to remove extraenous content" |
164 |
|
165 |
keepdir /etc/lxc /usr/lib/lxc/rootfs |
166 |
|
167 |
find "${D}" -name '*.la' -delete |
168 |
|
169 |
use vanilla && return 0 |
170 |
|
171 |
# Gentoo-specific additions! |
172 |
newinitd "${FILESDIR}/${PN}.initd.2" ${PN} |
173 |
keepdir /var/log/lxc |
174 |
} |
175 |
|
176 |
pkg_postinst() { |
177 |
if ! use vanilla; then |
178 |
elog "There is an init script provided with the package now; no documentation" |
179 |
elog "is currently available though, so please check out /etc/init.d/lxc ." |
180 |
elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname" |
181 |
elog "to start the container defined into /etc/lxc/configname.conf ." |
182 |
elog "For further information about LXC development see" |
183 |
elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available |
184 |
elog "" |
185 |
fi |
186 |
ewarn "With version 0.7.4, the mountpoint syntax came back to the one used by 0.7.2" |
187 |
ewarn "and previous versions. This means you'll have to use syntax like the following" |
188 |
ewarn "" |
189 |
ewarn " lxc.rootfs = /container" |
190 |
ewarn " lxc.mount.entry = /usr/portage /container/usr/portage none bind 0 0" |
191 |
ewarn "" |
192 |
ewarn "To use the Fedora, Debian and (various) Ubuntu auto-configuration scripts, you" |
193 |
ewarn "will need sys-apps/yum or dev-util/debootstrap." |
194 |
ewarn "" |
195 |
ewarn "Some GrSecurity settings in relation to chroot security will cause LXC not to" |
196 |
ewarn "work, while others will actually make it much more secure. Please refer to" |
197 |
ewarn "Diego Elio Pettenò's weblog at http://blog.flameeyes.eu/tag/lxc for further" |
198 |
ewarn "details." |
199 |
} |