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