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