| 1 |
commit: 8d0192974ecc2dc4cf7b9a02956b62219de3e2ed |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 7 17:03:29 2016 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 7 17:04:04 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d019297 |
| 7 |
|
| 8 |
app-emulation/rkt: version bump to 1.14.0 |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
app-emulation/rkt/Manifest | 3 + |
| 13 |
app-emulation/rkt/rkt-1.14.0.ebuild | 201 ++++++++++++++++++++++++++++++++++++ |
| 14 |
2 files changed, 204 insertions(+) |
| 15 |
|
| 16 |
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest |
| 17 |
index 02e38e5..965fe9d 100644 |
| 18 |
--- a/app-emulation/rkt/Manifest |
| 19 |
+++ b/app-emulation/rkt/Manifest |
| 20 |
@@ -2,5 +2,8 @@ DIST kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz 243930 SHA256 89f4c |
| 21 |
DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5 |
| 22 |
DIST rkt-1.11.0.tar.gz 2767797 SHA256 cd75f1648ae6736da731c14a2102646ee90467efd6d2a32b518fd36b8c9806c5 SHA512 dfc604b50037a5a272e0fe0f438c35e1a010489ee19a426cbad7184a3910a214f4bf659b533f323a2ab742deffe7bba10daee52691ff32e5a35f453b2b0c4bb0 WHIRLPOOL 4caa6be6f5f8c5aeb67c762a2643ffc8579d45f49b5c5e4cb5c16ce5e38cc4db35e9dee7d5df20ef80bf75d64e3cccbcc1521c4ddab18441652d2d383a17368b |
| 23 |
DIST rkt-1.12.0.tar.gz 2828173 SHA256 310bbadc5128574e0ecbe83f5bd6d7680d5a7c1d43c538888b025743d2667195 SHA512 b472887f232fe386c96f91a2a4f4c0125dba0d40db1468e21bea744699ecaaf31af47e2e23f3cb7c686f05f5aabb984de04c86a7e5bbbd9284769d149259c25f WHIRLPOOL b6f143cc0c3f8fb86f35b0a728e7ebf8fc49da0d58ed1caa4179b5a496cd5c20cb20e412d3895713b0e0d79e9ac773a5e882a186047b3de904ab8232a85d9442 |
| 24 |
+DIST rkt-1.14.0.tar.gz 2947502 SHA256 2458783023c561358c59600accb58ccfe335535931a58da988d70893a1c5a5e7 SHA512 4e082f0293047d133b031b6fd95e34fc86b7b2ca133ea56709cded5cd0c454e56bb5dd7209bc7add56812142495430c457d9094a8cda1c0079085822ff6e1c94 WHIRLPOOL 09837fc509cce2609bd87ae1185ce6c1e85e13888ab8106aab1725e8e3232486330e4152db8deb77dbc2c419d176a8f1c6df6d44d9a2808aefd62e58082a0353 |
| 25 |
DIST rkt-pxe-1097.0.0.img 240454650 SHA256 aa205919c4c733cf4cb7220f038f272f4b3ce6a185e5195945fdc625f506f737 SHA512 7a3cc62b5ae13ed8813effdea6125472982c81fa1fb35df0ac13a233ee352e67167a38cd82a802c0e8da50b2cf4455771441ad5ada186b3e3f2cdade4b1903c7 WHIRLPOOL 067eba2c1ebc546df506a249c0c49ab2ce556869f9455b6b1706e2285111293a4beed0172036df372e7b2e02449d815fb76c361219badcebe3240686be7bcc4c |
| 26 |
+DIST rkt-pxe-1151.0.0.img 243335216 SHA256 6f08697bea372af916a150f9846110e8855305653e5582b2c2ea04f14253e5c8 SHA512 fe7c4ec8cb4d11ba704b9f78c43557a374fda70dbfd7c3f4f9e768cf5ae365aab7a1fee8d51e19bbad6809ad4cdfe4eed60e5cdb6babd869a3a91b503b7256e8 WHIRLPOOL 92f8a65a9c50c11fa9c56acee53dd5623dd186664f44c6517bac4ee5be6a9dd2a9141ef522d978cc5b282c6638e17bf7b3559d68d6ea6c0752821799c0c88a5c |
| 27 |
DIST systemd-229.tar.gz 4319173 SHA256 b51b0a48d1beb388d95bd6a98d62be05490335d4bb388aefecdcb576e91e0741 SHA512 d692c0c9fc82f2fce64a5ec1caa4a0f8cf9edaeb1bdaaa1c462669db8f78b3dd6b33c87ef926ff21823582d0460f7b63aa3755792f9ae2cd6fb813ba08a35c39 WHIRLPOOL aa44f7161d80cc680226f19755579ba72c52cfe7bd671aefb09c414981f3a5a5c852f07d3449ac6f96d4ca91120cfb1464225d995b1637f1e2c108baf3c4a392 |
| 28 |
+DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1 |
| 29 |
|
| 30 |
diff --git a/app-emulation/rkt/rkt-1.14.0.ebuild b/app-emulation/rkt/rkt-1.14.0.ebuild |
| 31 |
new file mode 100644 |
| 32 |
index 00000000..858c15b |
| 33 |
--- /dev/null |
| 34 |
+++ b/app-emulation/rkt/rkt-1.14.0.ebuild |
| 35 |
@@ -0,0 +1,201 @@ |
| 36 |
+# Copyright 1999-2016 Gentoo Foundation |
| 37 |
+# Distributed under the terms of the GNU General Public License v2 |
| 38 |
+# $Id$ |
| 39 |
+ |
| 40 |
+EAPI=6 |
| 41 |
+ |
| 42 |
+inherit autotools flag-o-matic systemd toolchain-funcs user |
| 43 |
+ |
| 44 |
+KEYWORDS="~amd64" |
| 45 |
+ |
| 46 |
+PXE_VERSION="1151.0.0" |
| 47 |
+PXE_SYSTEMD_VERSION="v231" |
| 48 |
+KVM_LINUX_VERSION="4.3.1" |
| 49 |
+KVMTOOL_VERSION="d62653e177597251c24494a6dda60acd6d846671" |
| 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="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz |
| 54 |
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE ) |
| 55 |
+rkt_stage1_kvm? ( |
| 56 |
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz |
| 57 |
+ mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz |
| 58 |
+ ${PXE_URI} -> ${PXE_FILE} |
| 59 |
+) |
| 60 |
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )" |
| 61 |
+ |
| 62 |
+DESCRIPTION="rkt is an App Container runtime for Linux" |
| 63 |
+HOMEPAGE="https://github.com/coreos/rkt" |
| 64 |
+ |
| 65 |
+LICENSE="Apache-2.0" |
| 66 |
+SLOT="0" |
| 67 |
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd" |
| 68 |
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )" |
| 69 |
+ |
| 70 |
+DEPEND=">=dev-lang/go-1.5 |
| 71 |
+ app-arch/cpio |
| 72 |
+ app-crypt/trousers |
| 73 |
+ sys-fs/squashfs-tools |
| 74 |
+ dev-perl/Capture-Tiny |
| 75 |
+ rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )" |
| 76 |
+ |
| 77 |
+RDEPEND="!app-emulation/rocket |
| 78 |
+ rkt_stage1_host? ( systemd? ( |
| 79 |
+ >=sys-apps/systemd-222 |
| 80 |
+ app-shells/bash:0 |
| 81 |
+ ) )" |
| 82 |
+ |
| 83 |
+BUILDDIR="build-${P}" |
| 84 |
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci" |
| 85 |
+ |
| 86 |
+pkg_setup() { |
| 87 |
+ enewgroup rkt-admin |
| 88 |
+ enewgroup rkt |
| 89 |
+} |
| 90 |
+ |
| 91 |
+src_unpack() { |
| 92 |
+ local x |
| 93 |
+ for x in ${A}; do |
| 94 |
+ case ${x} in |
| 95 |
+ *.img|linux-*) continue ;; |
| 96 |
+ kvmtool-*) |
| 97 |
+ mkdir kvmtool || die |
| 98 |
+ pushd kvmtool >/dev/null || die |
| 99 |
+ unpack ${x} |
| 100 |
+ popd >/dev/null || die |
| 101 |
+ ;; |
| 102 |
+ *) |
| 103 |
+ unpack ${x} |
| 104 |
+ esac |
| 105 |
+ done |
| 106 |
+} |
| 107 |
+ |
| 108 |
+src_prepare() { |
| 109 |
+ eapply_user |
| 110 |
+ |
| 111 |
+ sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die |
| 112 |
+ |
| 113 |
+ # disable git fetch of systemd |
| 114 |
+ sed -e 's~^include makelib/git.mk$~'\ |
| 115 |
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\ |
| 116 |
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\ |
| 117 |
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\ |
| 118 |
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\ |
| 119 |
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\ |
| 120 |
+'else\n'\ |
| 121 |
+'\t\0\n'\ |
| 122 |
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die |
| 123 |
+ |
| 124 |
+ # disable git fetch of kvmtool |
| 125 |
+ sed -e 's~^include makelib/git.mk$~'\ |
| 126 |
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\ |
| 127 |
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\ |
| 128 |
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\ |
| 129 |
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\ |
| 130 |
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\ |
| 131 |
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\ |
| 132 |
+'else\n'\ |
| 133 |
+'\t\0\n'\ |
| 134 |
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die |
| 135 |
+ |
| 136 |
+ # disable fetch of kernel sources |
| 137 |
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \ |
| 138 |
+ -i stage1/usr_from_kvm/kernel.mk || die |
| 139 |
+ |
| 140 |
+ if use rkt_stage1_host; then |
| 141 |
+ # Make systemdUnitsPath consistent with host |
| 142 |
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \ |
| 143 |
+ -i stage1/init/init.go || die |
| 144 |
+ fi |
| 145 |
+ |
| 146 |
+ eautoreconf |
| 147 |
+} |
| 148 |
+ |
| 149 |
+src_configure() { |
| 150 |
+ local flavors myeconfargs=( |
| 151 |
+ --with-stage1-default-images-directory="/usr/share/rkt" |
| 152 |
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}" |
| 153 |
+ ) |
| 154 |
+ |
| 155 |
+ use systemd || myeconfargs+=( --enable-sdjournal=no ) |
| 156 |
+ |
| 157 |
+ # enable flavors (first is default) |
| 158 |
+ use rkt_stage1_host && flavors+=",host" |
| 159 |
+ use rkt_stage1_src && flavors+=",src" |
| 160 |
+ use rkt_stage1_coreos && flavors+=",coreos" |
| 161 |
+ use rkt_stage1_fly && flavors+=",fly" |
| 162 |
+ use rkt_stage1_kvm && flavors+=",kvm" |
| 163 |
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" ) |
| 164 |
+ |
| 165 |
+ if use rkt_stage1_src; then |
| 166 |
+ myeconfargs+=( |
| 167 |
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION} |
| 168 |
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}" |
| 169 |
+ ) |
| 170 |
+ fi |
| 171 |
+ |
| 172 |
+ if use rkt_stage1_coreos || use rkt_stage1_kvm; then |
| 173 |
+ myeconfargs+=( |
| 174 |
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}" |
| 175 |
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}" |
| 176 |
+ ) |
| 177 |
+ fi |
| 178 |
+ |
| 179 |
+ # Go's 6l linker does not support PIE, disable so cgo binaries |
| 180 |
+ # which use 6l+gcc for linking can be built correctly. |
| 181 |
+ if gcc-specs-pie; then |
| 182 |
+ append-ldflags -nopie |
| 183 |
+ fi |
| 184 |
+ |
| 185 |
+ export CC=$(tc-getCC) |
| 186 |
+ export CGO_ENABLED=1 |
| 187 |
+ export CGO_CFLAGS="${CFLAGS}" |
| 188 |
+ export CGO_CPPFLAGS="${CPPFLAGS}" |
| 189 |
+ export CGO_CXXFLAGS="${CXXFLAGS}" |
| 190 |
+ export CGO_LDFLAGS="${LDFLAGS}" |
| 191 |
+ export BUILDDIR |
| 192 |
+ |
| 193 |
+ econf "${myeconfargs[@]}" |
| 194 |
+} |
| 195 |
+ |
| 196 |
+src_compile() { |
| 197 |
+ local arch=${ARCH} |
| 198 |
+ case ${arch} in |
| 199 |
+ amd64) arch=x86_64;; |
| 200 |
+ esac |
| 201 |
+ ARCH=${arch} emake |
| 202 |
+} |
| 203 |
+ |
| 204 |
+src_install() { |
| 205 |
+ dodoc README.md |
| 206 |
+ use doc && dodoc -r Documentation |
| 207 |
+ use examples && dodoc -r examples |
| 208 |
+ use actool && dobin "${S}/${BUILDDIR}/tools/actool" |
| 209 |
+ |
| 210 |
+ dobin "${S}/${BUILDDIR}/target/bin/rkt" |
| 211 |
+ |
| 212 |
+ insinto /usr/share/rkt |
| 213 |
+ doins "${S}/${BUILDDIR}/target/bin/"*.aci |
| 214 |
+ |
| 215 |
+ # create symlink for default stage1 image path |
| 216 |
+ if use rkt_stage1_host; then |
| 217 |
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}" |
| 218 |
+ elif use rkt_stage1_src; then |
| 219 |
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}" |
| 220 |
+ elif use rkt_stage1_coreos; then |
| 221 |
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}" |
| 222 |
+ elif use rkt_stage1_fly; then |
| 223 |
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}" |
| 224 |
+ elif use rkt_stage1_kvm; then |
| 225 |
+ dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}" |
| 226 |
+ fi |
| 227 |
+ |
| 228 |
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service |
| 229 |
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer |
| 230 |
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service |
| 231 |
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket |
| 232 |
+ |
| 233 |
+ keepdir /etc/${PN} |
| 234 |
+ fowners :rkt-admin /etc/${PN} |
| 235 |
+ fperms 2775 /etc/${PN} |
| 236 |
+} |
Archives