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