Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxc/
Date: Fri, 29 May 2020 13:15:22
Message-Id: 1590758109.20b9c7959ccd39f84b5d6366f092f16b5e5602c1.juippis@gentoo
1 commit: 20b9c7959ccd39f84b5d6366f092f16b5e5602c1
2 Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 29 13:10:47 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=20b9c795
7
8 app-emulation/lxc: clean old 3.1.0
9
10 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
11
12 app-emulation/lxc/Manifest | 1 -
13 app-emulation/lxc/lxc-3.1.0-r1.ebuild | 161 ----------------------------------
14 2 files changed, 162 deletions(-)
15
16 diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
17 index 658b60ca595..768faa21194 100644
18 --- a/app-emulation/lxc/Manifest
19 +++ b/app-emulation/lxc/Manifest
20 @@ -1,3 +1,2 @@
21 DIST lxc-3.0.3.tar.gz 1263371 BLAKE2B 77d0f593119654f570ae748d305e86c27117fd4e9ec7bdab1110f5356afb4a00d81c105ae9757d9da5827f6883a4a5d8ddc43b5b6e56a2927ed990e757f7c7b6 SHA512 cdc411364153d7ed494bab604260f5cbdfd5bd7734a59af970b3198c7b3cb340b6736856a2189d5989e169945a817ac8b531bc3ab62217a4285dd63a851f9c8a
22 -DIST lxc-3.1.0.tar.gz 1277877 BLAKE2B e114855659c8199378d14bc23f667ce1927bb32c55d336fa9c222a60198da51e7ded6aeb6d1c89cbeb1e9edc101e424a847be1e4a2330d2a0bceda52d0df5e30 SHA512 706cee9bc8ac57300574b59d728437e41baa4eb16c68f8548142e53b4e13679ef6698df30a4fbf8617e4f07338f898464e9f818e80d32648fe9717370dcbbb20
23 DIST lxc-4.0.2.tar.gz 1352667 BLAKE2B 2ecc076bacb9bb1c2a808422f7b2e0cbfc74bf3bec6ca89ea58eb6ef4a414353c2e58163bff17b3304beb39f4980d10f54365f739645c1581bfca9f6079bf57c SHA512 0de6c1f9649d161579b45fc28a735f703c4498eff9c588462b838220aeab73f91921db628f77bc461eff38c7583cac10a38951263181956e2d33412a406f3ef3
24
25 diff --git a/app-emulation/lxc/lxc-3.1.0-r1.ebuild b/app-emulation/lxc/lxc-3.1.0-r1.ebuild
26 deleted file mode 100644
27 index 138938369b9..00000000000
28 --- a/app-emulation/lxc/lxc-3.1.0-r1.ebuild
29 +++ /dev/null
30 @@ -1,161 +0,0 @@
31 -# Copyright 1999-2019 Gentoo Authors
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=7
35 -
36 -inherit autotools bash-completion-r1 linux-info flag-o-matic systemd readme.gentoo-r1 pam
37 -
38 -DESCRIPTION="LinuX Containers userspace utilities"
39 -HOMEPAGE="https://linuxcontainers.org/"
40 -SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
41 -
42 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
43 -
44 -LICENSE="LGPL-3"
45 -SLOT="0"
46 -IUSE="apparmor examples pam seccomp selinux +templates"
47 -
48 -RDEPEND="
49 - net-libs/gnutls
50 - sys-libs/libcap
51 - pam? ( sys-libs/pam )
52 - seccomp? ( sys-libs/libseccomp )
53 - selinux? ( sys-libs/libselinux )"
54 -
55 -DEPEND="${RDEPEND}
56 - >=app-text/docbook-sgml-utils-0.6.14-r2
57 - >=sys-kernel/linux-headers-3.2"
58 -
59 -RDEPEND="${RDEPEND}
60 - sys-apps/util-linux
61 - app-misc/pax-utils
62 - virtual/awk"
63 -
64 -PDEPEND="templates? ( app-emulation/lxc-templates )"
65 -
66 -CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
67 - ~CPUSETS ~CGROUP_CPUACCT
68 - ~CGROUP_SCHED
69 -
70 - ~NAMESPACES
71 - ~IPC_NS ~USER_NS ~PID_NS
72 -
73 - ~CGROUP_FREEZER
74 - ~UTS_NS ~NET_NS
75 - ~VETH ~MACVLAN
76 -
77 - ~POSIX_MQUEUE
78 - ~!NETPRIO_CGROUP
79 -
80 - ~!GRKERNSEC_CHROOT_MOUNT
81 - ~!GRKERNSEC_CHROOT_DOUBLE
82 - ~!GRKERNSEC_CHROOT_PIVOT
83 - ~!GRKERNSEC_CHROOT_CHMOD
84 - ~!GRKERNSEC_CHROOT_CAPS
85 - ~!GRKERNSEC_PROC
86 - ~!GRKERNSEC_SYSFS_RESTRICT
87 - ~!GRKERNSEC_CHROOT_FINDTASK
88 -"
89 -
90 -ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container"
91 -
92 -ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
93 -
94 -ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
95 -ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
96 -
97 -ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
98 -ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking"
99 -
100 -ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
101 -
102 -ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP: as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting."
103 -
104 -ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT: some GRSEC features make LXC unusable see postinst notes"
105 -ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE: some GRSEC features make LXC unusable see postinst notes"
106 -ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT: some GRSEC features make LXC unusable see postinst notes"
107 -ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD: some GRSEC features make LXC unusable see postinst notes"
108 -ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS: some GRSEC features make LXC unusable see postinst notes"
109 -ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC: this GRSEC feature is incompatible with unprivileged containers"
110 -ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT: this GRSEC feature is incompatible with unprivileged containers"
111 -
112 -DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
113 -
114 -pkg_setup() {
115 - linux-info_pkg_setup
116 -}
117 -
118 -PATCHES=(
119 - "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
120 - "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
121 -)
122 -
123 -src_prepare() {
124 - default
125 - eautoreconf
126 -}
127 -
128 -src_configure() {
129 - append-flags -fno-strict-aliasing
130 -
131 - # --enable-doc is for manpages which is why we don't link it to a "doc"
132 - # USE flag. We always want man pages.
133 - local myeconfargs=(
134 - --localstatedir=/var
135 - --bindir=/usr/bin
136 - --sbindir=/usr/bin
137 - --with-config-path=/var/lib/lxc
138 - --with-rootfs-path=/var/lib/lxc/rootfs
139 - --with-distro=gentoo
140 - --with-runtime-path=/run
141 - --disable-apparmor
142 - --disable-werror
143 - --enable-doc
144 - $(use_enable apparmor)
145 - $(use_enable examples)
146 - $(use_enable pam)
147 - $(use_with pam pamdir $(getpam_mod_dir))
148 - $(use_enable seccomp)
149 - $(use_enable selinux)
150 - )
151 - econf "${myeconfargs[@]}"
152 -}
153 -
154 -src_install() {
155 - default
156 -
157 - mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
158 - bashcomp_alias ${PN}-start \
159 - ${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,wait}
160 -
161 - keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
162 - rmdir "${D}"/var/cache/lxc "${D}"/var/cache || die "rmdir failed"
163 -
164 - find "${D}" -name '*.la' -delete
165 -
166 - # Gentoo-specific additions!
167 - newinitd "${FILESDIR}/${PN}.initd.8" ${PN}
168 -
169 - # Remember to compare our systemd unit file with the upstream one
170 - # config/init/systemd/lxc.service.in
171 - systemd_newunit "${FILESDIR}"/${PN}_at.service.4 "lxc@.service"
172 -
173 - DOC_CONTENTS="
174 - For openrc, there is an init script provided with the package.
175 - You _should_ only need to symlink /etc/init.d/lxc to
176 - /etc/init.d/lxc.configname to start the container defined in
177 - /etc/lxc/configname.conf.
178 -
179 - Correspondingly, for systemd a service file lxc@.service is installed.
180 - Enable and start lxc@configname in order to start the container defined
181 - in /etc/lxc/configname.conf.
182 -
183 - If you want checkpoint/restore functionality, please install criu
184 - (sys-process/criu)."
185 - DISABLE_AUTOFORMATTING=true
186 - readme.gentoo_create_doc
187 -}
188 -
189 -pkg_postinst() {
190 - readme.gentoo_print_elog
191 -}