1 |
commit: e02d314aa557b213fb38aa3eeea910c45a81dcaa |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 31 07:47:40 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 31 07:47:54 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e02d314a |
7 |
|
8 |
app-emulation/rkt: Remove last-rited pkg |
9 |
|
10 |
Closes: https://bugs.gentoo.org/687100 |
11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
12 |
|
13 |
app-emulation/rkt/Manifest | 9 - |
14 |
app-emulation/rkt/metadata.xml | 32 ---- |
15 |
app-emulation/rkt/rkt-1.29.0.ebuild | 267 ----------------------------- |
16 |
app-emulation/rkt/rkt-1.30.0.ebuild | 254 --------------------------- |
17 |
profiles/features/selinux/package.use.mask | 4 - |
18 |
profiles/package.mask | 5 - |
19 |
6 files changed, 571 deletions(-) |
20 |
|
21 |
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest |
22 |
deleted file mode 100644 |
23 |
index 6702216c146..00000000000 |
24 |
--- a/app-emulation/rkt/Manifest |
25 |
+++ /dev/null |
26 |
@@ -1,9 +0,0 @@ |
27 |
-DIST kvmtool-cfae4d64482ed745214e3c62dd84b79c2ae0f325.tar.gz 245010 BLAKE2B 335f05906d4c623e7d1213e1e335af742c1072e4b7505c7f25d703c468db8b410d66809239d40b98c0aa4347985d2d861ef4d8519eae19ca6cdae776dc2a7b1b SHA512 7cca005136f3628dfef359f83732d6f8cc062c5e4a8d77f57c6dd5e007ed06c85f0c275c8844228b404755dbf3f4d45f6a149fc64235f4f1abe0058214e24730 |
28 |
-DIST kvmtool-include-asm-msr-index-1cc05b24bfe0211bb408f3264af8e0c42dcdde9c.patch 2168 BLAKE2B 8f33f1034dda7b7c749b5540f83b0241025eb1366631e2067ff470a5e2626b41fe41d4efde1e9f8104896b126ea4a0ac06334f2b88d4730bde16ce65283b4133 SHA512 483acd3758cf66587a173da8e24ef127c04955742d292de663226ebd3a1f3ee41b24a966e771f066cd735d0bda77a15d09ca00a27d3de7130456c0eb3cf7cf5e |
29 |
-DIST kvmtool-include-sysmacros-c0a985531f49c06fd05069024f4664740e6a0baf.patch 1243 BLAKE2B d5591addbcdb22952b5b6e462283215bd2366edabbb0db54ffa49b101cf4dcf599a788f4c07fd02729bbf67a3490613f4c4c89f27ad4d84600351d6156dfa4bc SHA512 d8e9d6e656b51d8e4b3bf6939e927a4c11874dfb34b4d649adcbcaf44ec1f95af2bf73e138f94c53aa07cbd79db63a6ebf75f96861f8b13743c942523a3ff106 |
30 |
-DIST linux-4.9.2.tar.xz 93189108 BLAKE2B d9eb7bd6f168aba5955da92f54c70468a5eaa6fabceb8399d8c2398672d4401012dc23ce92dfd63e80c87b57eba56f77b62dbf8ec7a8b12e6e0af2d66ea29e3f SHA512 85adf3715cba4a457efea8359ebed34413ac63ee58fe920c5713501dec1e727e167416e9d67a9e2d9430aa9f3a53ad0ac26a4f749984bc5a3f3c37ac504f75de |
31 |
-DIST qemu-2.8.0.tar.bz2 28368517 BLAKE2B 15177018f1f828f35e745593746228738f9bd540b3658b5ca285141867a9fc4a7a4aa9be7b174d32f5d7fc2567fb379a4ce40135b405047282cfbdcd8ab90181 SHA512 50f2988d822388ba9fd1bf5dbe68359033ed7432d7f0f9790299f32f63faa6dc72979256b5632ba572d47ee3e74ed40e3e8e331dc6303ec1599f1b4367cb78c2 |
32 |
-DIST rkt-1.29.0.tar.gz 3434520 BLAKE2B b3e1b4e93335023e86439a5202cdb2d8c8f62a24392fd37a11fe381f76cad71ad01d0e4a6b6acdd29edaa77932530f1cdfe5a2aed403841c079f7cb40591972c SHA512 a128abddb29a246b0afea8f7dc81d77aae1e8efaf4dae8fe92aa0f2855c4e4f9dcf7a6f01efa77500ed8a6723db83933c8d1973b284dc62f8e9e0e06b6a20f6d |
33 |
-DIST rkt-1.30.0.tar.gz 3655661 BLAKE2B f7ac84cdf40d64a04cb1b95cc59a33585f38ab7aac2768833a369725fccfa80c4d85d213161f0d3e265e1b84730e9224a63103dcb6085595474fafa35f8b9d5b SHA512 47b409a61960fec1352535beb2fcdc396ec1cf6feb7d66b320aed0acd908c8ae86d058b4f9b76367606f4e78db6f333bc85dac66f7d646b3b1ada9bfd1f15e44 |
34 |
-DIST rkt-pxe-1478.0.0.img 264382497 BLAKE2B 087fc5e27fe2fe41a82d4dad727625a573eda027b3ca67e063ec6d38bb6382353e30804e21f55cda5494ad7ff3cf1db9d593ccc63a639e16a98295d976e92325 SHA512 5f462b6223a141d72a38857fff26f4f70c0a36f21d1cc69623d946ba42f8b15fa994f222b1934cd16cc5b4e306cf5a8850295492dfb637f2a8fee8b774d7c1e4 |
35 |
-DIST systemd-233.tar.gz 4660737 BLAKE2B 38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e |
36 |
|
37 |
diff --git a/app-emulation/rkt/metadata.xml b/app-emulation/rkt/metadata.xml |
38 |
deleted file mode 100644 |
39 |
index d9f76835717..00000000000 |
40 |
--- a/app-emulation/rkt/metadata.xml |
41 |
+++ /dev/null |
42 |
@@ -1,32 +0,0 @@ |
43 |
-<?xml version="1.0" encoding="UTF-8"?> |
44 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
45 |
-<pkgmetadata> |
46 |
- <maintainer type="person"> |
47 |
- <email>zmedico@g.o</email> |
48 |
- <name>Zac Medico</name> |
49 |
- </maintainer> |
50 |
- <longdescription lang="en"> |
51 |
- rkt is the next-generation container manager for Linux clusters. |
52 |
- Designed for security, simplicity, and composability within modern |
53 |
- cluster architectures, rkt discovers, verifies, fetches, and executes |
54 |
- application containers with pluggable isolation. rkt can run the same |
55 |
- container with varying degrees of protection, from lightweight, |
56 |
- OS-level namespace and capabilities isolation to heavier, VM-level |
57 |
- hardware virtualization. |
58 |
- </longdescription> |
59 |
- <use> |
60 |
- <flag name="actool">Install the actool for ACI manipulation</flag> |
61 |
- <flag name="rkt_stage1_coreos">Download and use a prebuilt stage1.aci from CoreOS</flag> |
62 |
- <flag name="rkt_stage1_fly">Build stage1-fly.aci</flag> |
63 |
- <flag name="rkt_stage1_kvm" restrict="<app-emulation/rkt-1.15.0"> |
64 |
- This flag has been replaced by the rkt_stage1_kvm_* flags |
65 |
- </flag> |
66 |
- <flag name="rkt_stage1_kvm_lkvm">Build stage1-kvm-lkvm.aci</flag> |
67 |
- <flag name="rkt_stage1_kvm_qemu">Build stage1-kvm-qemu.aci</flag> |
68 |
- <flag name="rkt_stage1_src">Build the stage1.aci from source</flag> |
69 |
- <flag name="rkt_stage1_host">Assemble stage1.aci from host binaries</flag> |
70 |
- </use> |
71 |
- <upstream> |
72 |
- <remote-id type="github">coreos/rkt</remote-id> |
73 |
- </upstream> |
74 |
-</pkgmetadata> |
75 |
|
76 |
diff --git a/app-emulation/rkt/rkt-1.29.0.ebuild b/app-emulation/rkt/rkt-1.29.0.ebuild |
77 |
deleted file mode 100644 |
78 |
index 314f265ac19..00000000000 |
79 |
--- a/app-emulation/rkt/rkt-1.29.0.ebuild |
80 |
+++ /dev/null |
81 |
@@ -1,267 +0,0 @@ |
82 |
-# Copyright 1999-2017 Gentoo Foundation |
83 |
-# Distributed under the terms of the GNU General Public License v2 |
84 |
- |
85 |
-EAPI=6 |
86 |
- |
87 |
-inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user |
88 |
- |
89 |
-KEYWORDS="~amd64" |
90 |
- |
91 |
-PXE_VERSION="1478.0.0" |
92 |
-PXE_SYSTEMD_VERSION="v233" |
93 |
-KVM_LINUX_VERSION="4.9.2" |
94 |
-KVMTOOL_VERSION="cfae4d64482ed745214e3c62dd84b79c2ae0f325" |
95 |
-QEMU_VERSION="v2.8.0" |
96 |
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz" |
97 |
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img" |
98 |
- |
99 |
-SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz |
100 |
- ${PXE_URI} -> ${PXE_FILE} |
101 |
-" |
102 |
- |
103 |
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz |
104 |
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE ) |
105 |
-rkt_stage1_kvm_lkvm? ( |
106 |
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz |
107 |
- https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/patch/?id=c0a985531f49c06fd05069024f4664740e6a0baf -> kvmtool-include-sysmacros-c0a985531f49c06fd05069024f4664740e6a0baf.patch |
108 |
- https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/patch/?id=1cc05b24bfe0211bb408f3264af8e0c42dcdde9c -> kvmtool-include-asm-msr-index-1cc05b24bfe0211bb408f3264af8e0c42dcdde9c.patch |
109 |
- ${SRC_URI_KVM} |
110 |
-) |
111 |
-rkt_stage1_kvm_qemu? ( |
112 |
- http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2 |
113 |
- ${SRC_URI_KVM} |
114 |
-) |
115 |
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )" |
116 |
- |
117 |
-DESCRIPTION="rkt is an App Container runtime for Linux" |
118 |
-HOMEPAGE="https://github.com/coreos/rkt" |
119 |
- |
120 |
-LICENSE="Apache-2.0" |
121 |
-SLOT="0" |
122 |
-# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags |
123 |
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu rkt_stage1_src +actool systemd" |
124 |
-REQUIRED_USE="!systemd? ( !rkt_stage1_host ) || ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu rkt_stage1_src ) !rkt_stage1_kvm" |
125 |
- |
126 |
-# Some tests fail. |
127 |
-# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile |
128 |
-RESTRICT="test rkt_stage1_src? ( userpriv )" |
129 |
- |
130 |
-DEPEND=">=dev-lang/go-1.5 |
131 |
- app-arch/cpio |
132 |
- app-crypt/trousers |
133 |
- sys-fs/squashfs-tools |
134 |
- dev-perl/Capture-Tiny |
135 |
- rkt_stage1_src? ( >=sys-apps/util-linux-2.27 ) |
136 |
- rkt_stage1_kvm_qemu? ( |
137 |
- sys-apps/attr[static-libs(+)] |
138 |
- sys-libs/libcap[static-libs(+)] |
139 |
- sys-libs/zlib[static-libs(+)] |
140 |
- >=x11-libs/pixman-0.28.0[static-libs(+)] |
141 |
- )" |
142 |
- |
143 |
-RDEPEND="!app-emulation/rocket |
144 |
- rkt_stage1_host? ( systemd? ( |
145 |
- >=sys-apps/systemd-222 |
146 |
- app-shells/bash:0 |
147 |
- ) )" |
148 |
- |
149 |
-BUILDDIR="build-${P}" |
150 |
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci" |
151 |
- |
152 |
-pkg_setup() { |
153 |
- enewgroup rkt-admin |
154 |
- enewgroup rkt |
155 |
-} |
156 |
- |
157 |
-src_unpack() { |
158 |
- local dest x |
159 |
- for x in ${A}; do |
160 |
- case ${x} in |
161 |
- *.img|linux-*) continue ;; |
162 |
- kvmtool-include-*) #627564 #635274 |
163 |
- dest=${S}/stage1/usr_from_kvm/lkvm/patches |
164 |
- mkdir -p "${dest}" || die |
165 |
- cp "${DISTDIR}/${x}" "${dest}" || die |
166 |
- ;; |
167 |
- kvmtool-*) |
168 |
- mkdir kvmtool || die |
169 |
- pushd kvmtool >/dev/null || die |
170 |
- unpack ${x} |
171 |
- popd >/dev/null || die |
172 |
- ;; |
173 |
- *) |
174 |
- unpack ${x} |
175 |
- esac |
176 |
- done |
177 |
-} |
178 |
- |
179 |
-src_prepare() { |
180 |
- eapply_user |
181 |
- |
182 |
- # This patch breaks linux kernel cc-option checks when the |
183 |
- # compiler doesn't recognize the -no-pie option. |
184 |
- rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die |
185 |
- |
186 |
- # avoid sdjournal include for bug 595874 |
187 |
- if ! use systemd; then |
188 |
- sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \ |
189 |
- -i rkt/rkt.mk || die |
190 |
- fi |
191 |
- |
192 |
- sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die |
193 |
- |
194 |
- # disable git fetch of systemd |
195 |
- sed -e 's~^include makelib/git.mk$~'\ |
196 |
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\ |
197 |
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\ |
198 |
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\ |
199 |
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\ |
200 |
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\ |
201 |
-'else\n'\ |
202 |
-'\t\0\n'\ |
203 |
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die |
204 |
- |
205 |
- # disable git fetch of kvmtool |
206 |
- sed -e 's~^include makelib/git.mk$~'\ |
207 |
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\ |
208 |
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\ |
209 |
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\ |
210 |
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\ |
211 |
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\ |
212 |
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\ |
213 |
-'else\n'\ |
214 |
-'\t\0\n'\ |
215 |
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die |
216 |
- |
217 |
- # disable git fetch of qemu |
218 |
- sed -e 's~^include makelib/git.mk$~'\ |
219 |
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\ |
220 |
-'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\ |
221 |
-'get_qemu_sources: | $(QEMU_TMPDIR)\n'\ |
222 |
-'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\ |
223 |
-'$(QEMU_CONF_STAMP): get_qemu_sources\n\n'\ |
224 |
-'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\ |
225 |
-'else\n'\ |
226 |
-'\t\0\n'\ |
227 |
-'endif~' \ |
228 |
- -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \ |
229 |
- -i stage1/usr_from_kvm/qemu.mk || die |
230 |
- |
231 |
- # disable fetch of kernel sources |
232 |
- sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \ |
233 |
- -i stage1/usr_from_kvm/kernel.mk || die |
234 |
- |
235 |
- if use rkt_stage1_host; then |
236 |
- # Make systemdUnitsPath consistent with host |
237 |
- sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \ |
238 |
- -i stage1/init/init.go || die |
239 |
- fi |
240 |
- |
241 |
- if use rkt_stage1_kvm_qemu; then |
242 |
- sed '1i#include <sys/sysmacros.h>' -i "${WORKDIR}/qemu-${QEMU_VERSION#v}/hw/9pfs/9p.c" || die |
243 |
- fi |
244 |
- |
245 |
- eautoreconf |
246 |
-} |
247 |
- |
248 |
-src_configure() { |
249 |
- local flavors hypervisors myeconfargs=( |
250 |
- --with-stage1-default-images-directory="/usr/share/rkt" |
251 |
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}" |
252 |
- ) |
253 |
- |
254 |
- use systemd || myeconfargs+=( --enable-sdjournal=no ) |
255 |
- |
256 |
- # enable flavors (first is default) |
257 |
- use rkt_stage1_host && flavors+=",host" |
258 |
- use rkt_stage1_src && flavors+=",src" |
259 |
- use rkt_stage1_coreos && flavors+=",coreos" |
260 |
- use rkt_stage1_fly && flavors+=",fly" |
261 |
- { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm" |
262 |
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" ) |
263 |
- |
264 |
- if use rkt_stage1_src; then |
265 |
- myeconfargs+=( |
266 |
- --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION} |
267 |
- --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}" |
268 |
- ) |
269 |
- fi |
270 |
- |
271 |
- if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then |
272 |
- myeconfargs+=( |
273 |
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}" |
274 |
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}" |
275 |
- ) |
276 |
- fi |
277 |
- |
278 |
- if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then |
279 |
- use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm" |
280 |
- use rkt_stage1_kvm_qemu && hypervisors+=",qemu" |
281 |
- myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" ) |
282 |
- fi |
283 |
- |
284 |
- # Go's 6l linker does not support PIE, disable so cgo binaries |
285 |
- # which use 6l+gcc for linking can be built correctly. |
286 |
- if gcc-specs-pie; then |
287 |
- append-ldflags -nopie |
288 |
- fi |
289 |
- |
290 |
- export CC=$(tc-getCC) |
291 |
- export CGO_ENABLED=1 |
292 |
- export CGO_CFLAGS="${CFLAGS}" |
293 |
- export CGO_CPPFLAGS="${CPPFLAGS}" |
294 |
- export CGO_CXXFLAGS="${CXXFLAGS}" |
295 |
- export CGO_LDFLAGS="${LDFLAGS}" |
296 |
- export BUILDDIR |
297 |
- |
298 |
- econf "${myeconfargs[@]}" |
299 |
-} |
300 |
- |
301 |
-src_compile() { |
302 |
- local arch=${ARCH} |
303 |
- case ${arch} in |
304 |
- amd64) arch=x86_64;; |
305 |
- esac |
306 |
- ARCH=${arch} emake V=3 |
307 |
- ARCH=${arch} emake V=3 bash-completion |
308 |
-} |
309 |
- |
310 |
-src_install() { |
311 |
- dodoc README.md |
312 |
- use doc && dodoc -r Documentation |
313 |
- use examples && dodoc -r examples |
314 |
- use actool && dobin "${S}/${BUILDDIR}/tools/actool" |
315 |
- |
316 |
- dobin "${S}/${BUILDDIR}/target/bin/rkt" |
317 |
- |
318 |
- insinto /usr/share/rkt |
319 |
- doins "${S}/${BUILDDIR}/target/bin/"*.aci |
320 |
- |
321 |
- # create symlink for default stage1 image path |
322 |
- if use rkt_stage1_host; then |
323 |
- dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}" |
324 |
- elif use rkt_stage1_src; then |
325 |
- dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}" |
326 |
- elif use rkt_stage1_coreos; then |
327 |
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}" |
328 |
- elif use rkt_stage1_fly; then |
329 |
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}" |
330 |
- elif use rkt_stage1_kvm_lkvm; then |
331 |
- dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}" |
332 |
- elif use rkt_stage1_kvm_qemu; then |
333 |
- dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}" |
334 |
- fi |
335 |
- |
336 |
- systemd_dounit "${S}"/dist/init/systemd/*.service \ |
337 |
- "${S}"/dist/init/systemd/*.timer \ |
338 |
- "${S}"/dist/init/systemd/*.socket |
339 |
- |
340 |
- insinto /usr/lib/tmpfiles.d |
341 |
- doins "${S}"/dist/init/systemd/tmpfiles.d/* |
342 |
- |
343 |
- newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt |
344 |
- |
345 |
- keepdir /etc/${PN} |
346 |
- fowners :rkt-admin /etc/${PN} |
347 |
- fperms 2775 /etc/${PN} |
348 |
-} |
349 |
|
350 |
diff --git a/app-emulation/rkt/rkt-1.30.0.ebuild b/app-emulation/rkt/rkt-1.30.0.ebuild |
351 |
deleted file mode 100644 |
352 |
index b5ad9568d12..00000000000 |
353 |
--- a/app-emulation/rkt/rkt-1.30.0.ebuild |
354 |
+++ /dev/null |
355 |
@@ -1,254 +0,0 @@ |
356 |
-# Copyright 1999-2018 Gentoo Authors |
357 |
-# Distributed under the terms of the GNU General Public License v2 |
358 |
- |
359 |
-EAPI=6 |
360 |
- |
361 |
-inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user |
362 |
- |
363 |
-KEYWORDS="~amd64" |
364 |
- |
365 |
-PXE_VERSION="1478.0.0" |
366 |
-PXE_SYSTEMD_VERSION="v233" |
367 |
-KVM_LINUX_VERSION="4.9.2" |
368 |
-KVMTOOL_VERSION="cfae4d64482ed745214e3c62dd84b79c2ae0f325" |
369 |
-QEMU_VERSION="v2.8.0" |
370 |
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz" |
371 |
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img" |
372 |
- |
373 |
-SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz |
374 |
- ${PXE_URI} -> ${PXE_FILE} |
375 |
-" |
376 |
- |
377 |
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz |
378 |
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE ) |
379 |
-rkt_stage1_kvm_lkvm? ( |
380 |
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz |
381 |
- https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/patch/?id=c0a985531f49c06fd05069024f4664740e6a0baf -> kvmtool-include-sysmacros-c0a985531f49c06fd05069024f4664740e6a0baf.patch |
382 |
- https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/patch/?id=1cc05b24bfe0211bb408f3264af8e0c42dcdde9c -> kvmtool-include-asm-msr-index-1cc05b24bfe0211bb408f3264af8e0c42dcdde9c.patch |
383 |
- ${SRC_URI_KVM} |
384 |
-) |
385 |
-rkt_stage1_kvm_qemu? ( |
386 |
- http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2 |
387 |
- ${SRC_URI_KVM} |
388 |
-)" |
389 |
- |
390 |
-DESCRIPTION="rkt is an App Container runtime for Linux" |
391 |
-HOMEPAGE="https://github.com/coreos/rkt" |
392 |
- |
393 |
-LICENSE="Apache-2.0" |
394 |
-SLOT="0" |
395 |
-# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags |
396 |
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu +actool systemd" |
397 |
-REQUIRED_USE="!systemd? ( !rkt_stage1_host ) || ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu ) !rkt_stage1_kvm" |
398 |
- |
399 |
-# Some tests fail. |
400 |
-RESTRICT="test" |
401 |
- |
402 |
-DEPEND=">=dev-lang/go-1.5 |
403 |
- app-arch/cpio |
404 |
- app-crypt/trousers |
405 |
- sys-fs/squashfs-tools |
406 |
- dev-perl/Capture-Tiny |
407 |
- rkt_stage1_kvm_qemu? ( |
408 |
- sys-apps/attr[static-libs(+)] |
409 |
- sys-libs/libcap[static-libs(+)] |
410 |
- sys-libs/zlib[static-libs(+)] |
411 |
- >=x11-libs/pixman-0.28.0[static-libs(+)] |
412 |
- )" |
413 |
- |
414 |
-RDEPEND="!app-emulation/rocket |
415 |
- rkt_stage1_host? ( systemd? ( |
416 |
- >=sys-apps/systemd-222 |
417 |
- app-shells/bash:0 |
418 |
- ) )" |
419 |
- |
420 |
-BUILDDIR="build-${P}" |
421 |
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci" |
422 |
- |
423 |
-pkg_setup() { |
424 |
- enewgroup rkt-admin |
425 |
- enewgroup rkt |
426 |
-} |
427 |
- |
428 |
-src_unpack() { |
429 |
- local dest x |
430 |
- for x in ${A}; do |
431 |
- case ${x} in |
432 |
- *.img|linux-*) continue ;; |
433 |
- kvmtool-include-*) #627564 #635274 |
434 |
- dest=${S}/stage1/usr_from_kvm/lkvm/patches |
435 |
- mkdir -p "${dest}" || die |
436 |
- cp "${DISTDIR}/${x}" "${dest}" || die |
437 |
- ;; |
438 |
- kvmtool-*) |
439 |
- mkdir kvmtool || die |
440 |
- pushd kvmtool >/dev/null || die |
441 |
- unpack ${x} |
442 |
- popd >/dev/null || die |
443 |
- ;; |
444 |
- *) |
445 |
- unpack ${x} |
446 |
- esac |
447 |
- done |
448 |
-} |
449 |
- |
450 |
-src_prepare() { |
451 |
- eapply_user |
452 |
- |
453 |
- # This patch breaks linux kernel cc-option checks when the |
454 |
- # compiler doesn't recognize the -no-pie option. |
455 |
- rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die |
456 |
- |
457 |
- # avoid sdjournal include for bug 595874 |
458 |
- if ! use systemd; then |
459 |
- sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \ |
460 |
- -i rkt/rkt.mk || die |
461 |
- fi |
462 |
- |
463 |
- sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die |
464 |
- |
465 |
- # disable git fetch of systemd |
466 |
- sed -e 's~^include makelib/git.mk$~'\ |
467 |
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\ |
468 |
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\ |
469 |
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\ |
470 |
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\ |
471 |
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\ |
472 |
-'else\n'\ |
473 |
-'\t\0\n'\ |
474 |
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die |
475 |
- |
476 |
- # disable git fetch of kvmtool |
477 |
- sed -e 's~^include makelib/git.mk$~'\ |
478 |
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\ |
479 |
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\ |
480 |
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\ |
481 |
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\ |
482 |
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\ |
483 |
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\ |
484 |
-'else\n'\ |
485 |
-'\t\0\n'\ |
486 |
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die |
487 |
- |
488 |
- # disable git fetch of qemu |
489 |
- sed -e 's~^include makelib/git.mk$~'\ |
490 |
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\ |
491 |
-'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\ |
492 |
-'get_qemu_sources: | $(QEMU_TMPDIR)\n'\ |
493 |
-'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\ |
494 |
-'$(QEMU_CONF_STAMP): get_qemu_sources\n\n'\ |
495 |
-'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\ |
496 |
-'else\n'\ |
497 |
-'\t\0\n'\ |
498 |
-'endif~' \ |
499 |
- -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \ |
500 |
- -i stage1/usr_from_kvm/qemu.mk || die |
501 |
- |
502 |
- # disable fetch of kernel sources |
503 |
- sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \ |
504 |
- -i stage1/usr_from_kvm/kernel.mk || die |
505 |
- |
506 |
- if use rkt_stage1_host; then |
507 |
- # Make systemdUnitsPath consistent with host |
508 |
- sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \ |
509 |
- -i stage1/init/init.go || die |
510 |
- fi |
511 |
- |
512 |
- if use rkt_stage1_kvm_qemu; then |
513 |
- sed '1i#include <sys/sysmacros.h>' -i "${WORKDIR}/qemu-${QEMU_VERSION#v}/hw/9pfs/9p.c" || die |
514 |
- fi |
515 |
- |
516 |
- eautoreconf |
517 |
-} |
518 |
- |
519 |
-src_configure() { |
520 |
- local flavors hypervisors myeconfargs=( |
521 |
- --with-stage1-default-images-directory="/usr/share/rkt" |
522 |
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}" |
523 |
- ) |
524 |
- |
525 |
- use systemd || myeconfargs+=( --enable-sdjournal=no ) |
526 |
- |
527 |
- # enable flavors (first is default) |
528 |
- use rkt_stage1_host && flavors+=",host" |
529 |
- use rkt_stage1_coreos && flavors+=",coreos" |
530 |
- use rkt_stage1_fly && flavors+=",fly" |
531 |
- { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm" |
532 |
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" ) |
533 |
- |
534 |
- if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then |
535 |
- myeconfargs+=( |
536 |
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}" |
537 |
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}" |
538 |
- ) |
539 |
- fi |
540 |
- |
541 |
- if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then |
542 |
- use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm" |
543 |
- use rkt_stage1_kvm_qemu && hypervisors+=",qemu" |
544 |
- myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" ) |
545 |
- fi |
546 |
- |
547 |
- # Go's 6l linker does not support PIE, disable so cgo binaries |
548 |
- # which use 6l+gcc for linking can be built correctly. |
549 |
- if gcc-specs-pie; then |
550 |
- append-ldflags -nopie |
551 |
- fi |
552 |
- |
553 |
- export CC=$(tc-getCC) |
554 |
- export CGO_ENABLED=1 |
555 |
- export CGO_CFLAGS="${CFLAGS}" |
556 |
- export CGO_CPPFLAGS="${CPPFLAGS}" |
557 |
- export CGO_CXXFLAGS="${CXXFLAGS}" |
558 |
- export CGO_LDFLAGS="${LDFLAGS}" |
559 |
- export BUILDDIR |
560 |
- |
561 |
- econf "${myeconfargs[@]}" |
562 |
-} |
563 |
- |
564 |
-src_compile() { |
565 |
- local arch=${ARCH} |
566 |
- case ${arch} in |
567 |
- amd64) arch=x86_64;; |
568 |
- esac |
569 |
- ARCH=${arch} emake V=3 |
570 |
- ARCH=${arch} emake V=3 bash-completion |
571 |
-} |
572 |
- |
573 |
-src_install() { |
574 |
- dodoc README.md |
575 |
- use doc && dodoc -r Documentation |
576 |
- use examples && dodoc -r examples |
577 |
- use actool && dobin "${S}/${BUILDDIR}/tools/actool" |
578 |
- |
579 |
- dobin "${S}/${BUILDDIR}/target/bin/rkt" |
580 |
- |
581 |
- insinto /usr/share/rkt |
582 |
- doins "${S}/${BUILDDIR}/target/bin/"*.aci |
583 |
- |
584 |
- # create symlink for default stage1 image path |
585 |
- if use rkt_stage1_host; then |
586 |
- dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}" |
587 |
- elif use rkt_stage1_coreos; then |
588 |
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}" |
589 |
- elif use rkt_stage1_fly; then |
590 |
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}" |
591 |
- elif use rkt_stage1_kvm_lkvm; then |
592 |
- dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}" |
593 |
- elif use rkt_stage1_kvm_qemu; then |
594 |
- dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}" |
595 |
- fi |
596 |
- |
597 |
- systemd_dounit "${S}"/dist/init/systemd/*.service \ |
598 |
- "${S}"/dist/init/systemd/*.timer \ |
599 |
- "${S}"/dist/init/systemd/*.socket |
600 |
- |
601 |
- insinto /usr/lib/tmpfiles.d |
602 |
- doins "${S}"/dist/init/systemd/tmpfiles.d/* |
603 |
- |
604 |
- newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt |
605 |
- |
606 |
- keepdir /etc/${PN} |
607 |
- fowners :rkt-admin /etc/${PN} |
608 |
- fperms 2775 /etc/${PN} |
609 |
-} |
610 |
|
611 |
diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask |
612 |
index 4861b78c15c..508d530d08a 100644 |
613 |
--- a/profiles/features/selinux/package.use.mask |
614 |
+++ b/profiles/features/selinux/package.use.mask |
615 |
@@ -31,7 +31,3 @@ x11-misc/gpaste gnome |
616 |
x11-terms/gnome-terminal gnome-shell |
617 |
x11-themes/zukitwo gnome-shell |
618 |
net-wireless/bluez user-session |
619 |
- |
620 |
-# Alex Brandt <alunduil@g.o> (2015-09-06) |
621 |
-# app-emulation/rkt[rkt_stage1_src] requires systemd which isn't available with selinux. |
622 |
-app-emulation/rkt rkt_stage1_src |
623 |
|
624 |
diff --git a/profiles/package.mask b/profiles/package.mask |
625 |
index 0727bdff2b2..7b6d3a2f0d6 100644 |
626 |
--- a/profiles/package.mask |
627 |
+++ b/profiles/package.mask |
628 |
@@ -459,11 +459,6 @@ dev-tex/quotchap |
629 |
# Depends on >=virtual/{jdk,jre}-11 which is masked |
630 |
=www-servers/tomcat-9.0.21 |
631 |
|
632 |
-# Zac Medico <zmedico@g.o> (2019-05-31) |
633 |
-# Upstream is dead and there are multiple security vulnerabilities. |
634 |
-# Removal in 30 days. Bug #687100. |
635 |
-app-emulation/rkt |
636 |
- |
637 |
# Patrick Lauer <patrick@g.o> (2019-05-23) |
638 |
# PostgreSQL beta and release candidate releases are pre-release testing |
639 |
# versions, not meant for production use. They are feature-frozen, and are |