Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
Date: Tue, 31 Jan 2017 21:58:47
Message-Id: 1485899920.e69a2cfda7bcc849d53cbb335c282ae94e2851b4.zmedico@gentoo
1 commit: e69a2cfda7bcc849d53cbb335c282ae94e2851b4
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 31 21:57:08 2017 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 31 21:58:40 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e69a2cfd
7
8 app-emulation/rkt: version bump to 1.23.0
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 app-emulation/rkt/Manifest | 2 +
13 app-emulation/rkt/rkt-1.23.0.ebuild | 257 ++++++++++++++++++++++++++++++++++++
14 2 files changed, 259 insertions(+)
15
16 diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
17 index 00cd107..8ee84d0 100644
18 --- a/app-emulation/rkt/Manifest
19 +++ b/app-emulation/rkt/Manifest
20 @@ -1,7 +1,9 @@
21 DIST kvmtool-1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2.tar.gz 244571 SHA256 c72c0e3463a8f0cfe2cdaa8b8e7951f4eb7293c486e44f84b9e421073dbf5ab9 SHA512 13db2bf2ff794f34c2a825c9b1862c85b0f470c81e3d91177979302f921e3970b8dfaeaf54602005fba8903bba52e43b6e8d67edaa0ee8de82002db7b396c3a0 WHIRLPOOL 0904a5783ac27befb207a5fa0030baede68ae589b69abf012ec733ff2e6d9f77b7198273c22fa7404b2c78bcc9ae40abc39d002519700666ba1e54c6550525b2
22 DIST linux-4.8.6.tar.xz 91969848 SHA256 74744e00420856cfc8049fa3b3a55e57a116994226a498ef56801bc9492df36b SHA512 235acc394ce347d4131e86f6ff3f3fa9d552bf227c2483c25da7de99f3dc8fd20c4a04db0c8d59cdfa4fa9d98a5b102a5734f7b7704df6648c6efa5e8a7515ea WHIRLPOOL cb27d5654f7351ff32d057501c594f9b6e15fefe78c588b9e9cfedd88fbdb807ba7cfc1e238444d94f3d46168d6edc1bbb8e3966c2ca0f46c668dd4e9d60a01f
23 +DIST linux-4.9.2.tar.xz 93189108 SHA256 8dda9aedd17ae0bf1e06ebb4b79082f83fb3ade45cbcc3ca4c30bf3faf085738 SHA512 85adf3715cba4a457efea8359ebed34413ac63ee58fe920c5713501dec1e727e167416e9d67a9e2d9430aa9f3a53ad0ac26a4f749984bc5a3f3c37ac504f75de WHIRLPOOL 74df775ab092a6be6684243d4c0d557c0ce27907c7e8ed97be54a45901e8f507deab1d5e72c35092884836f3fe446f838342ec0b53a3aa1c884489caadaf6a62
24 DIST qemu-2.7.0.tar.bz2 26867760 SHA256 326e739506ba690daf69fc17bd3913a6c313d9928d743bd8eddb82f403f81e53 SHA512 654acaa7b3724a288e5d7e2a26ab780d9c9ed9f647fba00a906cbaffbe9d58fd666f2d962514aa2c5b391b4c53811ac3170d2eb51727f090bd19dfe45ca9a9db WHIRLPOOL dcb3e5f7da89dd8e14d636d7ebd476e076e0043880bb9ea3fb1c03cb4bcd4e5c7d3c4719da26c3ce521e3a3db5ae671e86f198ac1bc3474e774d75504fef8b8d
25 DIST rkt-1.21.0.tar.gz 3334473 SHA256 63eed8da954c24c1f9010e7513ee6ac21ffeaf63a648f9d5a0f9e9d3eb92fde5 SHA512 2723aab1aadbe7be0f7ce9c7f4e000c76d8c34d167b1157a08de7fb2248e4b73a7fc765ead557db495bab803f5d5c8d09e1d9441301396e18fa49b21a8c4c7ae WHIRLPOOL 11b28be68dd246ddafb5455becc64ea1b185d1128747dc51103ab692c34cd9157423164c4847be9e9a39338cb5ad6e2db3e588545378179b51a0ce58a1be1935
26 DIST rkt-1.22.0.tar.gz 3338862 SHA256 49fda935e0ec628889b0c6ba22277354dbf9b89b4c09429c10800a562bbf1b7c SHA512 2aa6c15a0994e1ba427b05694f6fa12446e2f336ff51593fc6d4776f77d0b798203a0ab97f4c12ada1226c934b4e1866d9a5545f48ae1938e79d696d236ad8c7 WHIRLPOOL 98c8761e47379a02b536b760f327dc65dabd3594d30fdc792326044fc0e825401cc49abf0b5ab6ce6d4bc6072f0008466da4f3d2a12cdad16908e8549c0fa88e
27 +DIST rkt-1.23.0.tar.gz 3350060 SHA256 5cb10a0646e5cc8dccbd099c40bc6b11264591b30fa8e4113bc9e392feffcb2b SHA512 9673f70b385a4e5c61c037783071507e69097f0d0163b3d449ca129bcdc858bc177d38c6551dc9f8b2f074345b4698863bbe62bf4d6c83f5df515406011ddce3 WHIRLPOOL 7d2e7b20205e6e00992091bd3898094b27e75f9e4716c73a0a31df2747cb77c49b11678db478ed7414cf12eef8c3463afded0e2d2a0b93effb9cce0edbed799a
28 DIST rkt-pxe-1235.0.0.img 243713684 SHA256 988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315 SHA512 b19821c63b7b53a1aad3b6e279189f9ceed1f5db1a691d12a70eb7340cceb4c3fd4f7f61a913d9482aec5ce28740b9ee777f86a1ce54f597f50341d701372542 WHIRLPOOL f3905ce3a2a55a027197a2d11ca541323fdfd560d186b4a2c39a8f45e19811067d5de4fbd3656935b12787e1dec79d118d7a01d52a8ef7abd0dad4f38a222b1c
29 DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
30
31 diff --git a/app-emulation/rkt/rkt-1.23.0.ebuild b/app-emulation/rkt/rkt-1.23.0.ebuild
32 new file mode 100644
33 index 00000000..6cb2d50
34 --- /dev/null
35 +++ b/app-emulation/rkt/rkt-1.23.0.ebuild
36 @@ -0,0 +1,257 @@
37 +# Copyright 1999-2017 Gentoo Foundation
38 +# Distributed under the terms of the GNU General Public License v2
39 +# $Id$
40 +
41 +EAPI=6
42 +
43 +inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
44 +
45 +KEYWORDS="~amd64"
46 +
47 +PXE_VERSION="1235.0.0"
48 +PXE_SYSTEMD_VERSION="v231"
49 +KVM_LINUX_VERSION="4.9.2"
50 +KVMTOOL_VERSION="1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2"
51 +QEMU_VERSION="v2.7.0"
52 +PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
53 +PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
54 +
55 +SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
56 + ${PXE_URI} -> ${PXE_FILE}
57 +"
58 +
59 +SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
60 +rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
61 +rkt_stage1_kvm_lkvm? (
62 + https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
63 + ${SRC_URI_KVM}
64 +)
65 +rkt_stage1_kvm_qemu? (
66 + http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
67 + ${SRC_URI_KVM}
68 +)
69 +rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
70 +
71 +DESCRIPTION="rkt is an App Container runtime for Linux"
72 +HOMEPAGE="https://github.com/coreos/rkt"
73 +
74 +LICENSE="Apache-2.0"
75 +SLOT="0"
76 +# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
77 +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"
78 +REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm"
79 +
80 +# Some tests fail.
81 +# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
82 +RESTRICT="test rkt_stage1_src? ( userpriv )"
83 +
84 +DEPEND=">=dev-lang/go-1.5
85 + app-arch/cpio
86 + app-crypt/trousers
87 + sys-fs/squashfs-tools
88 + dev-perl/Capture-Tiny
89 + rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
90 + rkt_stage1_kvm_qemu? (
91 + sys-apps/attr[static-libs(+)]
92 + sys-libs/libcap[static-libs(+)]
93 + sys-libs/zlib[static-libs(+)]
94 + >=x11-libs/pixman-0.28.0[static-libs(+)]
95 + )"
96 +
97 +RDEPEND="!app-emulation/rocket
98 + rkt_stage1_host? ( systemd? (
99 + >=sys-apps/systemd-222
100 + app-shells/bash:0
101 + ) )"
102 +
103 +BUILDDIR="build-${P}"
104 +STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
105 +
106 +pkg_setup() {
107 + enewgroup rkt-admin
108 + enewgroup rkt
109 +}
110 +
111 +src_unpack() {
112 + local x
113 + for x in ${A}; do
114 + case ${x} in
115 + *.img|linux-*) continue ;;
116 + kvmtool-*)
117 + mkdir kvmtool || die
118 + pushd kvmtool >/dev/null || die
119 + unpack ${x}
120 + popd >/dev/null || die
121 + ;;
122 + *)
123 + unpack ${x}
124 + esac
125 + done
126 +}
127 +
128 +src_prepare() {
129 + eapply_user
130 +
131 + # This patch breaks linux kernel cc-option checks when the
132 + # compiler doesn't recognize the -no-pie option.
133 + rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
134 +
135 + # avoid sdjournal include for bug 595874
136 + if ! use systemd; then
137 + sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
138 + -i rkt/rkt.mk || die
139 + fi
140 +
141 + sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
142 +
143 + # disable git fetch of systemd
144 + sed -e 's~^include makelib/git.mk$~'\
145 +'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
146 +'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
147 +'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
148 +'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
149 +'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
150 +'else\n'\
151 +'\t\0\n'\
152 +'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
153 +
154 + # disable git fetch of kvmtool
155 + sed -e 's~^include makelib/git.mk$~'\
156 +'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
157 +'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
158 +'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
159 +'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
160 +'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
161 +'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
162 +'else\n'\
163 +'\t\0\n'\
164 +'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
165 +
166 + # disable git fetch of qemu
167 + sed -e 's~^include makelib/git.mk$~'\
168 +'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
169 +'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
170 +'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
171 +'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
172 +'$(QEMU_CONF_STAMP): get_qemu_sources\n\n'\
173 +'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
174 +'else\n'\
175 +'\t\0\n'\
176 +'endif~' \
177 + -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
178 + -i stage1/usr_from_kvm/qemu.mk || die
179 +
180 + # disable fetch of kernel sources
181 + sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
182 + -i stage1/usr_from_kvm/kernel.mk || die
183 +
184 + if use rkt_stage1_host; then
185 + # Make systemdUnitsPath consistent with host
186 + sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
187 + -i stage1/init/init.go || die
188 + fi
189 +
190 + eautoreconf
191 +}
192 +
193 +src_configure() {
194 + local flavors hypervisors myeconfargs=(
195 + --with-stage1-default-images-directory="/usr/share/rkt"
196 + --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
197 + )
198 +
199 + use systemd || myeconfargs+=( --enable-sdjournal=no )
200 +
201 + # enable flavors (first is default)
202 + use rkt_stage1_host && flavors+=",host"
203 + use rkt_stage1_src && flavors+=",src"
204 + use rkt_stage1_coreos && flavors+=",coreos"
205 + use rkt_stage1_fly && flavors+=",fly"
206 + { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
207 + myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
208 +
209 + if use rkt_stage1_src; then
210 + myeconfargs+=(
211 + --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
212 + --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
213 + )
214 + fi
215 +
216 + if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
217 + myeconfargs+=(
218 + --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
219 + --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
220 + )
221 + fi
222 +
223 + if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
224 + use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
225 + use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
226 + myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
227 + fi
228 +
229 + # Go's 6l linker does not support PIE, disable so cgo binaries
230 + # which use 6l+gcc for linking can be built correctly.
231 + if gcc-specs-pie; then
232 + append-ldflags -nopie
233 + fi
234 +
235 + export CC=$(tc-getCC)
236 + export CGO_ENABLED=1
237 + export CGO_CFLAGS="${CFLAGS}"
238 + export CGO_CPPFLAGS="${CPPFLAGS}"
239 + export CGO_CXXFLAGS="${CXXFLAGS}"
240 + export CGO_LDFLAGS="${LDFLAGS}"
241 + export BUILDDIR
242 +
243 + econf "${myeconfargs[@]}"
244 +}
245 +
246 +src_compile() {
247 + local arch=${ARCH}
248 + case ${arch} in
249 + amd64) arch=x86_64;;
250 + esac
251 + ARCH=${arch} emake V=3
252 + ARCH=${arch} emake V=3 bash-completion
253 +}
254 +
255 +src_install() {
256 + dodoc README.md
257 + use doc && dodoc -r Documentation
258 + use examples && dodoc -r examples
259 + use actool && dobin "${S}/${BUILDDIR}/tools/actool"
260 +
261 + dobin "${S}/${BUILDDIR}/target/bin/rkt"
262 +
263 + insinto /usr/share/rkt
264 + doins "${S}/${BUILDDIR}/target/bin/"*.aci
265 +
266 + # create symlink for default stage1 image path
267 + if use rkt_stage1_host; then
268 + dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
269 + elif use rkt_stage1_src; then
270 + dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
271 + elif use rkt_stage1_coreos; then
272 + dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
273 + elif use rkt_stage1_fly; then
274 + dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
275 + elif use rkt_stage1_kvm_lkvm; then
276 + dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
277 + elif use rkt_stage1_kvm_qemu; then
278 + dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
279 + fi
280 +
281 + systemd_dounit "${S}"/dist/init/systemd/*.service \
282 + "${S}"/dist/init/systemd/*.timer \
283 + "${S}"/dist/init/systemd/*.socket
284 +
285 + insinto /usr/lib/tmpfiles.d
286 + doins "${S}"/dist/init/systemd/tmpfiles.d/*
287 +
288 + newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
289 +
290 + keepdir /etc/${PN}
291 + fowners :rkt-admin /etc/${PN}
292 + fperms 2775 /etc/${PN}
293 +}