| 1 |
commit: 16d30c6b3704c0be696f3de8a798b86b547d7f1b |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 30 07:15:03 2016 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 30 07:15:03 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16d30c6b |
| 7 |
|
| 8 |
app-emulation/rkt: drop 9999 ebuild |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
app-emulation/rkt/Manifest | 3 - |
| 13 |
app-emulation/rkt/rkt-9999.ebuild | 192 -------------------------------------- |
| 14 |
2 files changed, 195 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest |
| 17 |
index fb61fbf..f7d88e9 100644 |
| 18 |
--- a/app-emulation/rkt/Manifest |
| 19 |
+++ b/app-emulation/rkt/Manifest |
| 20 |
@@ -1,11 +1,8 @@ |
| 21 |
-DIST kvmtool-3c8aec9e2b5066412390559629dabeb7816ee8f2.tar.gz 241486 SHA256 a3e65e5331e8bb20b112ac2dcc252fbcc9b9a83ef20292874ed4682bc2d87dcc SHA512 21a9ec313a9f46d6ebc4b7badfcc731350f5e58781892f33d11b907e085b84e6eebcaf2f22d101ed46a570e87d6530468be0bf6c258f195a38d594407cb2471b WHIRLPOOL f998afe674ef1bb8050d944646d35854fb75c3ef00eb0379ba3a52ea80bc9590e793fd333cb45803f683a4d0ed21c61d6d1cc7b74d01eb9503a6d960eef9e143 |
| 22 |
DIST kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz 243930 SHA256 89f4cc94364298aa5b9c39c660ebd82a4beb5351cc838d418e7e21afefb5c1f0 SHA512 70aea2324273603b77aa64c95efd36df35c74514fa820013bfee386332289119cc148aed2983a8c6fd9ddfa5bc3db39c5aa0ee32bfc2077787338a47f2954f2f WHIRLPOOL ee47d7e38509eddf90ef0cf7d0cd3761c623e55a1003e8810e645759dc9615e33fbae22ab5576627f9f86eee8b4ca96c4bdf692b7ab073f1f222734bc378477a |
| 23 |
DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5 |
| 24 |
DIST rkt-1.10.1.tar.gz 2754338 SHA256 4a3c5db16be05292d6174d9d2c1d1f4c5c967e37686390927b8ca0d2bf570eb5 SHA512 6f6291251b31a3b4e1a4652554ded3f5c43b975aac861bbad483360347ea23f3f517b5fdd97fca2b26ab9543530df6318207e67c3d0776eff04cd4808489d2ec WHIRLPOOL 8f2946a2e5478bc2d1a0d5274fd22a7a16fbc81ed462d0cc49e7aa47e43c6c4324c317c3913199b55000d09b955aa56df0090427f99825f4cf376240cdd285c7 |
| 25 |
DIST rkt-1.11.0.tar.gz 2767797 SHA256 cd75f1648ae6736da731c14a2102646ee90467efd6d2a32b518fd36b8c9806c5 SHA512 dfc604b50037a5a272e0fe0f438c35e1a010489ee19a426cbad7184a3910a214f4bf659b533f323a2ab742deffe7bba10daee52691ff32e5a35f453b2b0c4bb0 WHIRLPOOL 4caa6be6f5f8c5aeb67c762a2643ffc8579d45f49b5c5e4cb5c16ce5e38cc4db35e9dee7d5df20ef80bf75d64e3cccbcc1521c4ddab18441652d2d383a17368b |
| 26 |
DIST rkt-pxe-1068.0.0.img 261402717 SHA256 f7ae0b0c676a2aaaaf2872fd5d0d692744d6af9185a334354c3c673865e54a1a SHA512 7b4c4ac28eb59f9fa8616b205fb440e5535814b80d89a365fd695252e7f9ed5f0d5288d1e571bc71b261f4f68ca052d327eee7eabe9b562e7003c767c96e052a WHIRLPOOL 1afa35b65a4beb2d5c12a8da4db7aff6b3b3123aa83366b0a51caac911938957f992082f7af35c1592c2da44503cc5131547a7961771c2c4064e79b3074f8a6b |
| 27 |
DIST rkt-pxe-1097.0.0.img 240454650 SHA256 aa205919c4c733cf4cb7220f038f272f4b3ce6a185e5195945fdc625f506f737 SHA512 7a3cc62b5ae13ed8813effdea6125472982c81fa1fb35df0ac13a233ee352e67167a38cd82a802c0e8da50b2cf4455771441ad5ada186b3e3f2cdade4b1903c7 WHIRLPOOL 067eba2c1ebc546df506a249c0c49ab2ce556869f9455b6b1706e2285111293a4beed0172036df372e7b2e02449d815fb76c361219badcebe3240686be7bcc4c |
| 28 |
-DIST rkt-pxe-794.1.0.img 185121072 SHA256 d513e27d2412d8fdaa2456786703346f10c24a62480d2036ca5c31b3d5a0df16 SHA512 f36324e9736bb0c533706c45d4146bed2efcb3ee2cb842c3624a62399835808c0df2aef56495a12b30f67c47fd84e93e34b10c57e4aa6d0450402d5e21c6f88c WHIRLPOOL 099851022b11aa29d004bbcef316a7cceeb5efa43f8069cdf1858888e7550f938fd9f9ec53eb63c313b5c1b93b0569f578a50fc5bae28b4d30c451a2ffd2adba |
| 29 |
DIST rkt-sdjournal-64e931a183d12a30e3e25deefbeab0753dca99bf.patch 11264 SHA256 789ac19d4edb2b8b06c0dd3f1ad9092c583fcc039b7d0c3e491d03cdcf83b4d2 SHA512 2f4e918b1be3812b781813ebbfffb258c1b3441298825cfaba768453dd55ffe39f91fc2b230b6c3ec2c8003543e61d72cf161a56dfff85ba51f2e3fcd2c8f1e3 WHIRLPOOL dde9c83be96278eb5b7fb5bab2c0db4e3a741eede3164fe9bcd27905834ea31554e3739614a34a55a8cb1d9e89804a4db9a004d1758d618211bc5b50865286de |
| 30 |
-DIST systemd-222.tar.gz 4015599 SHA256 b49f51f9855127987adc98aad3b6d608e4e53eaa029b629f2ea2089ce0234f34 SHA512 83f0acf0ca90c89c902c268af6eef4b61380a30380013cbe89c929357959f51682cd3961a6a4f772abc09d5ca09404ae290edf2c3253fab1b20dc2b5b3ecde47 WHIRLPOOL dd0151034de374b072e70448e7a9ff47693df0190e8a2a11488593400d3d7e53e0a91d86037d027c750584089e6c68e58c437647d608a72f8826f091e3253879 |
| 31 |
DIST systemd-229.tar.gz 4319173 SHA256 b51b0a48d1beb388d95bd6a98d62be05490335d4bb388aefecdcb576e91e0741 SHA512 d692c0c9fc82f2fce64a5ec1caa4a0f8cf9edaeb1bdaaa1c462669db8f78b3dd6b33c87ef926ff21823582d0460f7b63aa3755792f9ae2cd6fb813ba08a35c39 WHIRLPOOL aa44f7161d80cc680226f19755579ba72c52cfe7bd671aefb09c414981f3a5a5c852f07d3449ac6f96d4ca91120cfb1464225d995b1637f1e2c108baf3c4a392 |
| 32 |
|
| 33 |
diff --git a/app-emulation/rkt/rkt-9999.ebuild b/app-emulation/rkt/rkt-9999.ebuild |
| 34 |
deleted file mode 100644 |
| 35 |
index 89add2f..0000000 |
| 36 |
--- a/app-emulation/rkt/rkt-9999.ebuild |
| 37 |
+++ /dev/null |
| 38 |
@@ -1,192 +0,0 @@ |
| 39 |
-# Copyright 1999-2016 Gentoo Foundation |
| 40 |
-# Distributed under the terms of the GNU General Public License v2 |
| 41 |
-# $Id$ |
| 42 |
- |
| 43 |
-EAPI=5 |
| 44 |
- |
| 45 |
-AUTOTOOLS_AUTORECONF=yes |
| 46 |
-AUTOTOOLS_IN_SOURCE_BUILD=yes |
| 47 |
- |
| 48 |
-inherit git-r3 autotools-utils flag-o-matic systemd toolchain-funcs |
| 49 |
- |
| 50 |
-KEYWORDS="" |
| 51 |
- |
| 52 |
-EGIT_REPO_URI="https://github.com/coreos/rkt.git" |
| 53 |
-PXE_VERSION="794.1.0" |
| 54 |
-PXE_SYSTEMD_VERSION="v222" |
| 55 |
-KVM_LINUX_VERSION="4.3.1" |
| 56 |
-KVMTOOL_VERSION="3c8aec9e2b5066412390559629dabeb7816ee8f2" |
| 57 |
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz" |
| 58 |
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img" |
| 59 |
- |
| 60 |
-[[ ${PV} == *9999* ]] || SRC_URI+=" https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 61 |
-SRC_URI+=" |
| 62 |
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE ) |
| 63 |
-rkt_stage1_kvm? ( |
| 64 |
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz |
| 65 |
- mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz |
| 66 |
- ${PXE_URI} -> ${PXE_FILE} |
| 67 |
-) |
| 68 |
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )" |
| 69 |
- |
| 70 |
-DESCRIPTION="A CLI for running app containers, and an implementation of the App |
| 71 |
-Container Spec." |
| 72 |
-HOMEPAGE="https://github.com/coreos/rkt" |
| 73 |
- |
| 74 |
-LICENSE="Apache-2.0" |
| 75 |
-SLOT="0" |
| 76 |
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd" |
| 77 |
-REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )" |
| 78 |
- |
| 79 |
-DEPEND=">=dev-lang/go-1.4.1 |
| 80 |
- app-arch/cpio |
| 81 |
- app-crypt/trousers |
| 82 |
- sys-fs/squashfs-tools |
| 83 |
- dev-perl/Capture-Tiny" |
| 84 |
- |
| 85 |
-RDEPEND="!app-emulation/rocket |
| 86 |
- rkt_stage1_host? ( systemd? ( |
| 87 |
- >=sys-apps/systemd-222 |
| 88 |
- app-shells/bash:0 |
| 89 |
- ) )" |
| 90 |
- |
| 91 |
-BUILDDIR="build-${P}" |
| 92 |
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci" |
| 93 |
- |
| 94 |
-src_unpack() { |
| 95 |
- [[ ${PV} == *9999* ]] && git-r3_src_unpack |
| 96 |
- local x |
| 97 |
- for x in ${A}; do |
| 98 |
- case ${x} in |
| 99 |
- *.img|linux-*) continue ;; |
| 100 |
- kvmtool-*) |
| 101 |
- mkdir kvmtool || die |
| 102 |
- pushd kvmtool >/dev/null || die |
| 103 |
- unpack ${x} |
| 104 |
- popd >/dev/null || die |
| 105 |
- ;; |
| 106 |
- *) |
| 107 |
- unpack ${x} |
| 108 |
- esac |
| 109 |
- done |
| 110 |
-} |
| 111 |
- |
| 112 |
-src_prepare() { |
| 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 |
- autotools-utils_src_prepare |
| 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 |
- # 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 |
- autotools-utils_src_configure |
| 192 |
-} |
| 193 |
- |
| 194 |
-src_compile() { |
| 195 |
- local arch=${ARCH} |
| 196 |
- case ${arch} in |
| 197 |
- amd64) arch=x86_64;; |
| 198 |
- esac |
| 199 |
- ARCH=${arch} autotools-utils_src_compile |
| 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}/bin/actool" |
| 207 |
- |
| 208 |
- dobin "${S}/${BUILDDIR}/bin/rkt" |
| 209 |
- |
| 210 |
- insinto /usr/share/rkt |
| 211 |
- doins "${S}/${BUILDDIR}/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