Gentoo Archives: gentoo-commits

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