| 1 |
commit: d63472e2c7b4f0a9646e761d5d83da3b140eae4f |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 30 07:08:36 2016 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 30 07:09:23 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d63472e2 |
| 7 |
|
| 8 |
app-emulation/rkt: version bump to 1.11.0 |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
app-emulation/rkt/Manifest | 2 + |
| 13 |
app-emulation/rkt/rkt-1.11.0.ebuild | 191 ++++++++++++++++++++++++++++++++++++ |
| 14 |
2 files changed, 193 insertions(+) |
| 15 |
|
| 16 |
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest |
| 17 |
index 0760bee..44cb1e1 100644 |
| 18 |
--- a/app-emulation/rkt/Manifest |
| 19 |
+++ b/app-emulation/rkt/Manifest |
| 20 |
@@ -2,10 +2,12 @@ DIST kvmtool-3c8aec9e2b5066412390559629dabeb7816ee8f2.tar.gz 241486 SHA256 a3e65 |
| 21 |
DIST kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz 243930 SHA256 89f4cc94364298aa5b9c39c660ebd82a4beb5351cc838d418e7e21afefb5c1f0 SHA512 70aea2324273603b77aa64c95efd36df35c74514fa820013bfee386332289119cc148aed2983a8c6fd9ddfa5bc3db39c5aa0ee32bfc2077787338a47f2954f2f WHIRLPOOL ee47d7e38509eddf90ef0cf7d0cd3761c623e55a1003e8810e645759dc9615e33fbae22ab5576627f9f86eee8b4ca96c4bdf692b7ab073f1f222734bc378477a |
| 22 |
DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5 |
| 23 |
DIST rkt-1.10.1.tar.gz 2754338 SHA256 4a3c5db16be05292d6174d9d2c1d1f4c5c967e37686390927b8ca0d2bf570eb5 SHA512 6f6291251b31a3b4e1a4652554ded3f5c43b975aac861bbad483360347ea23f3f517b5fdd97fca2b26ab9543530df6318207e67c3d0776eff04cd4808489d2ec WHIRLPOOL 8f2946a2e5478bc2d1a0d5274fd22a7a16fbc81ed462d0cc49e7aa47e43c6c4324c317c3913199b55000d09b955aa56df0090427f99825f4cf376240cdd285c7 |
| 24 |
+DIST rkt-1.11.0.tar.gz 2767797 SHA256 cd75f1648ae6736da731c14a2102646ee90467efd6d2a32b518fd36b8c9806c5 SHA512 dfc604b50037a5a272e0fe0f438c35e1a010489ee19a426cbad7184a3910a214f4bf659b533f323a2ab742deffe7bba10daee52691ff32e5a35f453b2b0c4bb0 WHIRLPOOL 4caa6be6f5f8c5aeb67c762a2643ffc8579d45f49b5c5e4cb5c16ce5e38cc4db35e9dee7d5df20ef80bf75d64e3cccbcc1521c4ddab18441652d2d383a17368b |
| 25 |
DIST rkt-1.6.0.tar.gz 2641952 SHA256 767f2ed21d6dbf00a7a264d0dbd84a2733d56dbe97bab90b3d99af47d33c9b5c SHA512 54a0c564173047adbb5b81abb73600fee4fbdb5bf27521d4de269156e6ae9d3df23796cf57fdff551fc0846332c88fb96cca0b757beca512e1b760c5653a462b WHIRLPOOL 84fac58e268651f76ee1509ef99b3554bdc14e5cb66a75613f60fca5fe3d177305dc252a7b868e3d183222f40882e618aa964760c9025829f42b8bce7e1391b1 |
| 26 |
DIST rkt-1.7.0.tar.gz 2835144 SHA256 80806ea63fe741cc569c991f98721289cd439c2239c3a8b1966ced2e467ed182 SHA512 677fe65921610070a8d3dfd96adda361390511e1f30f5fbd0335ddf0f743056f9dcddf089f3d42db0060f1d85830647b8b5633439ed5d8e589c64daf0490e6f6 WHIRLPOOL aeea6323a4e962c4f64f6c03b0685b85021916840d61d441da554f3091b1c68efd6bf3e4b06fb7536ae421bd9f2bc13747856e3139da5361cc1e8f35809a6231 |
| 27 |
DIST rkt-pxe-1032.0.0.img 233166273 SHA256 2e34b18dc6d8a7f89ab6dd64ed405299171067f4d9f0bb2cf18b15be9985bed2 SHA512 e6dd5b2329894c54d1d5c6b0d700a6e5aab5001c754a043de461bf0335c946690933d7b93897f681c82c99778fdbddd75efe777535dfc7dda1f11834d0a6e8d2 WHIRLPOOL df5af345546339bb245884900cda7f246de58d6d0fc21c8f8f9dfb16bf7375263f455526d9c3d2330b4693b7c015029987edc9c5843201ca6b51482a2b3fdef7 |
| 28 |
DIST rkt-pxe-1068.0.0.img 261402717 SHA256 f7ae0b0c676a2aaaaf2872fd5d0d692744d6af9185a334354c3c673865e54a1a SHA512 7b4c4ac28eb59f9fa8616b205fb440e5535814b80d89a365fd695252e7f9ed5f0d5288d1e571bc71b261f4f68ca052d327eee7eabe9b562e7003c767c96e052a WHIRLPOOL 1afa35b65a4beb2d5c12a8da4db7aff6b3b3123aa83366b0a51caac911938957f992082f7af35c1592c2da44503cc5131547a7961771c2c4064e79b3074f8a6b |
| 29 |
+DIST rkt-pxe-1097.0.0.img 240454650 SHA256 aa205919c4c733cf4cb7220f038f272f4b3ce6a185e5195945fdc625f506f737 SHA512 7a3cc62b5ae13ed8813effdea6125472982c81fa1fb35df0ac13a233ee352e67167a38cd82a802c0e8da50b2cf4455771441ad5ada186b3e3f2cdade4b1903c7 WHIRLPOOL 067eba2c1ebc546df506a249c0c49ab2ce556869f9455b6b1706e2285111293a4beed0172036df372e7b2e02449d815fb76c361219badcebe3240686be7bcc4c |
| 30 |
DIST rkt-pxe-794.1.0.img 185121072 SHA256 d513e27d2412d8fdaa2456786703346f10c24a62480d2036ca5c31b3d5a0df16 SHA512 f36324e9736bb0c533706c45d4146bed2efcb3ee2cb842c3624a62399835808c0df2aef56495a12b30f67c47fd84e93e34b10c57e4aa6d0450402d5e21c6f88c WHIRLPOOL 099851022b11aa29d004bbcef316a7cceeb5efa43f8069cdf1858888e7550f938fd9f9ec53eb63c313b5c1b93b0569f578a50fc5bae28b4d30c451a2ffd2adba |
| 31 |
DIST rkt-sdjournal-64e931a183d12a30e3e25deefbeab0753dca99bf.patch 11264 SHA256 789ac19d4edb2b8b06c0dd3f1ad9092c583fcc039b7d0c3e491d03cdcf83b4d2 SHA512 2f4e918b1be3812b781813ebbfffb258c1b3441298825cfaba768453dd55ffe39f91fc2b230b6c3ec2c8003543e61d72cf161a56dfff85ba51f2e3fcd2c8f1e3 WHIRLPOOL dde9c83be96278eb5b7fb5bab2c0db4e3a741eede3164fe9bcd27905834ea31554e3739614a34a55a8cb1d9e89804a4db9a004d1758d618211bc5b50865286de |
| 32 |
DIST systemd-222.tar.gz 4015599 SHA256 b49f51f9855127987adc98aad3b6d608e4e53eaa029b629f2ea2089ce0234f34 SHA512 83f0acf0ca90c89c902c268af6eef4b61380a30380013cbe89c929357959f51682cd3961a6a4f772abc09d5ca09404ae290edf2c3253fab1b20dc2b5b3ecde47 WHIRLPOOL dd0151034de374b072e70448e7a9ff47693df0190e8a2a11488593400d3d7e53e0a91d86037d027c750584089e6c68e58c437647d608a72f8826f091e3253879 |
| 33 |
|
| 34 |
diff --git a/app-emulation/rkt/rkt-1.11.0.ebuild b/app-emulation/rkt/rkt-1.11.0.ebuild |
| 35 |
new file mode 100644 |
| 36 |
index 0000000..c9e4a2f |
| 37 |
--- /dev/null |
| 38 |
+++ b/app-emulation/rkt/rkt-1.11.0.ebuild |
| 39 |
@@ -0,0 +1,191 @@ |
| 40 |
+# Copyright 1999-2016 Gentoo Foundation |
| 41 |
+# Distributed under the terms of the GNU General Public License v2 |
| 42 |
+# $Id$ |
| 43 |
+ |
| 44 |
+EAPI=6 |
| 45 |
+ |
| 46 |
+inherit autotools flag-o-matic systemd toolchain-funcs |
| 47 |
+ |
| 48 |
+KEYWORDS="~amd64" |
| 49 |
+ |
| 50 |
+PXE_VERSION="1097.0.0" |
| 51 |
+PXE_SYSTEMD_VERSION="v229" |
| 52 |
+KVM_LINUX_VERSION="4.3.1" |
| 53 |
+KVMTOOL_VERSION="d62653e177597251c24494a6dda60acd6d846671" |
| 54 |
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz" |
| 55 |
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img" |
| 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? ( |
| 60 |
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz |
| 61 |
+ mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz |
| 62 |
+ ${PXE_URI} -> ${PXE_FILE} |
| 63 |
+) |
| 64 |
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )" |
| 65 |
+ |
| 66 |
+DESCRIPTION="A CLI for running app containers, and an implementation of the App |
| 67 |
+Container Spec." |
| 68 |
+HOMEPAGE="https://github.com/coreos/rkt" |
| 69 |
+ |
| 70 |
+LICENSE="Apache-2.0" |
| 71 |
+SLOT="0" |
| 72 |
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd" |
| 73 |
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )" |
| 74 |
+ |
| 75 |
+DEPEND=">=dev-lang/go-1.5 |
| 76 |
+ app-arch/cpio |
| 77 |
+ app-crypt/trousers |
| 78 |
+ sys-fs/squashfs-tools |
| 79 |
+ dev-perl/Capture-Tiny |
| 80 |
+ rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )" |
| 81 |
+ |
| 82 |
+RDEPEND="!app-emulation/rocket |
| 83 |
+ rkt_stage1_host? ( systemd? ( |
| 84 |
+ >=sys-apps/systemd-222 |
| 85 |
+ app-shells/bash:0 |
| 86 |
+ ) )" |
| 87 |
+ |
| 88 |
+BUILDDIR="build-${P}" |
| 89 |
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci" |
| 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 |
+ # disable git fetch of systemd |
| 112 |
+ sed -e 's~^include makelib/git.mk$~'\ |
| 113 |
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\ |
| 114 |
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\ |
| 115 |
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\ |
| 116 |
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\ |
| 117 |
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\ |
| 118 |
+'else\n'\ |
| 119 |
+'\t\0\n'\ |
| 120 |
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die |
| 121 |
+ |
| 122 |
+ # disable git fetch of kvmtool |
| 123 |
+ sed -e 's~^include makelib/git.mk$~'\ |
| 124 |
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\ |
| 125 |
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\ |
| 126 |
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\ |
| 127 |
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\ |
| 128 |
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\ |
| 129 |
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\ |
| 130 |
+'else\n'\ |
| 131 |
+'\t\0\n'\ |
| 132 |
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die |
| 133 |
+ |
| 134 |
+ # disable fetch of kernel sources |
| 135 |
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \ |
| 136 |
+ -i stage1/usr_from_kvm/kernel.mk || die |
| 137 |
+ |
| 138 |
+ if use rkt_stage1_host; then |
| 139 |
+ # Make systemdUnitsPath consistent with host |
| 140 |
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \ |
| 141 |
+ -i stage1/init/init.go || die |
| 142 |
+ fi |
| 143 |
+ |
| 144 |
+ eautoreconf |
| 145 |
+} |
| 146 |
+ |
| 147 |
+src_configure() { |
| 148 |
+ local flavors myeconfargs=( |
| 149 |
+ --with-stage1-default-images-directory="/usr/share/rkt" |
| 150 |
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}" |
| 151 |
+ ) |
| 152 |
+ |
| 153 |
+ use systemd || myeconfargs+=( --enable-sdjournal=no ) |
| 154 |
+ |
| 155 |
+ # enable flavors (first is default) |
| 156 |
+ use rkt_stage1_host && flavors+=",host" |
| 157 |
+ use rkt_stage1_src && flavors+=",src" |
| 158 |
+ use rkt_stage1_coreos && flavors+=",coreos" |
| 159 |
+ use rkt_stage1_fly && flavors+=",fly" |
| 160 |
+ use rkt_stage1_kvm && flavors+=",kvm" |
| 161 |
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" ) |
| 162 |
+ |
| 163 |
+ if use rkt_stage1_src; then |
| 164 |
+ myeconfargs+=( |
| 165 |
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION} |
| 166 |
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}" |
| 167 |
+ ) |
| 168 |
+ fi |
| 169 |
+ |
| 170 |
+ if use rkt_stage1_coreos || use rkt_stage1_kvm; then |
| 171 |
+ myeconfargs+=( |
| 172 |
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}" |
| 173 |
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}" |
| 174 |
+ ) |
| 175 |
+ fi |
| 176 |
+ |
| 177 |
+ # Go's 6l linker does not support PIE, disable so cgo binaries |
| 178 |
+ # which use 6l+gcc for linking can be built correctly. |
| 179 |
+ if gcc-specs-pie; then |
| 180 |
+ append-ldflags -nopie |
| 181 |
+ fi |
| 182 |
+ |
| 183 |
+ export CC=$(tc-getCC) |
| 184 |
+ export CGO_ENABLED=1 |
| 185 |
+ export CGO_CFLAGS="${CFLAGS}" |
| 186 |
+ export CGO_CPPFLAGS="${CPPFLAGS}" |
| 187 |
+ export CGO_CXXFLAGS="${CXXFLAGS}" |
| 188 |
+ export CGO_LDFLAGS="${LDFLAGS}" |
| 189 |
+ export BUILDDIR |
| 190 |
+ |
| 191 |
+ econf "${myeconfargs[@]}" |
| 192 |
+} |
| 193 |
+ |
| 194 |
+src_compile() { |
| 195 |
+ local arch=${ARCH} |
| 196 |
+ case ${arch} in |
| 197 |
+ amd64) arch=x86_64;; |
| 198 |
+ esac |
| 199 |
+ ARCH=${arch} emake |
| 200 |
+} |
| 201 |
+ |
| 202 |
+src_install() { |
| 203 |
+ dodoc README.md |
| 204 |
+ use doc && dodoc -r Documentation |
| 205 |
+ use examples && dodoc -r examples |
| 206 |
+ use actool && dobin "${S}/${BUILDDIR}/tools/actool" |
| 207 |
+ |
| 208 |
+ dobin "${S}/${BUILDDIR}/target/bin/rkt" |
| 209 |
+ |
| 210 |
+ insinto /usr/share/rkt |
| 211 |
+ doins "${S}/${BUILDDIR}/target/bin/"*.aci |
| 212 |
+ |
| 213 |
+ # create symlink for default stage1 image path |
| 214 |
+ if use rkt_stage1_host; then |
| 215 |
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}" |
| 216 |
+ elif use rkt_stage1_src; then |
| 217 |
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}" |
| 218 |
+ elif use rkt_stage1_coreos; then |
| 219 |
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}" |
| 220 |
+ elif use rkt_stage1_fly; then |
| 221 |
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}" |
| 222 |
+ elif use rkt_stage1_kvm; then |
| 223 |
+ dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}" |
| 224 |
+ fi |
| 225 |
+ |
| 226 |
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service |
| 227 |
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer |
| 228 |
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service |
| 229 |
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket |
| 230 |
+} |
Archives