Gentoo Archives: gentoo-commits

From: Virgil Dupras <vdupras@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxc/files/, app-emulation/lxc/
Date: Mon, 30 Jul 2018 22:55:14
Message-Id: 1532991270.0d591c9d3e741c4567665b4e62e2205dbe96730c.vdupras@gentoo
1 commit: 0d591c9d3e741c4567665b4e62e2205dbe96730c
2 Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 30 22:54:30 2018 +0000
4 Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 30 22:54:30 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d591c9d
7
8 app-emulation/lxc: remove old
9
10 Package-Manager: Portage-2.3.43, Repoman-2.3.10
11
12 app-emulation/lxc/Manifest | 1 -
13 app-emulation/lxc/files/lxc_at.service | 12 ---
14 app-emulation/lxc/lxc-3.0.0.ebuild | 170 ---------------------------------
15 3 files changed, 183 deletions(-)
16
17 diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
18 index 0d31b16fc38..e8d8e7473f5 100644
19 --- a/app-emulation/lxc/Manifest
20 +++ b/app-emulation/lxc/Manifest
21 @@ -1,3 +1,2 @@
22 DIST lxc-2.1.1.tar.gz 1378640 BLAKE2B 5fca516540a886729434579ff99acf3baa06977fa0e0b6f24dbf15094626335fc073597d308276e3dd20e27ceabf1477cc8e99d1fd24cf50b9aed2720b887b69 SHA512 2989d57acddfe091adcf8031721c3c9a2f8eff5476bd6155366b76ea7511e0f6120e669276e056e3963863e0f0acf3b095d44c36fa6652e67c197671f28cbdd4
23 -DIST lxc-3.0.0.tar.gz 1233316 BLAKE2B ba726a07f48b1d32366012c8d885a853e33f88d8c45c910b061d9deecf472d940f7d45a1e742c8194517ba3231e1875a49bbf303b2c3fd2c9ece33b941670bb7 SHA512 21372e6fe4d38e2cf54707fab4133137793deff1dd500ed7ed02c03bbaa809de56c7490971594cddbdcb2b96f0c03ab5dfb43a8582a584598a12c5943b7ca490
24 DIST lxc-3.0.1.tar.gz 1239920 BLAKE2B 7be668c11d7211540fe7e2fb6318d38eac0d8d493914f4705d097fca4c004a8d2191609d02bd9e1d9204c3c0b9ea937084d3f9050fc841f6d777768067af3d19 SHA512 f51b0844f61f64d4efc530454eae1fa499f7f1b908bd3b40d7031e7f311a402893a7504bddbc53f2ef9da2b3154d1b047fc4d876b99f0d487d7c79de64eea505
25
26 diff --git a/app-emulation/lxc/files/lxc_at.service b/app-emulation/lxc/files/lxc_at.service
27 deleted file mode 100644
28 index 1ef44977530..00000000000
29 --- a/app-emulation/lxc/files/lxc_at.service
30 +++ /dev/null
31 @@ -1,12 +0,0 @@
32 -[Unit]
33 -Description=Linux Container %I
34 -After=network.target
35 -
36 -[Service]
37 -Restart=always
38 -ExecStart=/usr/sbin/lxc-start -n %i
39 -ExecReload=/usr/sbin/lxc-restart -n %i
40 -ExecStop=/usr/sbin/lxc-stop -n %i
41 -
42 -[Install]
43 -WantedBy=multi-user.target
44
45 diff --git a/app-emulation/lxc/lxc-3.0.0.ebuild b/app-emulation/lxc/lxc-3.0.0.ebuild
46 deleted file mode 100644
47 index 4122c2e8599..00000000000
48 --- a/app-emulation/lxc/lxc-3.0.0.ebuild
49 +++ /dev/null
50 @@ -1,170 +0,0 @@
51 -# Copyright 1999-2018 Gentoo Foundation
52 -# Distributed under the terms of the GNU General Public License v2
53 -
54 -EAPI=6
55 -
56 -inherit autotools bash-completion-r1 linux-info flag-o-matic systemd readme.gentoo-r1 pam
57 -
58 -DESCRIPTION="LinuX Containers userspace utilities"
59 -HOMEPAGE="https://linuxcontainers.org/"
60 -SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
61 -
62 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
63 -
64 -LICENSE="LGPL-3"
65 -SLOT="0"
66 -IUSE="examples pam seccomp selinux"
67 -
68 -RDEPEND="
69 - net-libs/gnutls
70 - sys-libs/libcap
71 - pam? ( virtual/pam )
72 - seccomp? ( sys-libs/libseccomp )
73 - selinux? ( sys-libs/libselinux )"
74 -
75 -DEPEND="${RDEPEND}
76 - >=app-text/docbook-sgml-utils-0.6.14-r2
77 - >=sys-kernel/linux-headers-3.2"
78 -
79 -RDEPEND="${RDEPEND}
80 - sys-apps/util-linux
81 - app-misc/pax-utils
82 - virtual/awk"
83 -
84 -CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
85 - ~CPUSETS ~CGROUP_CPUACCT
86 - ~CGROUP_SCHED
87 -
88 - ~NAMESPACES
89 - ~IPC_NS ~USER_NS ~PID_NS
90 -
91 - ~NETLINK_DIAG ~PACKET_DIAG
92 - ~INET_UDP_DIAG ~INET_TCP_DIAG
93 - ~UNIX_DIAG ~CHECKPOINT_RESTORE
94 -
95 - ~CGROUP_FREEZER
96 - ~UTS_NS ~NET_NS
97 - ~VETH ~MACVLAN
98 -
99 - ~POSIX_MQUEUE
100 - ~!NETPRIO_CGROUP
101 -
102 - ~!GRKERNSEC_CHROOT_MOUNT
103 - ~!GRKERNSEC_CHROOT_DOUBLE
104 - ~!GRKERNSEC_CHROOT_PIVOT
105 - ~!GRKERNSEC_CHROOT_CHMOD
106 - ~!GRKERNSEC_CHROOT_CAPS
107 - ~!GRKERNSEC_PROC
108 - ~!GRKERNSEC_SYSFS_RESTRICT
109 -"
110 -
111 -ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container"
112 -
113 -ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
114 -
115 -ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
116 -ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
117 -
118 -ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
119 -ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking"
120 -
121 -ERROR_NETLINK_DIAG="CONFIG_NETLINK_DIAG: needed for lxc-checkpoint"
122 -ERROR_PACKET_DIAG="CONFIG_PACKET_DIAG: needed for lxc-checkpoint"
123 -ERROR_INET_UDP_DIAG="CONFIG_INET_UDP_DIAG: needed for lxc-checkpoint"
124 -ERROR_INET_TCP_DIAG="CONFIG_INET_TCP_DIAG: needed for lxc-checkpoint"
125 -ERROR_UNIX_DIAG="CONFIG_UNIX_DIAG: needed for lxc-checkpoint"
126 -ERROR_CHECKPOINT_RESTORE="CONFIG_CHECKPOINT_RESTORE: needed for lxc-checkpoint"
127 -
128 -ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
129 -
130 -ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP: as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting."
131 -
132 -ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT: some GRSEC features make LXC unusable see postinst notes"
133 -ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE: some GRSEC features make LXC unusable see postinst notes"
134 -ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT: some GRSEC features make LXC unusable see postinst notes"
135 -ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD: some GRSEC features make LXC unusable see postinst notes"
136 -ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS: some GRSEC features make LXC unusable see postinst notes"
137 -ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC: this GRSEC feature is incompatible with unprivileged containers"
138 -ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT: this GRSEC feature is incompatible with unprivileged containers"
139 -
140 -DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
141 -
142 -pkg_setup() {
143 - kernel_is -lt 4 7 && CONFIG_CHECK="${CONFIG_CHECK} ~DEVPTS_MULTIPLE_INSTANCES"
144 - linux-info_pkg_setup
145 -}
146 -
147 -src_prepare() {
148 - eapply "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
149 - #558854
150 - eapply "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch
151 - eapply_user
152 - eautoreconf
153 -}
154 -
155 -src_configure() {
156 - append-flags -fno-strict-aliasing
157 -
158 - # I am not sure about the --with-rootfs-path
159 - # /var/lib/lxc is probably more appropriate than
160 - # /usr/lib/lxc.
161 - # Note by holgersson: Why is apparmor disabled?
162 -
163 - # --enable-doc is for manpages which is why we don't link it to a "doc"
164 - # USE flag. We always want man pages.
165 - econf \
166 - --localstatedir=/var \
167 - --bindir=/usr/bin \
168 - --sbindir=/usr/bin \
169 - --with-config-path=/var/lib/lxc \
170 - --with-rootfs-path=/var/lib/lxc/rootfs \
171 - --with-distro=gentoo \
172 - --with-runtime-path=/run \
173 - --disable-apparmor \
174 - --disable-werror \
175 - --enable-doc \
176 - $(use_enable examples) \
177 - $(use_enable pam) \
178 - $(use_with pam pamdir $(getpam_mod_dir)) \
179 - $(use_enable seccomp) \
180 - $(use_enable selinux)
181 -}
182 -
183 -src_install() {
184 - default
185 -
186 - mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
187 - bashcomp_alias ${PN}-start \
188 - ${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,wait}
189 -
190 - keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
191 - rmdir "${D}"/var/cache/lxc "${D}"/var/cache || die "rmdir failed"
192 -
193 - find "${D}" -name '*.la' -delete
194 -
195 - # Gentoo-specific additions!
196 - newinitd "${FILESDIR}/${PN}.initd.7" ${PN}
197 -
198 - # Remember to compare our systemd unit file with the upstream one
199 - # config/init/systemd/lxc.service.in
200 - systemd_newunit "${FILESDIR}"/${PN}_at.service.4 "lxc@.service"
201 -
202 - DOC_CONTENTS="
203 - For openrc, there is an init script provided with the package.
204 - You _should_ only need to symlink /etc/init.d/lxc to
205 - /etc/init.d/lxc.configname to start the container defined in
206 - /etc/lxc/configname.conf.
207 -
208 - Correspondingly, for systemd a service file lxc@.service is installed.
209 - Enable and start lxc@configname in order to start the container defined
210 - in /etc/lxc/configname.conf.
211 -
212 - If you want checkpoint/restore functionality, please install criu
213 - (sys-process/criu)."
214 - DISABLE_AUTOFORMATTING=true
215 - readme.gentoo_create_doc
216 -}
217 -
218 -pkg_postinst() {
219 - readme.gentoo_print_elog
220 -}