1 |
commit: 2891603788e6f92f8c58ea74d26a48e62c3c21ab |
2 |
Author: Yixun Lan <dlan <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 3 13:30:30 2016 +0000 |
4 |
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 3 13:38:51 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28916037 |
7 |
|
8 |
app-emulation/lxc: version bump |
9 |
|
10 |
rework bashcomp patch to make 2.0.6 happy |
11 |
|
12 |
Package-Manager: portage-2.3.2 |
13 |
|
14 |
app-emulation/lxc/Manifest | 1 + |
15 |
.../lxc/files/lxc-2.0.6-bash-completion.patch | 27 +++ |
16 |
app-emulation/lxc/lxc-2.0.6.ebuild | 200 +++++++++++++++++++++ |
17 |
3 files changed, 228 insertions(+) |
18 |
|
19 |
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest |
20 |
index 155b6f9..075d3bf 100644 |
21 |
--- a/app-emulation/lxc/Manifest |
22 |
+++ b/app-emulation/lxc/Manifest |
23 |
@@ -3,3 +3,4 @@ DIST lxc-1.0.8.tar.gz 575127 SHA256 399ac3eb4e0a89d657fb2e2a57f686ed061d3f1ea473 |
24 |
DIST lxc-2.0.3.tar.gz 772448 SHA256 635afa330088fea57883018da326fc72f85460b5a6c7802ad68044381aff14f3 SHA512 df714f189ec7aa681710fbd58405b8958740102032c0130d8a0eaaae0341a9bc91a215136203c404ad79773800f620bf6f71f811b3effe559aed66efa4f34fef WHIRLPOOL 89ce2f6762c7279e24658c1154b5c2960d3db32e0ec3724b338f5d30da77cc0b33a2376e5eebe6d9c356bdd34c2aa9da1e2434aecd7e428fa4b729389e35b862 |
25 |
DIST lxc-2.0.4.tar.gz 775634 SHA256 57d40234aeecf5b60fb29d563e5a09d6a04c89e1267eb22a6704388ac8573e7b SHA512 3f985bba5aaa8a70f0329316ea4f42ab135d58c47611154c62e103718212a4b2c5e4f25fd45c372424db1fbf40afdc8269ae98655fb3bc8e31085a5d948f702b WHIRLPOOL b001c75d67d676e75b203d789cf2c0643ba9a47aa31965441340b66f28e18371415b9d44ce752e35102bc8677688eec6e586d800a33a2a965c8a046c091ebc06 |
26 |
DIST lxc-2.0.5.tar.gz 778842 SHA256 1f1c491b2ad5e74a85b8eb791ccac8128e6eaf5ddcc1323e9360997c030f7072 SHA512 8e14036597fa3407c87fb92d13b40bbca9a646d27d817e0a9d20fe626625d6cf04a1df65b1a723391d41a311b9f4f3432b3213004892d64355fe0edc7858cb9f WHIRLPOOL fa6ac86d67fe563f92411cbd09a0d66d729a0a15fe48076b42f4b3996e6b786826990bd51382c14606fd1b5240d413bc8d217fac37becd9baccd89de15d30b22 |
27 |
+DIST lxc-2.0.6.tar.gz 788483 SHA256 8723ef5973a47e7b2c439002c28590d74689e871d36f03089965503c0c0d50b2 SHA512 f44c0498876462d78e57d19816eab666e90470badc2bbd38fed9f504e8b21c3e68e4d0f63a8676fa8716be60481befb3db44098228fd71b480972af2b5dcf1e3 WHIRLPOOL 5bb2648637a46e3547edeba2ad46eb131b2ae194f5efe52a688157cfa3f361f51a832554a94bcd47074e65cbf8d1e1119d23548bdf83ca62c131400c40aff34a |
28 |
|
29 |
diff --git a/app-emulation/lxc/files/lxc-2.0.6-bash-completion.patch b/app-emulation/lxc/files/lxc-2.0.6-bash-completion.patch |
30 |
new file mode 100644 |
31 |
index 00000000..6033e36 |
32 |
--- /dev/null |
33 |
+++ b/app-emulation/lxc/files/lxc-2.0.6-bash-completion.patch |
34 |
@@ -0,0 +1,27 @@ |
35 |
+diff --git a/config/bash/lxc.in b/config/bash/lxc.in |
36 |
+index 7dcf302..5927fe2 100644 |
37 |
+--- a/config/bash/lxc.in |
38 |
++++ b/config/bash/lxc.in |
39 |
+@@ -1,4 +1,3 @@ |
40 |
+-_have lxc-start && { |
41 |
+ _lxc_names() { |
42 |
+ COMPREPLY=( $( compgen -W "$( lxc-ls )" "$cur" ) ) |
43 |
+ } |
44 |
+@@ -100,4 +99,3 @@ _have lxc-start && { |
45 |
+ |
46 |
+ complete -o default -F _lxc_generic_o lxc-copy |
47 |
+ complete -o default -F _lxc_generic_o lxc-start-ephemeral |
48 |
+-} |
49 |
+diff --git a/configure.ac b/configure.ac |
50 |
+index 4640c0d..14ccdd3 100644 |
51 |
+--- a/configure.ac |
52 |
++++ b/configure.ac |
53 |
+@@ -478,7 +478,7 @@ AM_CONDITIONAL([ENABLE_BASH], [test "x$enable_bash" = "xyes"]) |
54 |
+ AM_COND_IF([ENABLE_BASH], |
55 |
+ [AC_MSG_CHECKING([bash completion directory]) |
56 |
+ PKG_CHECK_VAR(bashcompdir, [bash-completion], [completionsdir], , |
57 |
+- bashcompdir="${sysconfdir}/bash_completion.d") |
58 |
++ bashcompdir="$datadir/bash-completion/completions") |
59 |
+ AC_MSG_RESULT([$bashcompdir]) |
60 |
+ AC_SUBST(bashcompdir) |
61 |
+ ]) |
62 |
|
63 |
diff --git a/app-emulation/lxc/lxc-2.0.6.ebuild b/app-emulation/lxc/lxc-2.0.6.ebuild |
64 |
new file mode 100644 |
65 |
index 00000000..11e2839 |
66 |
--- /dev/null |
67 |
+++ b/app-emulation/lxc/lxc-2.0.6.ebuild |
68 |
@@ -0,0 +1,200 @@ |
69 |
+# Copyright 1999-2016 Gentoo Foundation |
70 |
+# Distributed under the terms of the GNU General Public License v2 |
71 |
+# $Id$ |
72 |
+ |
73 |
+EAPI="6" |
74 |
+ |
75 |
+MY_P="${P/_/-}" |
76 |
+PYTHON_COMPAT=( python{3_4,3_5} ) |
77 |
+DISTUTILS_OPTIONAL=1 |
78 |
+ |
79 |
+inherit autotools bash-completion-r1 distutils-r1 linux-info versionator flag-o-matic systemd |
80 |
+ |
81 |
+DESCRIPTION="LinuX Containers userspace utilities" |
82 |
+HOMEPAGE="https://linuxcontainers.org/" |
83 |
+SRC_URI="https://github.com/lxc/lxc/archive/${MY_P}.tar.gz" |
84 |
+ |
85 |
+KEYWORDS="~amd64 ~arm ~arm64" |
86 |
+ |
87 |
+LICENSE="LGPL-3" |
88 |
+SLOT="0" |
89 |
+IUSE="cgmanager doc examples lua python seccomp" |
90 |
+ |
91 |
+RDEPEND="net-libs/gnutls |
92 |
+ sys-libs/libcap |
93 |
+ cgmanager? ( app-admin/cgmanager ) |
94 |
+ lua? ( >=dev-lang/lua-5.1:= ) |
95 |
+ python? ( ${PYTHON_DEPS} ) |
96 |
+ seccomp? ( sys-libs/libseccomp )" |
97 |
+ |
98 |
+DEPEND="${RDEPEND} |
99 |
+ doc? ( app-text/docbook-sgml-utils ) |
100 |
+ >=sys-kernel/linux-headers-3.2" |
101 |
+ |
102 |
+RDEPEND="${RDEPEND} |
103 |
+ sys-process/criu |
104 |
+ sys-apps/util-linux |
105 |
+ app-misc/pax-utils |
106 |
+ virtual/awk" |
107 |
+ |
108 |
+CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE |
109 |
+ ~CPUSETS ~CGROUP_CPUACCT |
110 |
+ ~CGROUP_SCHED |
111 |
+ |
112 |
+ ~NAMESPACES |
113 |
+ ~IPC_NS ~USER_NS ~PID_NS |
114 |
+ |
115 |
+ ~NETLINK_DIAG ~PACKET_DIAG |
116 |
+ ~INET_UDP_DIAG ~INET_TCP_DIAG |
117 |
+ ~UNIX_DIAG ~CHECKPOINT_RESTORE |
118 |
+ |
119 |
+ ~CGROUP_FREEZER |
120 |
+ ~UTS_NS ~NET_NS |
121 |
+ ~VETH ~MACVLAN |
122 |
+ |
123 |
+ ~POSIX_MQUEUE |
124 |
+ ~!NETPRIO_CGROUP |
125 |
+ |
126 |
+ ~!GRKERNSEC_CHROOT_MOUNT |
127 |
+ ~!GRKERNSEC_CHROOT_DOUBLE |
128 |
+ ~!GRKERNSEC_CHROOT_PIVOT |
129 |
+ ~!GRKERNSEC_CHROOT_CHMOD |
130 |
+ ~!GRKERNSEC_CHROOT_CAPS |
131 |
+ ~!GRKERNSEC_PROC |
132 |
+ ~!GRKERNSEC_SYSFS_RESTRICT |
133 |
+" |
134 |
+ |
135 |
+ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container" |
136 |
+ |
137 |
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers" |
138 |
+ |
139 |
+ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info" |
140 |
+ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network" |
141 |
+ |
142 |
+ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking" |
143 |
+ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking" |
144 |
+ |
145 |
+ERROR_NETLINK_DIAG="CONFIG_NETLINK_DIAG: needed for lxc-checkpoint" |
146 |
+ERROR_PACKET_DIAG="CONFIG_PACKET_DIAG: needed for lxc-checkpoint" |
147 |
+ERROR_INET_UDP_DIAG="CONFIG_INET_UDP_DIAG: needed for lxc-checkpoint" |
148 |
+ERROR_INET_TCP_DIAG="CONFIG_INET_TCP_DIAG: needed for lxc-checkpoint" |
149 |
+ERROR_UNIX_DIAG="CONFIG_UNIX_DIAG: needed for lxc-checkpoint" |
150 |
+ERROR_CHECKPOINT_RESTORE="CONFIG_CHECKPOINT_RESTORE: needed for lxc-checkpoint" |
151 |
+ |
152 |
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command" |
153 |
+ |
154 |
+ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP: as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting." |
155 |
+ |
156 |
+ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT: some GRSEC features make LXC unusable see postinst notes" |
157 |
+ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE: some GRSEC features make LXC unusable see postinst notes" |
158 |
+ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT: some GRSEC features make LXC unusable see postinst notes" |
159 |
+ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD: some GRSEC features make LXC unusable see postinst notes" |
160 |
+ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS: some GRSEC features make LXC unusable see postinst notes" |
161 |
+ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC: this GRSEC feature is incompatible with unprivileged containers" |
162 |
+ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT: this GRSEC feature is incompatible with unprivileged containers" |
163 |
+ |
164 |
+DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt) |
165 |
+ |
166 |
+S="${WORKDIR}/${PN}-${MY_P}" |
167 |
+ |
168 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
169 |
+ |
170 |
+pkg_setup() { |
171 |
+ kernel_is -lt 4 7 && CONFIG_CHECK="${CONFIG_CHECK} ~DEVPTS_MULTIPLE_INSTANCES" |
172 |
+ linux-info_pkg_setup |
173 |
+} |
174 |
+ |
175 |
+src_prepare() { |
176 |
+ eapply "${FILESDIR}"/${P}-bash-completion.patch |
177 |
+ #558854 |
178 |
+ eapply "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch |
179 |
+ eapply_user |
180 |
+ eautoreconf |
181 |
+} |
182 |
+ |
183 |
+src_configure() { |
184 |
+ append-flags -fno-strict-aliasing |
185 |
+ |
186 |
+ if use python; then |
187 |
+ #541932 |
188 |
+ python_setup "python3*" |
189 |
+ export PKG_CONFIG_PATH="${T}/${EPYTHON}/pkgconfig:${PKG_CONFIG_PATH}" |
190 |
+ fi |
191 |
+ |
192 |
+ # I am not sure about the --with-rootfs-path |
193 |
+ # /var/lib/lxc is probably more appropriate than |
194 |
+ # /usr/lib/lxc. |
195 |
+ econf \ |
196 |
+ --localstatedir=/var \ |
197 |
+ --bindir=/usr/bin \ |
198 |
+ --sbindir=/usr/bin \ |
199 |
+ --with-config-path=/var/lib/lxc \ |
200 |
+ --with-rootfs-path=/var/lib/lxc/rootfs \ |
201 |
+ --with-distro=gentoo \ |
202 |
+ --with-runtime-path=/run \ |
203 |
+ --disable-apparmor \ |
204 |
+ $(use_enable cgmanager) \ |
205 |
+ $(use_enable doc) \ |
206 |
+ $(use_enable examples) \ |
207 |
+ $(use_enable lua) \ |
208 |
+ $(use_enable python) \ |
209 |
+ $(use_enable seccomp) |
210 |
+} |
211 |
+ |
212 |
+python_compile() { |
213 |
+ distutils-r1_python_compile build_ext -I ../ -L ../${PN} |
214 |
+} |
215 |
+ |
216 |
+src_compile() { |
217 |
+ default |
218 |
+ |
219 |
+ if use python; then |
220 |
+ pushd "${S}/src/python-${PN}" > /dev/null |
221 |
+ distutils-r1_src_compile |
222 |
+ popd > /dev/null |
223 |
+ fi |
224 |
+} |
225 |
+ |
226 |
+src_install() { |
227 |
+ default |
228 |
+ |
229 |
+ # start-ephemeral is no longer a command but removing it here |
230 |
+ # generates QA warnings (still in upstream completion script) |
231 |
+ bashcomp_alias ${PN} \ |
232 |
+ ${PN}-{start,attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait} |
233 |
+ |
234 |
+ if use python; then |
235 |
+ pushd "${S}/src/python-lxc" > /dev/null |
236 |
+ # Unset DOCS. This has been handled by the default target |
237 |
+ unset DOCS |
238 |
+ distutils-r1_src_install |
239 |
+ popd > /dev/null |
240 |
+ fi |
241 |
+ |
242 |
+ keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc |
243 |
+ |
244 |
+ find "${D}" -name '*.la' -delete |
245 |
+ |
246 |
+ # Gentoo-specific additions! |
247 |
+ newinitd "${FILESDIR}/${PN}.initd.5" ${PN} |
248 |
+ |
249 |
+ # Remember to compare our systemd unit file with the upstream one |
250 |
+ # config/init/systemd/lxc.service.in |
251 |
+ systemd_newunit "${FILESDIR}"/${PN}_at.service.4 "lxc@.service" |
252 |
+} |
253 |
+ |
254 |
+pkg_postinst() { |
255 |
+ elog "" |
256 |
+ elog "Starting from version ${PN}-1.1.0-r3, the default lxc path has been" |
257 |
+ elog "moved from /etc/lxc to /var/lib/lxc. If you still want to use /etc/lxc" |
258 |
+ elog "please add the following to your /etc/lxc/default.conf" |
259 |
+ elog "lxc.lxcpath = /etc/lxc" |
260 |
+ elog "" |
261 |
+ elog "There is an init script provided with the package now; no documentation" |
262 |
+ elog "is currently available though, so please check out /etc/init.d/lxc ." |
263 |
+ elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname" |
264 |
+ elog "to start the container defined into /etc/lxc/configname.conf ." |
265 |
+ elog "For further information about LXC development see" |
266 |
+ elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available |
267 |
+ elog "" |
268 |
+} |