1 |
commit: 26616d14e48974220a2b6a9ce0a41f971e241270 |
2 |
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 29 13:10:23 2020 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 29 13:15:09 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26616d14 |
7 |
|
8 |
app-emulation/lxc: clean old 2.1.1 |
9 |
|
10 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
11 |
|
12 |
app-emulation/lxc/Manifest | 1 - |
13 |
app-emulation/lxc/lxc-2.1.1-r1.ebuild | 215 ---------------------------------- |
14 |
app-emulation/lxc/metadata.xml | 1 - |
15 |
3 files changed, 217 deletions(-) |
16 |
|
17 |
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest |
18 |
index 98668716a5d..658b60ca595 100644 |
19 |
--- a/app-emulation/lxc/Manifest |
20 |
+++ b/app-emulation/lxc/Manifest |
21 |
@@ -1,4 +1,3 @@ |
22 |
-DIST lxc-2.1.1.tar.gz 1378640 BLAKE2B 5fca516540a886729434579ff99acf3baa06977fa0e0b6f24dbf15094626335fc073597d308276e3dd20e27ceabf1477cc8e99d1fd24cf50b9aed2720b887b69 SHA512 2989d57acddfe091adcf8031721c3c9a2f8eff5476bd6155366b76ea7511e0f6120e669276e056e3963863e0f0acf3b095d44c36fa6652e67c197671f28cbdd4 |
23 |
DIST lxc-3.0.3.tar.gz 1263371 BLAKE2B 77d0f593119654f570ae748d305e86c27117fd4e9ec7bdab1110f5356afb4a00d81c105ae9757d9da5827f6883a4a5d8ddc43b5b6e56a2927ed990e757f7c7b6 SHA512 cdc411364153d7ed494bab604260f5cbdfd5bd7734a59af970b3198c7b3cb340b6736856a2189d5989e169945a817ac8b531bc3ab62217a4285dd63a851f9c8a |
24 |
DIST lxc-3.1.0.tar.gz 1277877 BLAKE2B e114855659c8199378d14bc23f667ce1927bb32c55d336fa9c222a60198da51e7ded6aeb6d1c89cbeb1e9edc101e424a847be1e4a2330d2a0bceda52d0df5e30 SHA512 706cee9bc8ac57300574b59d728437e41baa4eb16c68f8548142e53b4e13679ef6698df30a4fbf8617e4f07338f898464e9f818e80d32648fe9717370dcbbb20 |
25 |
DIST lxc-4.0.2.tar.gz 1352667 BLAKE2B 2ecc076bacb9bb1c2a808422f7b2e0cbfc74bf3bec6ca89ea58eb6ef4a414353c2e58163bff17b3304beb39f4980d10f54365f739645c1581bfca9f6079bf57c SHA512 0de6c1f9649d161579b45fc28a735f703c4498eff9c588462b838220aeab73f91921db628f77bc461eff38c7583cac10a38951263181956e2d33412a406f3ef3 |
26 |
|
27 |
diff --git a/app-emulation/lxc/lxc-2.1.1-r1.ebuild b/app-emulation/lxc/lxc-2.1.1-r1.ebuild |
28 |
deleted file mode 100644 |
29 |
index 57389b97c89..00000000000 |
30 |
--- a/app-emulation/lxc/lxc-2.1.1-r1.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,215 +0,0 @@ |
33 |
-# Copyright 1999-2020 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=6 |
37 |
- |
38 |
-PYTHON_COMPAT=( python3_6 ) |
39 |
-DISTUTILS_OPTIONAL=1 |
40 |
- |
41 |
-inherit autotools bash-completion-r1 distutils-r1 linux-info versionator flag-o-matic systemd readme.gentoo-r1 |
42 |
-DESCRIPTION="LinuX Containers userspace utilities" |
43 |
-HOMEPAGE="https://linuxcontainers.org/" |
44 |
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz" |
45 |
- |
46 |
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" |
47 |
- |
48 |
-LICENSE="LGPL-3" |
49 |
-SLOT="0" |
50 |
-IUSE="cgmanager examples lua python seccomp selinux" |
51 |
- |
52 |
-RDEPEND=" |
53 |
- net-libs/gnutls |
54 |
- sys-libs/libcap |
55 |
- cgmanager? ( app-admin/cgmanager ) |
56 |
- lua? ( >=dev-lang/lua-5.1:= ) |
57 |
- python? ( ${PYTHON_DEPS} ) |
58 |
- seccomp? ( sys-libs/libseccomp ) |
59 |
- selinux? ( sys-libs/libselinux )" |
60 |
- |
61 |
-DEPEND="${RDEPEND} |
62 |
- app-text/docbook-sgml-utils |
63 |
- >=sys-kernel/linux-headers-3.2" |
64 |
- |
65 |
-RDEPEND="${RDEPEND} |
66 |
- sys-apps/util-linux |
67 |
- app-misc/pax-utils |
68 |
- virtual/awk" |
69 |
- |
70 |
-CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE |
71 |
- ~CPUSETS ~CGROUP_CPUACCT |
72 |
- ~CGROUP_SCHED |
73 |
- |
74 |
- ~NAMESPACES |
75 |
- ~IPC_NS ~USER_NS ~PID_NS |
76 |
- |
77 |
- ~NETLINK_DIAG ~PACKET_DIAG |
78 |
- ~INET_UDP_DIAG ~INET_TCP_DIAG |
79 |
- ~UNIX_DIAG ~CHECKPOINT_RESTORE |
80 |
- |
81 |
- ~CGROUP_FREEZER |
82 |
- ~UTS_NS ~NET_NS |
83 |
- ~VETH ~MACVLAN |
84 |
- |
85 |
- ~POSIX_MQUEUE |
86 |
- ~!NETPRIO_CGROUP |
87 |
- |
88 |
- ~!GRKERNSEC_CHROOT_MOUNT |
89 |
- ~!GRKERNSEC_CHROOT_DOUBLE |
90 |
- ~!GRKERNSEC_CHROOT_PIVOT |
91 |
- ~!GRKERNSEC_CHROOT_CHMOD |
92 |
- ~!GRKERNSEC_CHROOT_CAPS |
93 |
- ~!GRKERNSEC_PROC |
94 |
- ~!GRKERNSEC_SYSFS_RESTRICT |
95 |
-" |
96 |
- |
97 |
-ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container" |
98 |
- |
99 |
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers" |
100 |
- |
101 |
-ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info" |
102 |
-ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network" |
103 |
- |
104 |
-ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking" |
105 |
-ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking" |
106 |
- |
107 |
-ERROR_NETLINK_DIAG="CONFIG_NETLINK_DIAG: needed for lxc-checkpoint" |
108 |
-ERROR_PACKET_DIAG="CONFIG_PACKET_DIAG: needed for lxc-checkpoint" |
109 |
-ERROR_INET_UDP_DIAG="CONFIG_INET_UDP_DIAG: needed for lxc-checkpoint" |
110 |
-ERROR_INET_TCP_DIAG="CONFIG_INET_TCP_DIAG: needed for lxc-checkpoint" |
111 |
-ERROR_UNIX_DIAG="CONFIG_UNIX_DIAG: needed for lxc-checkpoint" |
112 |
-ERROR_CHECKPOINT_RESTORE="CONFIG_CHECKPOINT_RESTORE: needed for lxc-checkpoint" |
113 |
- |
114 |
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command" |
115 |
- |
116 |
-ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP: as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting." |
117 |
- |
118 |
-ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT: some GRSEC features make LXC unusable see postinst notes" |
119 |
-ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE: some GRSEC features make LXC unusable see postinst notes" |
120 |
-ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT: some GRSEC features make LXC unusable see postinst notes" |
121 |
-ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD: some GRSEC features make LXC unusable see postinst notes" |
122 |
-ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS: some GRSEC features make LXC unusable see postinst notes" |
123 |
-ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC: this GRSEC feature is incompatible with unprivileged containers" |
124 |
-ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT: this GRSEC feature is incompatible with unprivileged containers" |
125 |
- |
126 |
-DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt) |
127 |
- |
128 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
129 |
- |
130 |
-pkg_setup() { |
131 |
- kernel_is -lt 4 7 && CONFIG_CHECK="${CONFIG_CHECK} ~DEVPTS_MULTIPLE_INSTANCES" |
132 |
- linux-info_pkg_setup |
133 |
-} |
134 |
- |
135 |
-src_prepare() { |
136 |
- eapply "${FILESDIR}"/${PN}-2.0.6-bash-completion.patch |
137 |
- #558854 |
138 |
- eapply "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch |
139 |
- eapply "${FILESDIR}"/${PN}-2.1.1-fix-cgroup2-detection.patch |
140 |
- eapply "${FILESDIR}"/${PN}-2.1.1-cgroups-enable-container-without-CAP_SYS_ADMIN.patch |
141 |
- eapply "${FILESDIR}"/${PN}-2.1.1-cve-2018-6556.patch |
142 |
- eapply_user |
143 |
- eautoreconf |
144 |
-} |
145 |
- |
146 |
-src_configure() { |
147 |
- append-flags -fno-strict-aliasing |
148 |
- |
149 |
- if use python; then |
150 |
- #541932 |
151 |
- python_setup "python3*" |
152 |
- export PKG_CONFIG_PATH="${T}/${EPYTHON}/pkgconfig:${PKG_CONFIG_PATH}" |
153 |
- fi |
154 |
- |
155 |
- # I am not sure about the --with-rootfs-path |
156 |
- # /var/lib/lxc is probably more appropriate than |
157 |
- # /usr/lib/lxc. |
158 |
- # Note by holgersson: Why is apparmor disabled? |
159 |
- |
160 |
- # --enable-doc is for manpages which is why we don't link it to a "doc" |
161 |
- # USE flag. We always want man pages. |
162 |
- econf \ |
163 |
- --localstatedir=/var \ |
164 |
- --bindir=/usr/bin \ |
165 |
- --sbindir=/usr/bin \ |
166 |
- --with-config-path=/var/lib/lxc \ |
167 |
- --with-rootfs-path=/var/lib/lxc/rootfs \ |
168 |
- --with-distro=gentoo \ |
169 |
- --with-runtime-path=/run \ |
170 |
- --disable-apparmor \ |
171 |
- --disable-werror \ |
172 |
- --enable-doc \ |
173 |
- $(use_enable cgmanager) \ |
174 |
- $(use_enable examples) \ |
175 |
- $(use_enable lua) \ |
176 |
- $(use_enable python) \ |
177 |
- $(use_enable seccomp) \ |
178 |
- $(use_enable selinux) |
179 |
-} |
180 |
- |
181 |
-python_compile() { |
182 |
- distutils-r1_python_compile build_ext -I.. -L../lxc/.libs --no-pkg-config |
183 |
-} |
184 |
- |
185 |
-src_compile() { |
186 |
- default |
187 |
- |
188 |
- if use python; then |
189 |
- pushd "${S}/src/python-${PN}" > /dev/null |
190 |
- distutils-r1_src_compile |
191 |
- popd > /dev/null |
192 |
- fi |
193 |
-} |
194 |
- |
195 |
-src_install() { |
196 |
- default |
197 |
- |
198 |
- mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die |
199 |
- # start-ephemeral is no longer a command but removing it here |
200 |
- # generates QA warnings (still in upstream completion script) |
201 |
- bashcomp_alias ${PN}-start \ |
202 |
- ${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait} |
203 |
- |
204 |
- if use python; then |
205 |
- pushd "${S}/src/python-lxc" > /dev/null |
206 |
- # Unset DOCS. This has been handled by the default target |
207 |
- unset DOCS |
208 |
- distutils-r1_src_install |
209 |
- popd > /dev/null |
210 |
- fi |
211 |
- |
212 |
- keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc |
213 |
- |
214 |
- find "${D}" -name '*.la' -delete |
215 |
- |
216 |
- # Gentoo-specific additions! |
217 |
- newinitd "${FILESDIR}/${PN}.initd.7" ${PN} |
218 |
- |
219 |
- # Remember to compare our systemd unit file with the upstream one |
220 |
- # config/init/systemd/lxc.service.in |
221 |
- systemd_newunit "${FILESDIR}"/${PN}_at.service.4 "lxc@.service" |
222 |
- |
223 |
- DOC_CONTENTS=" |
224 |
- Starting from version ${PN}-1.1.0-r3, the default lxc path has been |
225 |
- moved from /etc/lxc to /var/lib/lxc. If you still want to use /etc/lxc |
226 |
- please add the following to your /etc/lxc/lxc.conf |
227 |
- |
228 |
- lxc.lxcpath = /etc/lxc |
229 |
- |
230 |
- For openrc, there is an init script provided with the package. |
231 |
- You _should_ only need to symlink /etc/init.d/lxc to |
232 |
- /etc/init.d/lxc.configname to start the container defined in |
233 |
- /etc/lxc/configname.conf. |
234 |
- |
235 |
- Correspondingly, for systemd a service file lxc@.service is installed. |
236 |
- Enable and start lxc@configname in order to start the container defined |
237 |
- in /etc/lxc/configname.conf. |
238 |
- |
239 |
- If you want checkpoint/restore functionality, please install criu |
240 |
- (sys-process/criu)." |
241 |
- DISABLE_AUTOFORMATTING=true |
242 |
- readme.gentoo_create_doc |
243 |
-} |
244 |
- |
245 |
-pkg_postinst() { |
246 |
- readme.gentoo_print_elog |
247 |
-} |
248 |
|
249 |
diff --git a/app-emulation/lxc/metadata.xml b/app-emulation/lxc/metadata.xml |
250 |
index 00fc26795b2..ca4eb37df6c 100644 |
251 |
--- a/app-emulation/lxc/metadata.xml |
252 |
+++ b/app-emulation/lxc/metadata.xml |
253 |
@@ -7,7 +7,6 @@ |
254 |
</maintainer> |
255 |
<use> |
256 |
<flag name="apparmor">Enable AppArmor support</flag> |
257 |
- <flag name="cgmanager">Enable support for cgroup management using <pkg>app-admin/cgmanager</pkg></flag> |
258 |
<flag name="templates">Install old style templates through <pkg>app-emulation/lxc-templates</pkg></flag> |
259 |
<flag name="tools">Build and install additional command line tools</flag> |
260 |
</use> |