* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-04-06 20:35 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-04-06 20:35 UTC (permalink / raw
To: gentoo-commits
commit: 5b4d63fd3807d122c1f4dc55bada8a989bc85793
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 6 20:33:11 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Apr 6 20:33:11 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b4d63fd
app-emulation/rkt: remove old versions
Package-Manager: portage-2.2.28
app-emulation/rkt/Manifest | 3 --
app-emulation/rkt/rkt-0.8.0.ebuild | 87 -------------------------------
app-emulation/rkt/rkt-1.0.0.ebuild | 104 -------------------------------------
3 files changed, 194 deletions(-)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index e1072f1..ff6fa23 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,10 +1,7 @@
DIST kvmtool-3c8aec9e2b5066412390559629dabeb7816ee8f2.tar.gz 241486 SHA256 a3e65e5331e8bb20b112ac2dcc252fbcc9b9a83ef20292874ed4682bc2d87dcc SHA512 21a9ec313a9f46d6ebc4b7badfcc731350f5e58781892f33d11b907e085b84e6eebcaf2f22d101ed46a570e87d6530468be0bf6c258f195a38d594407cb2471b WHIRLPOOL f998afe674ef1bb8050d944646d35854fb75c3ef00eb0379ba3a52ea80bc9590e793fd333cb45803f683a4d0ed21c61d6d1cc7b74d01eb9503a6d960eef9e143
DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5
-DIST rkt-0.8.0.tar.gz 1749853 SHA256 c9eb0126b8ff2f059d7cedaab17ca73dce256f342092c9bf4a7ae20661f2a5aa SHA512 4e2c27fb40cd3d27de062631105db3ea04ed902f48abb647a8e4de249478dd8a145ac0b77fd5b261cc680df1bcaa4067accb8a597def9b3963108e2c1f3d9d5a WHIRLPOOL f65ddd8908ec30cfefa06e60cd4d8cdb2099ab279b6350790eb3e436b88c792efe28cea53569f48d42f6eec682635a4212f16fea9d184e6baa97877a643e1106
-DIST rkt-1.0.0.tar.gz 2414183 SHA256 7e30b03fa51a34db095484c4b111c526e49bead4e33232e1b239090503d7ac97 SHA512 f176532486b68ebc15aae17cfcf31e0f97ce3afc96bfed1c4f918da41350ef21c170712cb071a8720f39ee757b7b9ba1e66730d6e12acb9753446b929801c4ff WHIRLPOOL b2fc3082693b474584292a6ec943a685826364632dc346b18233bf9b9d2feaf14981f4a7fcbd9e79b98c2466b2f24be9b57f6345c89aeea5d075cdbeee26aba5
DIST rkt-1.1.0.tar.gz 2426666 SHA256 df93dffc1deff470a5bebaa2610a07df8f48e69f660c81de0a31de13d7f7bfa5 SHA512 ef444843f411cd2d1fcd02f606bf5d0971eb314d708d1d54d07af9e3d69e1d74a7812456fd7cc46372ca6e42cfd5ac6af6b7b67e22890396f58d8982c0af1373 WHIRLPOOL 0579f5efd28d473ab4a0874d7218268a2a1143118b9f3e39670a683f05c7fb3b1b952aee75f0c923d76bc457c4d933c3c9b329f99960fa0a95cde2573225288b
DIST rkt-1.3.0.tar.gz 2450145 SHA256 0468c5b1079da8df65db9ebd0b712f64509acf6c8d6b34b780b6e787271d9b30 SHA512 f00500ddc1af85bc5ebe23b1a28e517e5f321f8c4c2434b71931b326cca5d4a10af4d54648a22634dc5039c7ca305539736b88a63b16fed1be897af0e22b64aa WHIRLPOOL 3f6c7ee950637ee16373ea43a23b1189c097d771748624be8a5794c734b0cb44b1b249cd424bcddf0ef5ec1761e08b8d53de71b5375ae35a9aa2ca7c3d4b91d6
-DIST rkt-pxe-738.1.0.img 151780780 SHA256 805a4c491281553c8927f3dd1a7bec50cca29209d0a7264870e7155d794ecbe6 SHA512 7774cc64dfa874f08f48cba0c15103e9eca86ffd87dcb24f765a9b56074e72f6862a663a4007a0a7dd296740ae91bf4edf7290fa35659b0b1572fe2f5dad3256 WHIRLPOOL 5973a6036d650c576bb0bd365c8c9ea35776501c1fd2baf1d7c00d06496fab35e9c796096ef89b095e7a922e2062dce6c0d1c85cd3101022e0aca84277d18cb9
DIST rkt-pxe-794.1.0.img 185121072 SHA256 d513e27d2412d8fdaa2456786703346f10c24a62480d2036ca5c31b3d5a0df16 SHA512 f36324e9736bb0c533706c45d4146bed2efcb3ee2cb842c3624a62399835808c0df2aef56495a12b30f67c47fd84e93e34b10c57e4aa6d0450402d5e21c6f88c WHIRLPOOL 099851022b11aa29d004bbcef316a7cceeb5efa43f8069cdf1858888e7550f938fd9f9ec53eb63c313b5c1b93b0569f578a50fc5bae28b4d30c451a2ffd2adba
DIST rkt-pxe-991.0.0.img 226115454 SHA256 33697d3d7c7458bbb160a5eb889ced34b001c35e22e10c86235042eb57ae51ed SHA512 1b785d8454381d47eb53062433bda5645650420b58821ac00119a92032ba4d669c974871eafe7e414ad349952974cfdf6812f85af69d3286b7bfe2fc2d04c52f WHIRLPOOL d9f103a0c5a78c8a4403a17e805872703cd5d4fe34e5395c381216538a15f58a7678c7d744ac8aa90ed4dd850a614ca52487cb50e5687c812488a3cdbdff2de0
DIST systemd-222.tar.gz 4015599 SHA256 b49f51f9855127987adc98aad3b6d608e4e53eaa029b629f2ea2089ce0234f34 SHA512 83f0acf0ca90c89c902c268af6eef4b61380a30380013cbe89c929357959f51682cd3961a6a4f772abc09d5ca09404ae290edf2c3253fab1b20dc2b5b3ecde47 WHIRLPOOL dd0151034de374b072e70448e7a9ff47693df0190e8a2a11488593400d3d7e53e0a91d86037d027c750584089e6c68e58c437647d608a72f8826f091e3253879
diff --git a/app-emulation/rkt/rkt-0.8.0.ebuild b/app-emulation/rkt/rkt-0.8.0.ebuild
deleted file mode 100644
index e1354ed..0000000
--- a/app-emulation/rkt/rkt-0.8.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-AUTOTOOLS_IN_SOURCE_BUILD=yes
-
-inherit autotools-utils flag-o-matic systemd toolchain-funcs
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="738.1.0"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )"
-
-DESCRIPTION="A CLI for running app containers, and an implementation of the App
-Container Spec."
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc examples +rkt_stage1_coreos rkt_stage1_src +actool systemd"
-REQUIRED_USE="^^ ( rkt_stage1_coreos rkt_stage1_src )"
-
-DEPEND=">=dev-lang/go-1.4.1
- app-arch/cpio
- sys-fs/squashfs-tools
- dev-perl/Capture-Tiny
- rkt_stage1_src? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- )"
-RDEPEND="!app-emulation/rocket"
-
-BUILDDIR="build-${P}"
-
-src_configure() {
- local myeconfargs=(
- --with-stage1-image-path="/usr/share/rkt/stage1.aci"
- )
-
- if use rkt_stage1_src; then
- myeconfargs+=( --with-stage1="src" )
- elif use rkt_stage1_coreos; then
- myeconfargs+=( --with-stage1="coreos" )
- mkdir -p "${BUILDDIR}/tmp/usr_from_coreos/" || die
- cp "${DISTDIR}/${PXE_FILE}" "${BUILDDIR}/tmp/usr_from_coreos/pxe.img" || die
- fi
-
- # Go's 6l linker does not support PIE, disable so cgo binaries
- # which use 6l+gcc for linking can be built correctly.
- if gcc-specs-pie; then
- append-ldflags -nopie
- fi
-
- export CC=$(tc-getCC)
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export BUILDDIR
-
- autotools-utils_src_configure
-}
-
-src_install() {
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
- use actool && dobin "${S}/${BUILDDIR}/bin/actool"
-
- dobin "${S}/${BUILDDIR}/bin/rkt"
-
- insinto /usr/share/rkt/
- doins "${S}/${BUILDDIR}/bin/stage1.aci"
-
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
-}
diff --git a/app-emulation/rkt/rkt-1.0.0.ebuild b/app-emulation/rkt/rkt-1.0.0.ebuild
deleted file mode 100644
index 0220e1b..0000000
--- a/app-emulation/rkt/rkt-1.0.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-AUTOTOOLS_IN_SOURCE_BUILD=yes
-
-inherit autotools-utils flag-o-matic systemd toolchain-funcs
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="794.1.0"
-PXE_SYSTEMD_VERSION="v222"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )"
-
-DESCRIPTION="A CLI for running app containers, and an implementation of the App
-Container Spec."
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly +actool"
-REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly )"
-
-DEPEND=">=dev-lang/go-1.4.1
- app-arch/cpio
- app-crypt/trousers
- sys-fs/squashfs-tools
- dev-perl/Capture-Tiny"
-
-RDEPEND="!app-emulation/rocket"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-src_configure() {
- local flavors myeconfargs=(
- --with-stage1-default-images-directory="/usr/share/rkt"
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
- )
-
- # TODO:
- # - fix rkt_stage1_kvm to not download kernel sources with wget
- # - fix rkt_stage1_src to not download systemd sources with git clone
- # - fix rkt_stage1_host to not fail during launch
-
- # enable flavors (first is default)
- use rkt_stage1_coreos && flavors+=",coreos"
- use rkt_stage1_fly && flavors+=",fly"
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
- if use rkt_stage1_coreos; then
- myeconfargs+=(
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
- )
- fi
-
- # Go's 6l linker does not support PIE, disable so cgo binaries
- # which use 6l+gcc for linking can be built correctly.
- if gcc-specs-pie; then
- append-ldflags -nopie
- fi
-
- export CC=$(tc-getCC)
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export BUILDDIR
-
- autotools-utils_src_configure
-}
-
-src_install() {
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
- use actool && dobin "${S}/${BUILDDIR}/bin/actool"
-
- dobin "${S}/${BUILDDIR}/bin/rkt"
-
- insinto /usr/share/rkt
- doins "${S}/${BUILDDIR}/bin/"*.aci
-
- # create symlink for default stage1 image path
- if use rkt_stage1_coreos; then
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_fly; then
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- fi
-
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
-}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2018-11-17 15:27 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2018-11-17 15:27 UTC (permalink / raw
To: gentoo-commits
commit: c4883e0840dc985d6ffe05a65c2f943b26cea95b
Author: Robin Hallabro <robin <AT> hallabro <DOT> nu>
AuthorDate: Sat Nov 17 08:18:22 2018 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Nov 17 15:27:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4883e08
app-emulation/rkt: Bump version to 1.30.0
Closes: https://bugs.gentoo.org/671046
Closes: https://github.com/gentoo/gentoo/pull/10436
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Robin Hallabro <robin <AT> hallabro.nu>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
app-emulation/rkt/Manifest | 1 +
app-emulation/rkt/rkt-1.30.0.ebuild | 254 ++++++++++++++++++++++++++++++++++++
2 files changed, 255 insertions(+)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 3732460f219..6702216c146 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -4,5 +4,6 @@ DIST kvmtool-include-sysmacros-c0a985531f49c06fd05069024f4664740e6a0baf.patch 12
DIST linux-4.9.2.tar.xz 93189108 BLAKE2B d9eb7bd6f168aba5955da92f54c70468a5eaa6fabceb8399d8c2398672d4401012dc23ce92dfd63e80c87b57eba56f77b62dbf8ec7a8b12e6e0af2d66ea29e3f SHA512 85adf3715cba4a457efea8359ebed34413ac63ee58fe920c5713501dec1e727e167416e9d67a9e2d9430aa9f3a53ad0ac26a4f749984bc5a3f3c37ac504f75de
DIST qemu-2.8.0.tar.bz2 28368517 BLAKE2B 15177018f1f828f35e745593746228738f9bd540b3658b5ca285141867a9fc4a7a4aa9be7b174d32f5d7fc2567fb379a4ce40135b405047282cfbdcd8ab90181 SHA512 50f2988d822388ba9fd1bf5dbe68359033ed7432d7f0f9790299f32f63faa6dc72979256b5632ba572d47ee3e74ed40e3e8e331dc6303ec1599f1b4367cb78c2
DIST rkt-1.29.0.tar.gz 3434520 BLAKE2B b3e1b4e93335023e86439a5202cdb2d8c8f62a24392fd37a11fe381f76cad71ad01d0e4a6b6acdd29edaa77932530f1cdfe5a2aed403841c079f7cb40591972c SHA512 a128abddb29a246b0afea8f7dc81d77aae1e8efaf4dae8fe92aa0f2855c4e4f9dcf7a6f01efa77500ed8a6723db83933c8d1973b284dc62f8e9e0e06b6a20f6d
+DIST rkt-1.30.0.tar.gz 3655661 BLAKE2B f7ac84cdf40d64a04cb1b95cc59a33585f38ab7aac2768833a369725fccfa80c4d85d213161f0d3e265e1b84730e9224a63103dcb6085595474fafa35f8b9d5b SHA512 47b409a61960fec1352535beb2fcdc396ec1cf6feb7d66b320aed0acd908c8ae86d058b4f9b76367606f4e78db6f333bc85dac66f7d646b3b1ada9bfd1f15e44
DIST rkt-pxe-1478.0.0.img 264382497 BLAKE2B 087fc5e27fe2fe41a82d4dad727625a573eda027b3ca67e063ec6d38bb6382353e30804e21f55cda5494ad7ff3cf1db9d593ccc63a639e16a98295d976e92325 SHA512 5f462b6223a141d72a38857fff26f4f70c0a36f21d1cc69623d946ba42f8b15fa994f222b1934cd16cc5b4e306cf5a8850295492dfb637f2a8fee8b774d7c1e4
DIST systemd-233.tar.gz 4660737 BLAKE2B 38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e
diff --git a/app-emulation/rkt/rkt-1.30.0.ebuild b/app-emulation/rkt/rkt-1.30.0.ebuild
new file mode 100644
index 00000000000..b5ad9568d12
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.30.0.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="1478.0.0"
+PXE_SYSTEMD_VERSION="v233"
+KVM_LINUX_VERSION="4.9.2"
+KVMTOOL_VERSION="cfae4d64482ed745214e3c62dd84b79c2ae0f325"
+QEMU_VERSION="v2.8.0"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
+"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm_lkvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/patch/?id=c0a985531f49c06fd05069024f4664740e6a0baf -> kvmtool-include-sysmacros-c0a985531f49c06fd05069024f4664740e6a0baf.patch
+ https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/patch/?id=1cc05b24bfe0211bb408f3264af8e0c42dcdde9c -> kvmtool-include-asm-msr-index-1cc05b24bfe0211bb408f3264af8e0c42dcdde9c.patch
+ ${SRC_URI_KVM}
+)
+rkt_stage1_kvm_qemu? (
+ http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
+ ${SRC_URI_KVM}
+)"
+
+DESCRIPTION="rkt is an App Container runtime for Linux"
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_kvm_qemu +actool systemd"
+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_kvm"
+
+# Some tests fail.
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.5
+ app-arch/cpio
+ app-crypt/trousers
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny
+ rkt_stage1_kvm_qemu? (
+ sys-apps/attr[static-libs(+)]
+ sys-libs/libcap[static-libs(+)]
+ sys-libs/zlib[static-libs(+)]
+ >=x11-libs/pixman-0.28.0[static-libs(+)]
+ )"
+
+RDEPEND="!app-emulation/rocket
+ rkt_stage1_host? ( systemd? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ ) )"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+pkg_setup() {
+ enewgroup rkt-admin
+ enewgroup rkt
+}
+
+src_unpack() {
+ local dest x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-include-*) #627564 #635274
+ dest=${S}/stage1/usr_from_kvm/lkvm/patches
+ mkdir -p "${dest}" || die
+ cp "${DISTDIR}/${x}" "${dest}" || die
+ ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
+src_prepare() {
+ eapply_user
+
+ # This patch breaks linux kernel cc-option checks when the
+ # compiler doesn't recognize the -no-pie option.
+ rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
+
+ # avoid sdjournal include for bug 595874
+ if ! use systemd; then
+ sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
+ -i rkt/rkt.mk || die
+ fi
+
+ sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
+
+ # disable git fetch of systemd
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable git fetch of qemu
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
+'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
+'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
+'$(QEMU_CONF_STAMP): get_qemu_sources\n\n'\
+'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' \
+ -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
+ -i stage1/usr_from_kvm/qemu.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
+ if use rkt_stage1_kvm_qemu; then
+ sed '1i#include <sys/sysmacros.h>' -i "${WORKDIR}/qemu-${QEMU_VERSION#v}/hw/9pfs/9p.c" || die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ local flavors hypervisors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+ )
+
+ use systemd || myeconfargs+=( --enable-sdjournal=no )
+
+ # enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
+ fi
+
+ if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
+ use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
+ myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} emake V=3
+ ARCH=${arch} emake V=3 bash-completion
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/tools/actool"
+
+ dobin "${S}/${BUILDDIR}/target/bin/rkt"
+
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/target/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_lkvm; then
+ dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_qemu; then
+ dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
+
+ systemd_dounit "${S}"/dist/init/systemd/*.service \
+ "${S}"/dist/init/systemd/*.timer \
+ "${S}"/dist/init/systemd/*.socket
+
+ insinto /usr/lib/tmpfiles.d
+ doins "${S}"/dist/init/systemd/tmpfiles.d/*
+
+ newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
+
+ keepdir /etc/${PN}
+ fowners :rkt-admin /etc/${PN}
+ fperms 2775 /etc/${PN}
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2018-07-03 19:32 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2018-07-03 19:32 UTC (permalink / raw
To: gentoo-commits
commit: c77cdd3c0ab82a6b7b238cb60ae86df6ac7c7bcc
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 3 19:05:28 2018 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jul 3 19:05:28 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c77cdd3c
app-emulation/rkt: remove old version 1.28.1
Package-Manager: Portage-2.3.41, Repoman-2.3.9
app-emulation/rkt/Manifest | 3 -
app-emulation/rkt/rkt-1.28.1.ebuild | 266 ------------------------------------
2 files changed, 269 deletions(-)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 248c37be1fd..3732460f219 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -3,9 +3,6 @@ DIST kvmtool-include-asm-msr-index-1cc05b24bfe0211bb408f3264af8e0c42dcdde9c.patc
DIST kvmtool-include-sysmacros-c0a985531f49c06fd05069024f4664740e6a0baf.patch 1243 BLAKE2B d5591addbcdb22952b5b6e462283215bd2366edabbb0db54ffa49b101cf4dcf599a788f4c07fd02729bbf67a3490613f4c4c89f27ad4d84600351d6156dfa4bc SHA512 d8e9d6e656b51d8e4b3bf6939e927a4c11874dfb34b4d649adcbcaf44ec1f95af2bf73e138f94c53aa07cbd79db63a6ebf75f96861f8b13743c942523a3ff106
DIST linux-4.9.2.tar.xz 93189108 BLAKE2B d9eb7bd6f168aba5955da92f54c70468a5eaa6fabceb8399d8c2398672d4401012dc23ce92dfd63e80c87b57eba56f77b62dbf8ec7a8b12e6e0af2d66ea29e3f SHA512 85adf3715cba4a457efea8359ebed34413ac63ee58fe920c5713501dec1e727e167416e9d67a9e2d9430aa9f3a53ad0ac26a4f749984bc5a3f3c37ac504f75de
DIST qemu-2.8.0.tar.bz2 28368517 BLAKE2B 15177018f1f828f35e745593746228738f9bd540b3658b5ca285141867a9fc4a7a4aa9be7b174d32f5d7fc2567fb379a4ce40135b405047282cfbdcd8ab90181 SHA512 50f2988d822388ba9fd1bf5dbe68359033ed7432d7f0f9790299f32f63faa6dc72979256b5632ba572d47ee3e74ed40e3e8e331dc6303ec1599f1b4367cb78c2
-DIST rkt-1.28.1.tar.gz 3425099 BLAKE2B c4c2809f8701df2b765b4297b26124254499ba899985b1662df1b5b35166663b29ef99a21e6c37f4d2b041bb8c43a117846817a4b3997eeebca7da77399b6261 SHA512 02d47f4e95e5ff9dc82cd645f1c69bb1fe5ab856c32b3b29bcd74c0e96ae0b5831a610cbde04614d216e4f7387af54f904ebd31ddc3acc1d2cfa0178805fd811
DIST rkt-1.29.0.tar.gz 3434520 BLAKE2B b3e1b4e93335023e86439a5202cdb2d8c8f62a24392fd37a11fe381f76cad71ad01d0e4a6b6acdd29edaa77932530f1cdfe5a2aed403841c079f7cb40591972c SHA512 a128abddb29a246b0afea8f7dc81d77aae1e8efaf4dae8fe92aa0f2855c4e4f9dcf7a6f01efa77500ed8a6723db83933c8d1973b284dc62f8e9e0e06b6a20f6d
-DIST rkt-pxe-1235.0.0.img 243713684 BLAKE2B 10e9bfb13ab3100ea1fd8a72f1f09a727824589d49e40ee416483a565f349af5ab82b00702fe71988fda4df8955149c4c034c902f4d2766f22b29794e8a9c990 SHA512 b19821c63b7b53a1aad3b6e279189f9ceed1f5db1a691d12a70eb7340cceb4c3fd4f7f61a913d9482aec5ce28740b9ee777f86a1ce54f597f50341d701372542
DIST rkt-pxe-1478.0.0.img 264382497 BLAKE2B 087fc5e27fe2fe41a82d4dad727625a573eda027b3ca67e063ec6d38bb6382353e30804e21f55cda5494ad7ff3cf1db9d593ccc63a639e16a98295d976e92325 SHA512 5f462b6223a141d72a38857fff26f4f70c0a36f21d1cc69623d946ba42f8b15fa994f222b1934cd16cc5b4e306cf5a8850295492dfb637f2a8fee8b774d7c1e4
-DIST systemd-231.tar.gz 4381464 BLAKE2B 46a7139519e4cc3624c5c581631ab1d173f6677e00240310ef24dd383e783ac037c59cc90deef18f7d6a781f056f4ec77636d0ddb660f5942bda415a7176f360 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6
DIST systemd-233.tar.gz 4660737 BLAKE2B 38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e
diff --git a/app-emulation/rkt/rkt-1.28.1.ebuild b/app-emulation/rkt/rkt-1.28.1.ebuild
deleted file mode 100644
index ea1b51224b7..00000000000
--- a/app-emulation/rkt/rkt-1.28.1.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="1235.0.0"
-PXE_SYSTEMD_VERSION="v231"
-KVM_LINUX_VERSION="4.9.2"
-KVMTOOL_VERSION="cfae4d64482ed745214e3c62dd84b79c2ae0f325"
-QEMU_VERSION="v2.8.0"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
- ${PXE_URI} -> ${PXE_FILE}
-"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm_lkvm? (
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
- https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/patch/?id=c0a985531f49c06fd05069024f4664740e6a0baf -> kvmtool-include-sysmacros-c0a985531f49c06fd05069024f4664740e6a0baf.patch
- ${SRC_URI_KVM}
-)
-rkt_stage1_kvm_qemu? (
- http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
- ${SRC_URI_KVM}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="rkt is an App Container runtime for Linux"
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
-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"
-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"
-
-# Some tests fail.
-# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
-RESTRICT="test rkt_stage1_src? ( userpriv )"
-
-DEPEND=">=dev-lang/go-1.5
- app-arch/cpio
- app-crypt/trousers
- sys-fs/squashfs-tools
- dev-perl/Capture-Tiny
- rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
- rkt_stage1_kvm_qemu? (
- sys-apps/attr[static-libs(+)]
- sys-libs/libcap[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- >=x11-libs/pixman-0.28.0[static-libs(+)]
- )"
-
-RDEPEND="!app-emulation/rocket
- rkt_stage1_host? ( systemd? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- ) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-pkg_setup() {
- enewgroup rkt-admin
- enewgroup rkt
-}
-
-src_unpack() {
- local dest x
- for x in ${A}; do
- case ${x} in
- *.img|linux-*) continue ;;
- kvmtool-include-sysmacros-*) #627564
- dest=${S}/stage1/usr_from_kvm/lkvm/patches
- mkdir -p "${dest}" || die
- cp "${DISTDIR}/${x}" "${dest}" || die
- ;;
- kvmtool-*)
- mkdir kvmtool || die
- pushd kvmtool >/dev/null || die
- unpack ${x}
- popd >/dev/null || die
- ;;
- *)
- unpack ${x}
- esac
- done
-}
-
-src_prepare() {
- eapply_user
-
- # This patch breaks linux kernel cc-option checks when the
- # compiler doesn't recognize the -no-pie option.
- rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
-
- # avoid sdjournal include for bug 595874
- if ! use systemd; then
- sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
- -i rkt/rkt.mk || die
- fi
-
- sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
-
- # disable git fetch of systemd
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
- # disable git fetch of kvmtool
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
- # disable git fetch of qemu
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
-'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
-'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
-'$(QEMU_CONF_STAMP): get_qemu_sources\n\n'\
-'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' \
- -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
- -i stage1/usr_from_kvm/qemu.mk || die
-
- # disable fetch of kernel sources
- sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
- -i stage1/usr_from_kvm/kernel.mk || die
-
- if use rkt_stage1_host; then
- # Make systemdUnitsPath consistent with host
- sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
- -i stage1/init/init.go || die
- fi
-
- if use rkt_stage1_kvm_qemu; then
- sed '1i#include <sys/sysmacros.h>' -i "${WORKDIR}/qemu-${QEMU_VERSION#v}/hw/9pfs/9p.c" || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- local flavors hypervisors myeconfargs=(
- --with-stage1-default-images-directory="/usr/share/rkt"
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
- )
-
- use systemd || myeconfargs+=( --enable-sdjournal=no )
-
- # enable flavors (first is default)
- use rkt_stage1_host && flavors+=",host"
- use rkt_stage1_src && flavors+=",src"
- use rkt_stage1_coreos && flavors+=",coreos"
- use rkt_stage1_fly && flavors+=",fly"
- { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
- if use rkt_stage1_src; then
- myeconfargs+=(
- --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
- --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
- )
- fi
-
- if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- myeconfargs+=(
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
- )
- fi
-
- if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
- use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
- myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
- fi
-
- # Go's 6l linker does not support PIE, disable so cgo binaries
- # which use 6l+gcc for linking can be built correctly.
- if gcc-specs-pie; then
- append-ldflags -nopie
- fi
-
- export CC=$(tc-getCC)
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export BUILDDIR
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- local arch=${ARCH}
- case ${arch} in
- amd64) arch=x86_64;;
- esac
- ARCH=${arch} emake V=3
- ARCH=${arch} emake V=3 bash-completion
-}
-
-src_install() {
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
- use actool && dobin "${S}/${BUILDDIR}/tools/actool"
-
- dobin "${S}/${BUILDDIR}/target/bin/rkt"
-
- insinto /usr/share/rkt
- doins "${S}/${BUILDDIR}/target/bin/"*.aci
-
- # create symlink for default stage1 image path
- if use rkt_stage1_host; then
- dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_src; then
- dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_coreos; then
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_fly; then
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_lkvm; then
- dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_qemu; then
- dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
- fi
-
- systemd_dounit "${S}"/dist/init/systemd/*.service \
- "${S}"/dist/init/systemd/*.timer \
- "${S}"/dist/init/systemd/*.socket
-
- insinto /usr/lib/tmpfiles.d
- doins "${S}"/dist/init/systemd/tmpfiles.d/*
-
- newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
-
- keepdir /etc/${PN}
- fowners :rkt-admin /etc/${PN}
- fperms 2775 /etc/${PN}
-}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2017-10-29 22:43 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2017-10-29 22:43 UTC (permalink / raw
To: gentoo-commits
commit: dc2a8e235dc64cf77dcf63bdbfd4df0b2265c70a
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 29 22:33:15 2017 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Oct 29 22:43:23 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc2a8e23
app-emulation/rkt: new linux headers lkvm fix (bug 635274)
Closes: https://bugs.gentoo.org/635274
Package-Manager: Portage-2.3.13, Repoman-2.3.3
app-emulation/rkt/Manifest | 1 +
app-emulation/rkt/rkt-1.29.0.ebuild | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 970ac2ca3c7..b8c872f2c18 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,4 +1,5 @@
DIST kvmtool-cfae4d64482ed745214e3c62dd84b79c2ae0f325.tar.gz 245010 SHA256 4aad2913d66c7a3c308e0ca34c214307850b2556ab35999e7f86c253cb8bbf82 SHA512 7cca005136f3628dfef359f83732d6f8cc062c5e4a8d77f57c6dd5e007ed06c85f0c275c8844228b404755dbf3f4d45f6a149fc64235f4f1abe0058214e24730 WHIRLPOOL 341f9be7ff9517c822da00166cbf5334cf329f51895bb459c3e0bdda2f0c8724957bb79b354eadf9249b4c1f4b8d677c7c6ca57eaa04553804779ec8c53b37f4
+DIST kvmtool-include-asm-msr-index-1cc05b24bfe0211bb408f3264af8e0c42dcdde9c.patch 2168 SHA256 57e69616f1cb390dd2344245408b43f933617c82565da62ab497c4b2458abf6e SHA512 483acd3758cf66587a173da8e24ef127c04955742d292de663226ebd3a1f3ee41b24a966e771f066cd735d0bda77a15d09ca00a27d3de7130456c0eb3cf7cf5e WHIRLPOOL bde6d42e0b942d20d198bad9d5449f8322fbc2dd9da92005404a74718f9ccfb4993bce19c42b4515e2f0fe479e957f14098d76a35b3c1c1ed061ce3a121c7805
DIST kvmtool-include-sysmacros-c0a985531f49c06fd05069024f4664740e6a0baf.patch 1243 SHA256 dfb723ef66b9e9d6caf1e99e1e6d590b7c7d81d63dce22047cb735e8bc716629 SHA512 d8e9d6e656b51d8e4b3bf6939e927a4c11874dfb34b4d649adcbcaf44ec1f95af2bf73e138f94c53aa07cbd79db63a6ebf75f96861f8b13743c942523a3ff106 WHIRLPOOL b8ec75158d1e6ea2e53ec93f1c4dacb6783f5880c43d3ee8efe6bf0c2b8e8e0a0692fda5fd61ee9e889f8b383fa42e4b07518b91fddd5a8f5a4316b00925d85d
DIST linux-4.9.2.tar.xz 93189108 SHA256 8dda9aedd17ae0bf1e06ebb4b79082f83fb3ade45cbcc3ca4c30bf3faf085738 SHA512 85adf3715cba4a457efea8359ebed34413ac63ee58fe920c5713501dec1e727e167416e9d67a9e2d9430aa9f3a53ad0ac26a4f749984bc5a3f3c37ac504f75de WHIRLPOOL 74df775ab092a6be6684243d4c0d557c0ce27907c7e8ed97be54a45901e8f507deab1d5e72c35092884836f3fe446f838342ec0b53a3aa1c884489caadaf6a62
DIST qemu-2.8.0.tar.bz2 28368517 SHA256 dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62 SHA512 50f2988d822388ba9fd1bf5dbe68359033ed7432d7f0f9790299f32f63faa6dc72979256b5632ba572d47ee3e74ed40e3e8e331dc6303ec1599f1b4367cb78c2 WHIRLPOOL 0ce4e0539657eb832e4039819e7360c792b6aa41c718f0e0d762f4933217f0d370af94b1d6d9776853575b4a6811d8c85db069bf09d21bd15399ac8b50440ff5
diff --git a/app-emulation/rkt/rkt-1.29.0.ebuild b/app-emulation/rkt/rkt-1.29.0.ebuild
index 2d951cd3460..314f265ac19 100644
--- a/app-emulation/rkt/rkt-1.29.0.ebuild
+++ b/app-emulation/rkt/rkt-1.29.0.ebuild
@@ -24,6 +24,7 @@ rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
rkt_stage1_kvm_lkvm? (
https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/patch/?id=c0a985531f49c06fd05069024f4664740e6a0baf -> kvmtool-include-sysmacros-c0a985531f49c06fd05069024f4664740e6a0baf.patch
+ https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/patch/?id=1cc05b24bfe0211bb408f3264af8e0c42dcdde9c -> kvmtool-include-asm-msr-index-1cc05b24bfe0211bb408f3264af8e0c42dcdde9c.patch
${SRC_URI_KVM}
)
rkt_stage1_kvm_qemu? (
@@ -77,7 +78,7 @@ src_unpack() {
for x in ${A}; do
case ${x} in
*.img|linux-*) continue ;;
- kvmtool-include-sysmacros-*) #627564
+ kvmtool-include-*) #627564 #635274
dest=${S}/stage1/usr_from_kvm/lkvm/patches
mkdir -p "${dest}" || die
cp "${DISTDIR}/${x}" "${dest}" || die
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2017-10-20 23:38 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2017-10-20 23:38 UTC (permalink / raw
To: gentoo-commits
commit: e215a151c50d4f7aa2d5c4c7420bd7ac9a01a162
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 20 22:34:37 2017 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Oct 20 23:38:01 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e215a151
app-emulation/rkt: version bump to 1.29.0
Package-Manager: Portage-2.3.12, Repoman-2.3.3
app-emulation/rkt/Manifest | 3 +
app-emulation/rkt/rkt-1.29.0.ebuild | 266 ++++++++++++++++++++++++++++++++++++
2 files changed, 269 insertions(+)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index d31af73e4e2..970ac2ca3c7 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -3,5 +3,8 @@ DIST kvmtool-include-sysmacros-c0a985531f49c06fd05069024f4664740e6a0baf.patch 12
DIST linux-4.9.2.tar.xz 93189108 SHA256 8dda9aedd17ae0bf1e06ebb4b79082f83fb3ade45cbcc3ca4c30bf3faf085738 SHA512 85adf3715cba4a457efea8359ebed34413ac63ee58fe920c5713501dec1e727e167416e9d67a9e2d9430aa9f3a53ad0ac26a4f749984bc5a3f3c37ac504f75de WHIRLPOOL 74df775ab092a6be6684243d4c0d557c0ce27907c7e8ed97be54a45901e8f507deab1d5e72c35092884836f3fe446f838342ec0b53a3aa1c884489caadaf6a62
DIST qemu-2.8.0.tar.bz2 28368517 SHA256 dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62 SHA512 50f2988d822388ba9fd1bf5dbe68359033ed7432d7f0f9790299f32f63faa6dc72979256b5632ba572d47ee3e74ed40e3e8e331dc6303ec1599f1b4367cb78c2 WHIRLPOOL 0ce4e0539657eb832e4039819e7360c792b6aa41c718f0e0d762f4933217f0d370af94b1d6d9776853575b4a6811d8c85db069bf09d21bd15399ac8b50440ff5
DIST rkt-1.28.1.tar.gz 3425099 SHA256 2610749f412ca697c57a797c8dd0024c4c215d7dd824599d8ed6f4297abd5e07 SHA512 02d47f4e95e5ff9dc82cd645f1c69bb1fe5ab856c32b3b29bcd74c0e96ae0b5831a610cbde04614d216e4f7387af54f904ebd31ddc3acc1d2cfa0178805fd811 WHIRLPOOL a7e1489b1295795fe3908e51f81be6db3ffd6b0ad17aa4828e7fb07551ea4a6b215fda9f6e4658aa5e7b4e36bcf3472aec8726e2751943c6b0a1aeb910ebe9cf
+DIST rkt-1.29.0.tar.gz 3434520 SHA256 d2d89db86b4b3a586a8288ba7becdb87370d4fbe7e12aa37e9b1e30a9f9c9b20 SHA512 a128abddb29a246b0afea8f7dc81d77aae1e8efaf4dae8fe92aa0f2855c4e4f9dcf7a6f01efa77500ed8a6723db83933c8d1973b284dc62f8e9e0e06b6a20f6d WHIRLPOOL 2fbfc7c7e5e4087d3413d76b8bc0a72b4e34a3ae5c89914c2d4cd1e76128917fd6efb329dca32fc994cb2339369f990e715fd0e66e4d5bdff7196ed98cfe1151
DIST rkt-pxe-1235.0.0.img 243713684 SHA256 988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315 SHA512 b19821c63b7b53a1aad3b6e279189f9ceed1f5db1a691d12a70eb7340cceb4c3fd4f7f61a913d9482aec5ce28740b9ee777f86a1ce54f597f50341d701372542 WHIRLPOOL f3905ce3a2a55a027197a2d11ca541323fdfd560d186b4a2c39a8f45e19811067d5de4fbd3656935b12787e1dec79d118d7a01d52a8ef7abd0dad4f38a222b1c
+DIST rkt-pxe-1478.0.0.img 264382497 SHA256 9897f9e78e207da42a75d03f7ff74c4400dce15843b752adcb3182ebe66c9868 SHA512 5f462b6223a141d72a38857fff26f4f70c0a36f21d1cc69623d946ba42f8b15fa994f222b1934cd16cc5b4e306cf5a8850295492dfb637f2a8fee8b774d7c1e4 WHIRLPOOL 6eed288afed99f26c892af4fdfea23bde5cb617918d34ba7132765bf11bdfc478f364b123d4c505d474740b5381b7f149dba856288ea59dbb5171782975d821b
DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
+DIST systemd-233.tar.gz 4660737 SHA256 8b3e99da3d4164b66581830a7f2436c0c8fe697b5fbdc3927bdb960646be0083 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e WHIRLPOOL ce19f6a546b8f899cfa952e49d47f063fd29186be4a53391bc30ea2c487eb2c140a74ad843a1dc499bb61bba3e9ca055613852291e38b85af5d79c59409dc176
diff --git a/app-emulation/rkt/rkt-1.29.0.ebuild b/app-emulation/rkt/rkt-1.29.0.ebuild
new file mode 100644
index 00000000000..2d951cd3460
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.29.0.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="1478.0.0"
+PXE_SYSTEMD_VERSION="v233"
+KVM_LINUX_VERSION="4.9.2"
+KVMTOOL_VERSION="cfae4d64482ed745214e3c62dd84b79c2ae0f325"
+QEMU_VERSION="v2.8.0"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
+"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm_lkvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/patch/?id=c0a985531f49c06fd05069024f4664740e6a0baf -> kvmtool-include-sysmacros-c0a985531f49c06fd05069024f4664740e6a0baf.patch
+ ${SRC_URI_KVM}
+)
+rkt_stage1_kvm_qemu? (
+ http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
+ ${SRC_URI_KVM}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
+
+DESCRIPTION="rkt is an App Container runtime for Linux"
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
+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"
+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"
+
+# Some tests fail.
+# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
+RESTRICT="test rkt_stage1_src? ( userpriv )"
+
+DEPEND=">=dev-lang/go-1.5
+ app-arch/cpio
+ app-crypt/trousers
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny
+ rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
+ rkt_stage1_kvm_qemu? (
+ sys-apps/attr[static-libs(+)]
+ sys-libs/libcap[static-libs(+)]
+ sys-libs/zlib[static-libs(+)]
+ >=x11-libs/pixman-0.28.0[static-libs(+)]
+ )"
+
+RDEPEND="!app-emulation/rocket
+ rkt_stage1_host? ( systemd? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ ) )"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+pkg_setup() {
+ enewgroup rkt-admin
+ enewgroup rkt
+}
+
+src_unpack() {
+ local dest x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-include-sysmacros-*) #627564
+ dest=${S}/stage1/usr_from_kvm/lkvm/patches
+ mkdir -p "${dest}" || die
+ cp "${DISTDIR}/${x}" "${dest}" || die
+ ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
+src_prepare() {
+ eapply_user
+
+ # This patch breaks linux kernel cc-option checks when the
+ # compiler doesn't recognize the -no-pie option.
+ rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
+
+ # avoid sdjournal include for bug 595874
+ if ! use systemd; then
+ sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
+ -i rkt/rkt.mk || die
+ fi
+
+ sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
+
+ # disable git fetch of systemd
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable git fetch of qemu
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
+'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
+'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
+'$(QEMU_CONF_STAMP): get_qemu_sources\n\n'\
+'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' \
+ -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
+ -i stage1/usr_from_kvm/qemu.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
+ if use rkt_stage1_kvm_qemu; then
+ sed '1i#include <sys/sysmacros.h>' -i "${WORKDIR}/qemu-${QEMU_VERSION#v}/hw/9pfs/9p.c" || die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ local flavors hypervisors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+ )
+
+ use systemd || myeconfargs+=( --enable-sdjournal=no )
+
+ # enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
+ use rkt_stage1_src && flavors+=",src"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_src; then
+ myeconfargs+=(
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+ )
+ fi
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
+ fi
+
+ if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
+ use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
+ myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} emake V=3
+ ARCH=${arch} emake V=3 bash-completion
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/tools/actool"
+
+ dobin "${S}/${BUILDDIR}/target/bin/rkt"
+
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/target/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_src; then
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_lkvm; then
+ dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_qemu; then
+ dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
+
+ systemd_dounit "${S}"/dist/init/systemd/*.service \
+ "${S}"/dist/init/systemd/*.timer \
+ "${S}"/dist/init/systemd/*.socket
+
+ insinto /usr/lib/tmpfiles.d
+ doins "${S}"/dist/init/systemd/tmpfiles.d/*
+
+ newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
+
+ keepdir /etc/${PN}
+ fowners :rkt-admin /etc/${PN}
+ fperms 2775 /etc/${PN}
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2017-10-20 23:04 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2017-10-20 23:04 UTC (permalink / raw
To: gentoo-commits
commit: dcda50fc19ecde9cd3a343b7c4fec5065dc7b9be
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 20 23:02:07 2017 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Oct 20 23:04:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcda50fc
app-emulation/rkt: fix to compile with glibc-2.25 (bug 580330)
Thanks to Dennis Schridde <devurandom <AT> gmx.net> for the
lkvm patch instructions.
Bug: https://bugs.gentoo.org/580330
Bug: https://bugs.gentoo.org/627564
Package-Manager: Portage-2.3.12, Repoman-2.3.3
app-emulation/rkt/Manifest | 1 +
app-emulation/rkt/rkt-1.28.1.ebuild | 12 +++++++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index e6aeda4effa..d31af73e4e2 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,4 +1,5 @@
DIST kvmtool-cfae4d64482ed745214e3c62dd84b79c2ae0f325.tar.gz 245010 SHA256 4aad2913d66c7a3c308e0ca34c214307850b2556ab35999e7f86c253cb8bbf82 SHA512 7cca005136f3628dfef359f83732d6f8cc062c5e4a8d77f57c6dd5e007ed06c85f0c275c8844228b404755dbf3f4d45f6a149fc64235f4f1abe0058214e24730 WHIRLPOOL 341f9be7ff9517c822da00166cbf5334cf329f51895bb459c3e0bdda2f0c8724957bb79b354eadf9249b4c1f4b8d677c7c6ca57eaa04553804779ec8c53b37f4
+DIST kvmtool-include-sysmacros-c0a985531f49c06fd05069024f4664740e6a0baf.patch 1243 SHA256 dfb723ef66b9e9d6caf1e99e1e6d590b7c7d81d63dce22047cb735e8bc716629 SHA512 d8e9d6e656b51d8e4b3bf6939e927a4c11874dfb34b4d649adcbcaf44ec1f95af2bf73e138f94c53aa07cbd79db63a6ebf75f96861f8b13743c942523a3ff106 WHIRLPOOL b8ec75158d1e6ea2e53ec93f1c4dacb6783f5880c43d3ee8efe6bf0c2b8e8e0a0692fda5fd61ee9e889f8b383fa42e4b07518b91fddd5a8f5a4316b00925d85d
DIST linux-4.9.2.tar.xz 93189108 SHA256 8dda9aedd17ae0bf1e06ebb4b79082f83fb3ade45cbcc3ca4c30bf3faf085738 SHA512 85adf3715cba4a457efea8359ebed34413ac63ee58fe920c5713501dec1e727e167416e9d67a9e2d9430aa9f3a53ad0ac26a4f749984bc5a3f3c37ac504f75de WHIRLPOOL 74df775ab092a6be6684243d4c0d557c0ce27907c7e8ed97be54a45901e8f507deab1d5e72c35092884836f3fe446f838342ec0b53a3aa1c884489caadaf6a62
DIST qemu-2.8.0.tar.bz2 28368517 SHA256 dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62 SHA512 50f2988d822388ba9fd1bf5dbe68359033ed7432d7f0f9790299f32f63faa6dc72979256b5632ba572d47ee3e74ed40e3e8e331dc6303ec1599f1b4367cb78c2 WHIRLPOOL 0ce4e0539657eb832e4039819e7360c792b6aa41c718f0e0d762f4933217f0d370af94b1d6d9776853575b4a6811d8c85db069bf09d21bd15399ac8b50440ff5
DIST rkt-1.28.1.tar.gz 3425099 SHA256 2610749f412ca697c57a797c8dd0024c4c215d7dd824599d8ed6f4297abd5e07 SHA512 02d47f4e95e5ff9dc82cd645f1c69bb1fe5ab856c32b3b29bcd74c0e96ae0b5831a610cbde04614d216e4f7387af54f904ebd31ddc3acc1d2cfa0178805fd811 WHIRLPOOL a7e1489b1295795fe3908e51f81be6db3ffd6b0ad17aa4828e7fb07551ea4a6b215fda9f6e4658aa5e7b4e36bcf3472aec8726e2751943c6b0a1aeb910ebe9cf
diff --git a/app-emulation/rkt/rkt-1.28.1.ebuild b/app-emulation/rkt/rkt-1.28.1.ebuild
index c15c8003546..ea1b51224b7 100644
--- a/app-emulation/rkt/rkt-1.28.1.ebuild
+++ b/app-emulation/rkt/rkt-1.28.1.ebuild
@@ -23,6 +23,7 @@ SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
rkt_stage1_kvm_lkvm? (
https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/patch/?id=c0a985531f49c06fd05069024f4664740e6a0baf -> kvmtool-include-sysmacros-c0a985531f49c06fd05069024f4664740e6a0baf.patch
${SRC_URI_KVM}
)
rkt_stage1_kvm_qemu? (
@@ -72,10 +73,15 @@ pkg_setup() {
}
src_unpack() {
- local x
+ local dest x
for x in ${A}; do
case ${x} in
*.img|linux-*) continue ;;
+ kvmtool-include-sysmacros-*) #627564
+ dest=${S}/stage1/usr_from_kvm/lkvm/patches
+ mkdir -p "${dest}" || die
+ cp "${DISTDIR}/${x}" "${dest}" || die
+ ;;
kvmtool-*)
mkdir kvmtool || die
pushd kvmtool >/dev/null || die
@@ -150,6 +156,10 @@ src_prepare() {
-i stage1/init/init.go || die
fi
+ if use rkt_stage1_kvm_qemu; then
+ sed '1i#include <sys/sysmacros.h>' -i "${WORKDIR}/qemu-${QEMU_VERSION#v}/hw/9pfs/9p.c" || die
+ fi
+
eautoreconf
}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2017-10-20 21:48 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2017-10-20 21:48 UTC (permalink / raw
To: gentoo-commits
commit: b9ba3798585a3a676ec547595933ac177680351c
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 20 21:48:25 2017 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Oct 20 21:48:46 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9ba3798
app-emulation/rkt: remove old version 1.27.0
Package-Manager: Portage-2.3.12, Repoman-2.3.3
app-emulation/rkt/Manifest | 1 -
app-emulation/rkt/rkt-1.27.0.ebuild | 256 ------------------------------------
2 files changed, 257 deletions(-)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 7aca140a010..e6aeda4effa 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,7 +1,6 @@
DIST kvmtool-cfae4d64482ed745214e3c62dd84b79c2ae0f325.tar.gz 245010 SHA256 4aad2913d66c7a3c308e0ca34c214307850b2556ab35999e7f86c253cb8bbf82 SHA512 7cca005136f3628dfef359f83732d6f8cc062c5e4a8d77f57c6dd5e007ed06c85f0c275c8844228b404755dbf3f4d45f6a149fc64235f4f1abe0058214e24730 WHIRLPOOL 341f9be7ff9517c822da00166cbf5334cf329f51895bb459c3e0bdda2f0c8724957bb79b354eadf9249b4c1f4b8d677c7c6ca57eaa04553804779ec8c53b37f4
DIST linux-4.9.2.tar.xz 93189108 SHA256 8dda9aedd17ae0bf1e06ebb4b79082f83fb3ade45cbcc3ca4c30bf3faf085738 SHA512 85adf3715cba4a457efea8359ebed34413ac63ee58fe920c5713501dec1e727e167416e9d67a9e2d9430aa9f3a53ad0ac26a4f749984bc5a3f3c37ac504f75de WHIRLPOOL 74df775ab092a6be6684243d4c0d557c0ce27907c7e8ed97be54a45901e8f507deab1d5e72c35092884836f3fe446f838342ec0b53a3aa1c884489caadaf6a62
DIST qemu-2.8.0.tar.bz2 28368517 SHA256 dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62 SHA512 50f2988d822388ba9fd1bf5dbe68359033ed7432d7f0f9790299f32f63faa6dc72979256b5632ba572d47ee3e74ed40e3e8e331dc6303ec1599f1b4367cb78c2 WHIRLPOOL 0ce4e0539657eb832e4039819e7360c792b6aa41c718f0e0d762f4933217f0d370af94b1d6d9776853575b4a6811d8c85db069bf09d21bd15399ac8b50440ff5
-DIST rkt-1.27.0.tar.gz 3423285 SHA256 213427c551ddc912622e967b30437e13485b88dcf7021c977a3205a1b03801a1 SHA512 8884683ed1bd456542f61f407509db1664589f05732b4c179954781fb847d00d311e973f7646b07eb5685e437793dc4e265686f5bb91b6131dd101466d21ab40 WHIRLPOOL b2fb1715ab1eea03a0c7345c9502f984116fe3ab3f394d9e9ab237dbedc4c902dd7790c99c3dabc80c124c7ebaf76aa21b53e7c42e13be0df53d7fdf4ba308bf
DIST rkt-1.28.1.tar.gz 3425099 SHA256 2610749f412ca697c57a797c8dd0024c4c215d7dd824599d8ed6f4297abd5e07 SHA512 02d47f4e95e5ff9dc82cd645f1c69bb1fe5ab856c32b3b29bcd74c0e96ae0b5831a610cbde04614d216e4f7387af54f904ebd31ddc3acc1d2cfa0178805fd811 WHIRLPOOL a7e1489b1295795fe3908e51f81be6db3ffd6b0ad17aa4828e7fb07551ea4a6b215fda9f6e4658aa5e7b4e36bcf3472aec8726e2751943c6b0a1aeb910ebe9cf
DIST rkt-pxe-1235.0.0.img 243713684 SHA256 988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315 SHA512 b19821c63b7b53a1aad3b6e279189f9ceed1f5db1a691d12a70eb7340cceb4c3fd4f7f61a913d9482aec5ce28740b9ee777f86a1ce54f597f50341d701372542 WHIRLPOOL f3905ce3a2a55a027197a2d11ca541323fdfd560d186b4a2c39a8f45e19811067d5de4fbd3656935b12787e1dec79d118d7a01d52a8ef7abd0dad4f38a222b1c
DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
diff --git a/app-emulation/rkt/rkt-1.27.0.ebuild b/app-emulation/rkt/rkt-1.27.0.ebuild
deleted file mode 100644
index c15c8003546..00000000000
--- a/app-emulation/rkt/rkt-1.27.0.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="1235.0.0"
-PXE_SYSTEMD_VERSION="v231"
-KVM_LINUX_VERSION="4.9.2"
-KVMTOOL_VERSION="cfae4d64482ed745214e3c62dd84b79c2ae0f325"
-QEMU_VERSION="v2.8.0"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
- ${PXE_URI} -> ${PXE_FILE}
-"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm_lkvm? (
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
- ${SRC_URI_KVM}
-)
-rkt_stage1_kvm_qemu? (
- http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
- ${SRC_URI_KVM}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="rkt is an App Container runtime for Linux"
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
-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"
-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"
-
-# Some tests fail.
-# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
-RESTRICT="test rkt_stage1_src? ( userpriv )"
-
-DEPEND=">=dev-lang/go-1.5
- app-arch/cpio
- app-crypt/trousers
- sys-fs/squashfs-tools
- dev-perl/Capture-Tiny
- rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
- rkt_stage1_kvm_qemu? (
- sys-apps/attr[static-libs(+)]
- sys-libs/libcap[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- >=x11-libs/pixman-0.28.0[static-libs(+)]
- )"
-
-RDEPEND="!app-emulation/rocket
- rkt_stage1_host? ( systemd? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- ) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-pkg_setup() {
- enewgroup rkt-admin
- enewgroup rkt
-}
-
-src_unpack() {
- local x
- for x in ${A}; do
- case ${x} in
- *.img|linux-*) continue ;;
- kvmtool-*)
- mkdir kvmtool || die
- pushd kvmtool >/dev/null || die
- unpack ${x}
- popd >/dev/null || die
- ;;
- *)
- unpack ${x}
- esac
- done
-}
-
-src_prepare() {
- eapply_user
-
- # This patch breaks linux kernel cc-option checks when the
- # compiler doesn't recognize the -no-pie option.
- rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
-
- # avoid sdjournal include for bug 595874
- if ! use systemd; then
- sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
- -i rkt/rkt.mk || die
- fi
-
- sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
-
- # disable git fetch of systemd
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
- # disable git fetch of kvmtool
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
- # disable git fetch of qemu
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
-'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
-'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
-'$(QEMU_CONF_STAMP): get_qemu_sources\n\n'\
-'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' \
- -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
- -i stage1/usr_from_kvm/qemu.mk || die
-
- # disable fetch of kernel sources
- sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
- -i stage1/usr_from_kvm/kernel.mk || die
-
- if use rkt_stage1_host; then
- # Make systemdUnitsPath consistent with host
- sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
- -i stage1/init/init.go || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- local flavors hypervisors myeconfargs=(
- --with-stage1-default-images-directory="/usr/share/rkt"
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
- )
-
- use systemd || myeconfargs+=( --enable-sdjournal=no )
-
- # enable flavors (first is default)
- use rkt_stage1_host && flavors+=",host"
- use rkt_stage1_src && flavors+=",src"
- use rkt_stage1_coreos && flavors+=",coreos"
- use rkt_stage1_fly && flavors+=",fly"
- { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
- if use rkt_stage1_src; then
- myeconfargs+=(
- --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
- --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
- )
- fi
-
- if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- myeconfargs+=(
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
- )
- fi
-
- if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
- use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
- myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
- fi
-
- # Go's 6l linker does not support PIE, disable so cgo binaries
- # which use 6l+gcc for linking can be built correctly.
- if gcc-specs-pie; then
- append-ldflags -nopie
- fi
-
- export CC=$(tc-getCC)
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export BUILDDIR
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- local arch=${ARCH}
- case ${arch} in
- amd64) arch=x86_64;;
- esac
- ARCH=${arch} emake V=3
- ARCH=${arch} emake V=3 bash-completion
-}
-
-src_install() {
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
- use actool && dobin "${S}/${BUILDDIR}/tools/actool"
-
- dobin "${S}/${BUILDDIR}/target/bin/rkt"
-
- insinto /usr/share/rkt
- doins "${S}/${BUILDDIR}/target/bin/"*.aci
-
- # create symlink for default stage1 image path
- if use rkt_stage1_host; then
- dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_src; then
- dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_coreos; then
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_fly; then
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_lkvm; then
- dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_qemu; then
- dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
- fi
-
- systemd_dounit "${S}"/dist/init/systemd/*.service \
- "${S}"/dist/init/systemd/*.timer \
- "${S}"/dist/init/systemd/*.socket
-
- insinto /usr/lib/tmpfiles.d
- doins "${S}"/dist/init/systemd/tmpfiles.d/*
-
- newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
-
- keepdir /etc/${PN}
- fowners :rkt-admin /etc/${PN}
- fperms 2775 /etc/${PN}
-}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2017-08-11 3:21 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2017-08-11 3:21 UTC (permalink / raw
To: gentoo-commits
commit: 791314d6198aeeefd7e5a8c54d07226ef28b4cf6
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 11 03:20:46 2017 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 03:21:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=791314d6
app-emulation/rkt: version bump to 1.28.1
Package-Manager: Portage-2.3.6, Repoman-2.3.2
app-emulation/rkt/Manifest | 1 +
app-emulation/rkt/rkt-1.28.1.ebuild | 256 ++++++++++++++++++++++++++++++++++++
2 files changed, 257 insertions(+)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 83ac41fdebc..7aca140a010 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -2,5 +2,6 @@ DIST kvmtool-cfae4d64482ed745214e3c62dd84b79c2ae0f325.tar.gz 245010 SHA256 4aad2
DIST linux-4.9.2.tar.xz 93189108 SHA256 8dda9aedd17ae0bf1e06ebb4b79082f83fb3ade45cbcc3ca4c30bf3faf085738 SHA512 85adf3715cba4a457efea8359ebed34413ac63ee58fe920c5713501dec1e727e167416e9d67a9e2d9430aa9f3a53ad0ac26a4f749984bc5a3f3c37ac504f75de WHIRLPOOL 74df775ab092a6be6684243d4c0d557c0ce27907c7e8ed97be54a45901e8f507deab1d5e72c35092884836f3fe446f838342ec0b53a3aa1c884489caadaf6a62
DIST qemu-2.8.0.tar.bz2 28368517 SHA256 dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62 SHA512 50f2988d822388ba9fd1bf5dbe68359033ed7432d7f0f9790299f32f63faa6dc72979256b5632ba572d47ee3e74ed40e3e8e331dc6303ec1599f1b4367cb78c2 WHIRLPOOL 0ce4e0539657eb832e4039819e7360c792b6aa41c718f0e0d762f4933217f0d370af94b1d6d9776853575b4a6811d8c85db069bf09d21bd15399ac8b50440ff5
DIST rkt-1.27.0.tar.gz 3423285 SHA256 213427c551ddc912622e967b30437e13485b88dcf7021c977a3205a1b03801a1 SHA512 8884683ed1bd456542f61f407509db1664589f05732b4c179954781fb847d00d311e973f7646b07eb5685e437793dc4e265686f5bb91b6131dd101466d21ab40 WHIRLPOOL b2fb1715ab1eea03a0c7345c9502f984116fe3ab3f394d9e9ab237dbedc4c902dd7790c99c3dabc80c124c7ebaf76aa21b53e7c42e13be0df53d7fdf4ba308bf
+DIST rkt-1.28.1.tar.gz 3425099 SHA256 2610749f412ca697c57a797c8dd0024c4c215d7dd824599d8ed6f4297abd5e07 SHA512 02d47f4e95e5ff9dc82cd645f1c69bb1fe5ab856c32b3b29bcd74c0e96ae0b5831a610cbde04614d216e4f7387af54f904ebd31ddc3acc1d2cfa0178805fd811 WHIRLPOOL a7e1489b1295795fe3908e51f81be6db3ffd6b0ad17aa4828e7fb07551ea4a6b215fda9f6e4658aa5e7b4e36bcf3472aec8726e2751943c6b0a1aeb910ebe9cf
DIST rkt-pxe-1235.0.0.img 243713684 SHA256 988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315 SHA512 b19821c63b7b53a1aad3b6e279189f9ceed1f5db1a691d12a70eb7340cceb4c3fd4f7f61a913d9482aec5ce28740b9ee777f86a1ce54f597f50341d701372542 WHIRLPOOL f3905ce3a2a55a027197a2d11ca541323fdfd560d186b4a2c39a8f45e19811067d5de4fbd3656935b12787e1dec79d118d7a01d52a8ef7abd0dad4f38a222b1c
DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
diff --git a/app-emulation/rkt/rkt-1.28.1.ebuild b/app-emulation/rkt/rkt-1.28.1.ebuild
new file mode 100644
index 00000000000..c15c8003546
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.28.1.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="1235.0.0"
+PXE_SYSTEMD_VERSION="v231"
+KVM_LINUX_VERSION="4.9.2"
+KVMTOOL_VERSION="cfae4d64482ed745214e3c62dd84b79c2ae0f325"
+QEMU_VERSION="v2.8.0"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
+"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm_lkvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ ${SRC_URI_KVM}
+)
+rkt_stage1_kvm_qemu? (
+ http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
+ ${SRC_URI_KVM}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
+
+DESCRIPTION="rkt is an App Container runtime for Linux"
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
+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"
+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"
+
+# Some tests fail.
+# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
+RESTRICT="test rkt_stage1_src? ( userpriv )"
+
+DEPEND=">=dev-lang/go-1.5
+ app-arch/cpio
+ app-crypt/trousers
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny
+ rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
+ rkt_stage1_kvm_qemu? (
+ sys-apps/attr[static-libs(+)]
+ sys-libs/libcap[static-libs(+)]
+ sys-libs/zlib[static-libs(+)]
+ >=x11-libs/pixman-0.28.0[static-libs(+)]
+ )"
+
+RDEPEND="!app-emulation/rocket
+ rkt_stage1_host? ( systemd? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ ) )"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+pkg_setup() {
+ enewgroup rkt-admin
+ enewgroup rkt
+}
+
+src_unpack() {
+ local x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
+src_prepare() {
+ eapply_user
+
+ # This patch breaks linux kernel cc-option checks when the
+ # compiler doesn't recognize the -no-pie option.
+ rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
+
+ # avoid sdjournal include for bug 595874
+ if ! use systemd; then
+ sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
+ -i rkt/rkt.mk || die
+ fi
+
+ sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
+
+ # disable git fetch of systemd
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable git fetch of qemu
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
+'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
+'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
+'$(QEMU_CONF_STAMP): get_qemu_sources\n\n'\
+'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' \
+ -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
+ -i stage1/usr_from_kvm/qemu.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ local flavors hypervisors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+ )
+
+ use systemd || myeconfargs+=( --enable-sdjournal=no )
+
+ # enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
+ use rkt_stage1_src && flavors+=",src"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_src; then
+ myeconfargs+=(
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+ )
+ fi
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
+ fi
+
+ if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
+ use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
+ myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} emake V=3
+ ARCH=${arch} emake V=3 bash-completion
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/tools/actool"
+
+ dobin "${S}/${BUILDDIR}/target/bin/rkt"
+
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/target/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_src; then
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_lkvm; then
+ dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_qemu; then
+ dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
+
+ systemd_dounit "${S}"/dist/init/systemd/*.service \
+ "${S}"/dist/init/systemd/*.timer \
+ "${S}"/dist/init/systemd/*.socket
+
+ insinto /usr/lib/tmpfiles.d
+ doins "${S}"/dist/init/systemd/tmpfiles.d/*
+
+ newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
+
+ keepdir /etc/${PN}
+ fowners :rkt-admin /etc/${PN}
+ fperms 2775 /etc/${PN}
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2017-08-11 2:38 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2017-08-11 2:38 UTC (permalink / raw
To: gentoo-commits
commit: a289e52e4f74f1f1cc8a91cafe6681ce57755701
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 11 02:37:00 2017 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 02:38:46 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a289e52e
app-emulation/rkt: remove old versions
Package-Manager: Portage-2.3.6, Repoman-2.3.2
app-emulation/rkt/Manifest | 2 -
app-emulation/rkt/rkt-1.25.0.ebuild | 256 ------------------------------------
app-emulation/rkt/rkt-1.26.0.ebuild | 256 ------------------------------------
3 files changed, 514 deletions(-)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index e3bf7a73f6b..83ac41fdebc 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,8 +1,6 @@
DIST kvmtool-cfae4d64482ed745214e3c62dd84b79c2ae0f325.tar.gz 245010 SHA256 4aad2913d66c7a3c308e0ca34c214307850b2556ab35999e7f86c253cb8bbf82 SHA512 7cca005136f3628dfef359f83732d6f8cc062c5e4a8d77f57c6dd5e007ed06c85f0c275c8844228b404755dbf3f4d45f6a149fc64235f4f1abe0058214e24730 WHIRLPOOL 341f9be7ff9517c822da00166cbf5334cf329f51895bb459c3e0bdda2f0c8724957bb79b354eadf9249b4c1f4b8d677c7c6ca57eaa04553804779ec8c53b37f4
DIST linux-4.9.2.tar.xz 93189108 SHA256 8dda9aedd17ae0bf1e06ebb4b79082f83fb3ade45cbcc3ca4c30bf3faf085738 SHA512 85adf3715cba4a457efea8359ebed34413ac63ee58fe920c5713501dec1e727e167416e9d67a9e2d9430aa9f3a53ad0ac26a4f749984bc5a3f3c37ac504f75de WHIRLPOOL 74df775ab092a6be6684243d4c0d557c0ce27907c7e8ed97be54a45901e8f507deab1d5e72c35092884836f3fe446f838342ec0b53a3aa1c884489caadaf6a62
DIST qemu-2.8.0.tar.bz2 28368517 SHA256 dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62 SHA512 50f2988d822388ba9fd1bf5dbe68359033ed7432d7f0f9790299f32f63faa6dc72979256b5632ba572d47ee3e74ed40e3e8e331dc6303ec1599f1b4367cb78c2 WHIRLPOOL 0ce4e0539657eb832e4039819e7360c792b6aa41c718f0e0d762f4933217f0d370af94b1d6d9776853575b4a6811d8c85db069bf09d21bd15399ac8b50440ff5
-DIST rkt-1.25.0.tar.gz 3385268 SHA256 090da380ae8526d2a819f777fa983aee0df6254c37eb1fd74783d2d4c4ced359 SHA512 7f61ef5a8f5d04545ac2015b19667f45d91a3e04d923bc492e05a71dec14d6cf4e5ed6464ede0cfb538328a780e013aca3e5cd7e3d9cdc029736f5b6498b1f74 WHIRLPOOL cebe2a2f76a7571a540c417a8f7e30cc2b69d72a89814ef58699212455101fdbbbeab5370b7efa45b2298e5b43344488d410100363a8595cfa7bb11006c94ff8
-DIST rkt-1.26.0.tar.gz 3388455 SHA256 35dbecd8ff76bf538465fd783a7690519f32185330d9f4610f762ab19d956b3c SHA512 4386ec05905621ac500e50f8c3d3c10f884e6588dffb195521e59f17f24585e1b39c3180040f1851e4f545e24a82926a99c65f3ba792c43badd4d4e32c0d2f64 WHIRLPOOL 030969112c90befbcc1fc711d393523021180820b93ccd8f48da36253c5a841cd66f717e92181878251973a01fbaad098571211671122602271cc028a2994dfc
DIST rkt-1.27.0.tar.gz 3423285 SHA256 213427c551ddc912622e967b30437e13485b88dcf7021c977a3205a1b03801a1 SHA512 8884683ed1bd456542f61f407509db1664589f05732b4c179954781fb847d00d311e973f7646b07eb5685e437793dc4e265686f5bb91b6131dd101466d21ab40 WHIRLPOOL b2fb1715ab1eea03a0c7345c9502f984116fe3ab3f394d9e9ab237dbedc4c902dd7790c99c3dabc80c124c7ebaf76aa21b53e7c42e13be0df53d7fdf4ba308bf
DIST rkt-pxe-1235.0.0.img 243713684 SHA256 988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315 SHA512 b19821c63b7b53a1aad3b6e279189f9ceed1f5db1a691d12a70eb7340cceb4c3fd4f7f61a913d9482aec5ce28740b9ee777f86a1ce54f597f50341d701372542 WHIRLPOOL f3905ce3a2a55a027197a2d11ca541323fdfd560d186b4a2c39a8f45e19811067d5de4fbd3656935b12787e1dec79d118d7a01d52a8ef7abd0dad4f38a222b1c
DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
diff --git a/app-emulation/rkt/rkt-1.25.0.ebuild b/app-emulation/rkt/rkt-1.25.0.ebuild
deleted file mode 100644
index c15c8003546..00000000000
--- a/app-emulation/rkt/rkt-1.25.0.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="1235.0.0"
-PXE_SYSTEMD_VERSION="v231"
-KVM_LINUX_VERSION="4.9.2"
-KVMTOOL_VERSION="cfae4d64482ed745214e3c62dd84b79c2ae0f325"
-QEMU_VERSION="v2.8.0"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
- ${PXE_URI} -> ${PXE_FILE}
-"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm_lkvm? (
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
- ${SRC_URI_KVM}
-)
-rkt_stage1_kvm_qemu? (
- http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
- ${SRC_URI_KVM}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="rkt is an App Container runtime for Linux"
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
-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"
-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"
-
-# Some tests fail.
-# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
-RESTRICT="test rkt_stage1_src? ( userpriv )"
-
-DEPEND=">=dev-lang/go-1.5
- app-arch/cpio
- app-crypt/trousers
- sys-fs/squashfs-tools
- dev-perl/Capture-Tiny
- rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
- rkt_stage1_kvm_qemu? (
- sys-apps/attr[static-libs(+)]
- sys-libs/libcap[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- >=x11-libs/pixman-0.28.0[static-libs(+)]
- )"
-
-RDEPEND="!app-emulation/rocket
- rkt_stage1_host? ( systemd? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- ) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-pkg_setup() {
- enewgroup rkt-admin
- enewgroup rkt
-}
-
-src_unpack() {
- local x
- for x in ${A}; do
- case ${x} in
- *.img|linux-*) continue ;;
- kvmtool-*)
- mkdir kvmtool || die
- pushd kvmtool >/dev/null || die
- unpack ${x}
- popd >/dev/null || die
- ;;
- *)
- unpack ${x}
- esac
- done
-}
-
-src_prepare() {
- eapply_user
-
- # This patch breaks linux kernel cc-option checks when the
- # compiler doesn't recognize the -no-pie option.
- rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
-
- # avoid sdjournal include for bug 595874
- if ! use systemd; then
- sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
- -i rkt/rkt.mk || die
- fi
-
- sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
-
- # disable git fetch of systemd
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
- # disable git fetch of kvmtool
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
- # disable git fetch of qemu
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
-'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
-'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
-'$(QEMU_CONF_STAMP): get_qemu_sources\n\n'\
-'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' \
- -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
- -i stage1/usr_from_kvm/qemu.mk || die
-
- # disable fetch of kernel sources
- sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
- -i stage1/usr_from_kvm/kernel.mk || die
-
- if use rkt_stage1_host; then
- # Make systemdUnitsPath consistent with host
- sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
- -i stage1/init/init.go || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- local flavors hypervisors myeconfargs=(
- --with-stage1-default-images-directory="/usr/share/rkt"
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
- )
-
- use systemd || myeconfargs+=( --enable-sdjournal=no )
-
- # enable flavors (first is default)
- use rkt_stage1_host && flavors+=",host"
- use rkt_stage1_src && flavors+=",src"
- use rkt_stage1_coreos && flavors+=",coreos"
- use rkt_stage1_fly && flavors+=",fly"
- { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
- if use rkt_stage1_src; then
- myeconfargs+=(
- --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
- --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
- )
- fi
-
- if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- myeconfargs+=(
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
- )
- fi
-
- if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
- use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
- myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
- fi
-
- # Go's 6l linker does not support PIE, disable so cgo binaries
- # which use 6l+gcc for linking can be built correctly.
- if gcc-specs-pie; then
- append-ldflags -nopie
- fi
-
- export CC=$(tc-getCC)
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export BUILDDIR
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- local arch=${ARCH}
- case ${arch} in
- amd64) arch=x86_64;;
- esac
- ARCH=${arch} emake V=3
- ARCH=${arch} emake V=3 bash-completion
-}
-
-src_install() {
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
- use actool && dobin "${S}/${BUILDDIR}/tools/actool"
-
- dobin "${S}/${BUILDDIR}/target/bin/rkt"
-
- insinto /usr/share/rkt
- doins "${S}/${BUILDDIR}/target/bin/"*.aci
-
- # create symlink for default stage1 image path
- if use rkt_stage1_host; then
- dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_src; then
- dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_coreos; then
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_fly; then
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_lkvm; then
- dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_qemu; then
- dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
- fi
-
- systemd_dounit "${S}"/dist/init/systemd/*.service \
- "${S}"/dist/init/systemd/*.timer \
- "${S}"/dist/init/systemd/*.socket
-
- insinto /usr/lib/tmpfiles.d
- doins "${S}"/dist/init/systemd/tmpfiles.d/*
-
- newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
-
- keepdir /etc/${PN}
- fowners :rkt-admin /etc/${PN}
- fperms 2775 /etc/${PN}
-}
diff --git a/app-emulation/rkt/rkt-1.26.0.ebuild b/app-emulation/rkt/rkt-1.26.0.ebuild
deleted file mode 100644
index c15c8003546..00000000000
--- a/app-emulation/rkt/rkt-1.26.0.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="1235.0.0"
-PXE_SYSTEMD_VERSION="v231"
-KVM_LINUX_VERSION="4.9.2"
-KVMTOOL_VERSION="cfae4d64482ed745214e3c62dd84b79c2ae0f325"
-QEMU_VERSION="v2.8.0"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
- ${PXE_URI} -> ${PXE_FILE}
-"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm_lkvm? (
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
- ${SRC_URI_KVM}
-)
-rkt_stage1_kvm_qemu? (
- http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
- ${SRC_URI_KVM}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="rkt is an App Container runtime for Linux"
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
-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"
-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"
-
-# Some tests fail.
-# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
-RESTRICT="test rkt_stage1_src? ( userpriv )"
-
-DEPEND=">=dev-lang/go-1.5
- app-arch/cpio
- app-crypt/trousers
- sys-fs/squashfs-tools
- dev-perl/Capture-Tiny
- rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
- rkt_stage1_kvm_qemu? (
- sys-apps/attr[static-libs(+)]
- sys-libs/libcap[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- >=x11-libs/pixman-0.28.0[static-libs(+)]
- )"
-
-RDEPEND="!app-emulation/rocket
- rkt_stage1_host? ( systemd? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- ) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-pkg_setup() {
- enewgroup rkt-admin
- enewgroup rkt
-}
-
-src_unpack() {
- local x
- for x in ${A}; do
- case ${x} in
- *.img|linux-*) continue ;;
- kvmtool-*)
- mkdir kvmtool || die
- pushd kvmtool >/dev/null || die
- unpack ${x}
- popd >/dev/null || die
- ;;
- *)
- unpack ${x}
- esac
- done
-}
-
-src_prepare() {
- eapply_user
-
- # This patch breaks linux kernel cc-option checks when the
- # compiler doesn't recognize the -no-pie option.
- rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
-
- # avoid sdjournal include for bug 595874
- if ! use systemd; then
- sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
- -i rkt/rkt.mk || die
- fi
-
- sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
-
- # disable git fetch of systemd
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
- # disable git fetch of kvmtool
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
- # disable git fetch of qemu
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
-'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
-'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
-'$(QEMU_CONF_STAMP): get_qemu_sources\n\n'\
-'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' \
- -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
- -i stage1/usr_from_kvm/qemu.mk || die
-
- # disable fetch of kernel sources
- sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
- -i stage1/usr_from_kvm/kernel.mk || die
-
- if use rkt_stage1_host; then
- # Make systemdUnitsPath consistent with host
- sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
- -i stage1/init/init.go || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- local flavors hypervisors myeconfargs=(
- --with-stage1-default-images-directory="/usr/share/rkt"
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
- )
-
- use systemd || myeconfargs+=( --enable-sdjournal=no )
-
- # enable flavors (first is default)
- use rkt_stage1_host && flavors+=",host"
- use rkt_stage1_src && flavors+=",src"
- use rkt_stage1_coreos && flavors+=",coreos"
- use rkt_stage1_fly && flavors+=",fly"
- { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
- if use rkt_stage1_src; then
- myeconfargs+=(
- --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
- --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
- )
- fi
-
- if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- myeconfargs+=(
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
- )
- fi
-
- if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
- use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
- myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
- fi
-
- # Go's 6l linker does not support PIE, disable so cgo binaries
- # which use 6l+gcc for linking can be built correctly.
- if gcc-specs-pie; then
- append-ldflags -nopie
- fi
-
- export CC=$(tc-getCC)
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export BUILDDIR
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- local arch=${ARCH}
- case ${arch} in
- amd64) arch=x86_64;;
- esac
- ARCH=${arch} emake V=3
- ARCH=${arch} emake V=3 bash-completion
-}
-
-src_install() {
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
- use actool && dobin "${S}/${BUILDDIR}/tools/actool"
-
- dobin "${S}/${BUILDDIR}/target/bin/rkt"
-
- insinto /usr/share/rkt
- doins "${S}/${BUILDDIR}/target/bin/"*.aci
-
- # create symlink for default stage1 image path
- if use rkt_stage1_host; then
- dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_src; then
- dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_coreos; then
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_fly; then
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_lkvm; then
- dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_qemu; then
- dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
- fi
-
- systemd_dounit "${S}"/dist/init/systemd/*.service \
- "${S}"/dist/init/systemd/*.timer \
- "${S}"/dist/init/systemd/*.socket
-
- insinto /usr/lib/tmpfiles.d
- doins "${S}"/dist/init/systemd/tmpfiles.d/*
-
- newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
-
- keepdir /etc/${PN}
- fowners :rkt-admin /etc/${PN}
- fperms 2775 /etc/${PN}
-}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2017-07-18 22:30 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2017-07-18 22:30 UTC (permalink / raw
To: gentoo-commits
commit: d675c6e9b38040b88823d61497b2d457b96c429f
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 18 22:29:43 2017 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jul 18 22:30:43 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d675c6e9
app-emulation/rkt: fix REQUIRED_USE to comply with GLEP 73
Package-Manager: Portage-2.3.6, Repoman-2.3.2
app-emulation/rkt/rkt-1.25.0.ebuild | 2 +-
app-emulation/rkt/rkt-1.26.0.ebuild | 2 +-
app-emulation/rkt/rkt-1.27.0.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-emulation/rkt/rkt-1.25.0.ebuild b/app-emulation/rkt/rkt-1.25.0.ebuild
index 4b8e6287dcf..c15c8003546 100644
--- a/app-emulation/rkt/rkt-1.25.0.ebuild
+++ b/app-emulation/rkt/rkt-1.25.0.ebuild
@@ -38,7 +38,7 @@ LICENSE="Apache-2.0"
SLOT="0"
# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
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"
-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"
+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"
# Some tests fail.
# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
diff --git a/app-emulation/rkt/rkt-1.26.0.ebuild b/app-emulation/rkt/rkt-1.26.0.ebuild
index 4b8e6287dcf..c15c8003546 100644
--- a/app-emulation/rkt/rkt-1.26.0.ebuild
+++ b/app-emulation/rkt/rkt-1.26.0.ebuild
@@ -38,7 +38,7 @@ LICENSE="Apache-2.0"
SLOT="0"
# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
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"
-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"
+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"
# Some tests fail.
# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
diff --git a/app-emulation/rkt/rkt-1.27.0.ebuild b/app-emulation/rkt/rkt-1.27.0.ebuild
index 4b8e6287dcf..c15c8003546 100644
--- a/app-emulation/rkt/rkt-1.27.0.ebuild
+++ b/app-emulation/rkt/rkt-1.27.0.ebuild
@@ -38,7 +38,7 @@ LICENSE="Apache-2.0"
SLOT="0"
# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
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"
-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"
+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"
# Some tests fail.
# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2017-06-29 5:26 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2017-06-29 5:26 UTC (permalink / raw
To: gentoo-commits
commit: 7b0198bc81ac05044bcdd87a6416e6277a31b073
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 29 05:24:58 2017 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Jun 29 05:26:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b0198bc
app-emulation/rkt: version bump to 1.27.0
Package-Manager: Portage-2.3.6, Repoman-2.3.2
app-emulation/rkt/Manifest | 1 +
app-emulation/rkt/rkt-1.27.0.ebuild | 256 ++++++++++++++++++++++++++++++++++++
2 files changed, 257 insertions(+)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 09d65ec258d..e3bf7a73f6b 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -3,5 +3,6 @@ DIST linux-4.9.2.tar.xz 93189108 SHA256 8dda9aedd17ae0bf1e06ebb4b79082f83fb3ade4
DIST qemu-2.8.0.tar.bz2 28368517 SHA256 dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62 SHA512 50f2988d822388ba9fd1bf5dbe68359033ed7432d7f0f9790299f32f63faa6dc72979256b5632ba572d47ee3e74ed40e3e8e331dc6303ec1599f1b4367cb78c2 WHIRLPOOL 0ce4e0539657eb832e4039819e7360c792b6aa41c718f0e0d762f4933217f0d370af94b1d6d9776853575b4a6811d8c85db069bf09d21bd15399ac8b50440ff5
DIST rkt-1.25.0.tar.gz 3385268 SHA256 090da380ae8526d2a819f777fa983aee0df6254c37eb1fd74783d2d4c4ced359 SHA512 7f61ef5a8f5d04545ac2015b19667f45d91a3e04d923bc492e05a71dec14d6cf4e5ed6464ede0cfb538328a780e013aca3e5cd7e3d9cdc029736f5b6498b1f74 WHIRLPOOL cebe2a2f76a7571a540c417a8f7e30cc2b69d72a89814ef58699212455101fdbbbeab5370b7efa45b2298e5b43344488d410100363a8595cfa7bb11006c94ff8
DIST rkt-1.26.0.tar.gz 3388455 SHA256 35dbecd8ff76bf538465fd783a7690519f32185330d9f4610f762ab19d956b3c SHA512 4386ec05905621ac500e50f8c3d3c10f884e6588dffb195521e59f17f24585e1b39c3180040f1851e4f545e24a82926a99c65f3ba792c43badd4d4e32c0d2f64 WHIRLPOOL 030969112c90befbcc1fc711d393523021180820b93ccd8f48da36253c5a841cd66f717e92181878251973a01fbaad098571211671122602271cc028a2994dfc
+DIST rkt-1.27.0.tar.gz 3423285 SHA256 213427c551ddc912622e967b30437e13485b88dcf7021c977a3205a1b03801a1 SHA512 8884683ed1bd456542f61f407509db1664589f05732b4c179954781fb847d00d311e973f7646b07eb5685e437793dc4e265686f5bb91b6131dd101466d21ab40 WHIRLPOOL b2fb1715ab1eea03a0c7345c9502f984116fe3ab3f394d9e9ab237dbedc4c902dd7790c99c3dabc80c124c7ebaf76aa21b53e7c42e13be0df53d7fdf4ba308bf
DIST rkt-pxe-1235.0.0.img 243713684 SHA256 988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315 SHA512 b19821c63b7b53a1aad3b6e279189f9ceed1f5db1a691d12a70eb7340cceb4c3fd4f7f61a913d9482aec5ce28740b9ee777f86a1ce54f597f50341d701372542 WHIRLPOOL f3905ce3a2a55a027197a2d11ca541323fdfd560d186b4a2c39a8f45e19811067d5de4fbd3656935b12787e1dec79d118d7a01d52a8ef7abd0dad4f38a222b1c
DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
diff --git a/app-emulation/rkt/rkt-1.27.0.ebuild b/app-emulation/rkt/rkt-1.27.0.ebuild
new file mode 100644
index 00000000000..4b8e6287dcf
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.27.0.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="1235.0.0"
+PXE_SYSTEMD_VERSION="v231"
+KVM_LINUX_VERSION="4.9.2"
+KVMTOOL_VERSION="cfae4d64482ed745214e3c62dd84b79c2ae0f325"
+QEMU_VERSION="v2.8.0"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
+"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm_lkvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ ${SRC_URI_KVM}
+)
+rkt_stage1_kvm_qemu? (
+ http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
+ ${SRC_URI_KVM}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
+
+DESCRIPTION="rkt is an App Container runtime for Linux"
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
+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"
+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"
+
+# Some tests fail.
+# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
+RESTRICT="test rkt_stage1_src? ( userpriv )"
+
+DEPEND=">=dev-lang/go-1.5
+ app-arch/cpio
+ app-crypt/trousers
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny
+ rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
+ rkt_stage1_kvm_qemu? (
+ sys-apps/attr[static-libs(+)]
+ sys-libs/libcap[static-libs(+)]
+ sys-libs/zlib[static-libs(+)]
+ >=x11-libs/pixman-0.28.0[static-libs(+)]
+ )"
+
+RDEPEND="!app-emulation/rocket
+ rkt_stage1_host? ( systemd? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ ) )"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+pkg_setup() {
+ enewgroup rkt-admin
+ enewgroup rkt
+}
+
+src_unpack() {
+ local x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
+src_prepare() {
+ eapply_user
+
+ # This patch breaks linux kernel cc-option checks when the
+ # compiler doesn't recognize the -no-pie option.
+ rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
+
+ # avoid sdjournal include for bug 595874
+ if ! use systemd; then
+ sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
+ -i rkt/rkt.mk || die
+ fi
+
+ sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
+
+ # disable git fetch of systemd
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable git fetch of qemu
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
+'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
+'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
+'$(QEMU_CONF_STAMP): get_qemu_sources\n\n'\
+'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' \
+ -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
+ -i stage1/usr_from_kvm/qemu.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ local flavors hypervisors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+ )
+
+ use systemd || myeconfargs+=( --enable-sdjournal=no )
+
+ # enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
+ use rkt_stage1_src && flavors+=",src"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_src; then
+ myeconfargs+=(
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+ )
+ fi
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
+ fi
+
+ if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
+ use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
+ myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} emake V=3
+ ARCH=${arch} emake V=3 bash-completion
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/tools/actool"
+
+ dobin "${S}/${BUILDDIR}/target/bin/rkt"
+
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/target/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_src; then
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_lkvm; then
+ dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_qemu; then
+ dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
+
+ systemd_dounit "${S}"/dist/init/systemd/*.service \
+ "${S}"/dist/init/systemd/*.timer \
+ "${S}"/dist/init/systemd/*.socket
+
+ insinto /usr/lib/tmpfiles.d
+ doins "${S}"/dist/init/systemd/tmpfiles.d/*
+
+ newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
+
+ keepdir /etc/${PN}
+ fowners :rkt-admin /etc/${PN}
+ fperms 2775 /etc/${PN}
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2017-05-26 5:56 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2017-05-26 5:56 UTC (permalink / raw
To: gentoo-commits
commit: 5d53dc8ef6c0a13b2d6c2f4f0c1a0956ae03e1b1
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 04:43:19 2017 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri May 26 05:56:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d53dc8e
app-emulation/rkt: remove old versions
Package-Manager: Portage-2.3.6, Repoman-2.3.2
app-emulation/rkt/Manifest | 4 -
app-emulation/rkt/rkt-1.23.0.ebuild | 256 ------------------------------------
app-emulation/rkt/rkt-1.24.0.ebuild | 256 ------------------------------------
3 files changed, 516 deletions(-)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 59b063ed6af..df92e734eed 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,10 +1,6 @@
-DIST kvmtool-1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2.tar.gz 244571 SHA256 c72c0e3463a8f0cfe2cdaa8b8e7951f4eb7293c486e44f84b9e421073dbf5ab9 SHA512 13db2bf2ff794f34c2a825c9b1862c85b0f470c81e3d91177979302f921e3970b8dfaeaf54602005fba8903bba52e43b6e8d67edaa0ee8de82002db7b396c3a0 WHIRLPOOL 0904a5783ac27befb207a5fa0030baede68ae589b69abf012ec733ff2e6d9f77b7198273c22fa7404b2c78bcc9ae40abc39d002519700666ba1e54c6550525b2
DIST kvmtool-cfae4d64482ed745214e3c62dd84b79c2ae0f325.tar.gz 245010 SHA256 4aad2913d66c7a3c308e0ca34c214307850b2556ab35999e7f86c253cb8bbf82 SHA512 7cca005136f3628dfef359f83732d6f8cc062c5e4a8d77f57c6dd5e007ed06c85f0c275c8844228b404755dbf3f4d45f6a149fc64235f4f1abe0058214e24730 WHIRLPOOL 341f9be7ff9517c822da00166cbf5334cf329f51895bb459c3e0bdda2f0c8724957bb79b354eadf9249b4c1f4b8d677c7c6ca57eaa04553804779ec8c53b37f4
DIST linux-4.9.2.tar.xz 93189108 SHA256 8dda9aedd17ae0bf1e06ebb4b79082f83fb3ade45cbcc3ca4c30bf3faf085738 SHA512 85adf3715cba4a457efea8359ebed34413ac63ee58fe920c5713501dec1e727e167416e9d67a9e2d9430aa9f3a53ad0ac26a4f749984bc5a3f3c37ac504f75de WHIRLPOOL 74df775ab092a6be6684243d4c0d557c0ce27907c7e8ed97be54a45901e8f507deab1d5e72c35092884836f3fe446f838342ec0b53a3aa1c884489caadaf6a62
-DIST qemu-2.7.0.tar.bz2 26867760 SHA256 326e739506ba690daf69fc17bd3913a6c313d9928d743bd8eddb82f403f81e53 SHA512 654acaa7b3724a288e5d7e2a26ab780d9c9ed9f647fba00a906cbaffbe9d58fd666f2d962514aa2c5b391b4c53811ac3170d2eb51727f090bd19dfe45ca9a9db WHIRLPOOL dcb3e5f7da89dd8e14d636d7ebd476e076e0043880bb9ea3fb1c03cb4bcd4e5c7d3c4719da26c3ce521e3a3db5ae671e86f198ac1bc3474e774d75504fef8b8d
DIST qemu-2.8.0.tar.bz2 28368517 SHA256 dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62 SHA512 50f2988d822388ba9fd1bf5dbe68359033ed7432d7f0f9790299f32f63faa6dc72979256b5632ba572d47ee3e74ed40e3e8e331dc6303ec1599f1b4367cb78c2 WHIRLPOOL 0ce4e0539657eb832e4039819e7360c792b6aa41c718f0e0d762f4933217f0d370af94b1d6d9776853575b4a6811d8c85db069bf09d21bd15399ac8b50440ff5
-DIST rkt-1.23.0.tar.gz 3350060 SHA256 5cb10a0646e5cc8dccbd099c40bc6b11264591b30fa8e4113bc9e392feffcb2b SHA512 9673f70b385a4e5c61c037783071507e69097f0d0163b3d449ca129bcdc858bc177d38c6551dc9f8b2f074345b4698863bbe62bf4d6c83f5df515406011ddce3 WHIRLPOOL 7d2e7b20205e6e00992091bd3898094b27e75f9e4716c73a0a31df2747cb77c49b11678db478ed7414cf12eef8c3463afded0e2d2a0b93effb9cce0edbed799a
-DIST rkt-1.24.0.tar.gz 3359035 SHA256 ffeb9933d58a642a5dde4730eacde9a597345698120cf36283e02cf2ed085e2d SHA512 e5f30df83fc833f6a5f40c7e99207b38cbd01d078b26e9ea7d3587c3e57fe872e187850406fa5200c0245fb42b81223057eb561934004b57c3f2d57a31f3d269 WHIRLPOOL 842e58f90a676ee990c96e0dd4da42aad03dfb9201e7282565ce4f293a697ccb300a398ca66b14fe4ca73d5f4943582f58742a59098c091dcaf0a5bd1b094a6f
DIST rkt-1.25.0.tar.gz 3385268 SHA256 090da380ae8526d2a819f777fa983aee0df6254c37eb1fd74783d2d4c4ced359 SHA512 7f61ef5a8f5d04545ac2015b19667f45d91a3e04d923bc492e05a71dec14d6cf4e5ed6464ede0cfb538328a780e013aca3e5cd7e3d9cdc029736f5b6498b1f74 WHIRLPOOL cebe2a2f76a7571a540c417a8f7e30cc2b69d72a89814ef58699212455101fdbbbeab5370b7efa45b2298e5b43344488d410100363a8595cfa7bb11006c94ff8
DIST rkt-pxe-1235.0.0.img 243713684 SHA256 988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315 SHA512 b19821c63b7b53a1aad3b6e279189f9ceed1f5db1a691d12a70eb7340cceb4c3fd4f7f61a913d9482aec5ce28740b9ee777f86a1ce54f597f50341d701372542 WHIRLPOOL f3905ce3a2a55a027197a2d11ca541323fdfd560d186b4a2c39a8f45e19811067d5de4fbd3656935b12787e1dec79d118d7a01d52a8ef7abd0dad4f38a222b1c
DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
diff --git a/app-emulation/rkt/rkt-1.23.0.ebuild b/app-emulation/rkt/rkt-1.23.0.ebuild
deleted file mode 100644
index 0b9f1bcf4fc..00000000000
--- a/app-emulation/rkt/rkt-1.23.0.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="1235.0.0"
-PXE_SYSTEMD_VERSION="v231"
-KVM_LINUX_VERSION="4.9.2"
-KVMTOOL_VERSION="1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2"
-QEMU_VERSION="v2.7.0"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
- ${PXE_URI} -> ${PXE_FILE}
-"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm_lkvm? (
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
- ${SRC_URI_KVM}
-)
-rkt_stage1_kvm_qemu? (
- http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
- ${SRC_URI_KVM}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="rkt is an App Container runtime for Linux"
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
-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"
-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"
-
-# Some tests fail.
-# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
-RESTRICT="test rkt_stage1_src? ( userpriv )"
-
-DEPEND=">=dev-lang/go-1.5
- app-arch/cpio
- app-crypt/trousers
- sys-fs/squashfs-tools
- dev-perl/Capture-Tiny
- rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
- rkt_stage1_kvm_qemu? (
- sys-apps/attr[static-libs(+)]
- sys-libs/libcap[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- >=x11-libs/pixman-0.28.0[static-libs(+)]
- )"
-
-RDEPEND="!app-emulation/rocket
- rkt_stage1_host? ( systemd? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- ) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-pkg_setup() {
- enewgroup rkt-admin
- enewgroup rkt
-}
-
-src_unpack() {
- local x
- for x in ${A}; do
- case ${x} in
- *.img|linux-*) continue ;;
- kvmtool-*)
- mkdir kvmtool || die
- pushd kvmtool >/dev/null || die
- unpack ${x}
- popd >/dev/null || die
- ;;
- *)
- unpack ${x}
- esac
- done
-}
-
-src_prepare() {
- eapply_user
-
- # This patch breaks linux kernel cc-option checks when the
- # compiler doesn't recognize the -no-pie option.
- rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
-
- # avoid sdjournal include for bug 595874
- if ! use systemd; then
- sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
- -i rkt/rkt.mk || die
- fi
-
- sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
-
- # disable git fetch of systemd
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
- # disable git fetch of kvmtool
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
- # disable git fetch of qemu
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
-'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
-'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
-'$(QEMU_CONF_STAMP): get_qemu_sources\n\n'\
-'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' \
- -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
- -i stage1/usr_from_kvm/qemu.mk || die
-
- # disable fetch of kernel sources
- sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
- -i stage1/usr_from_kvm/kernel.mk || die
-
- if use rkt_stage1_host; then
- # Make systemdUnitsPath consistent with host
- sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
- -i stage1/init/init.go || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- local flavors hypervisors myeconfargs=(
- --with-stage1-default-images-directory="/usr/share/rkt"
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
- )
-
- use systemd || myeconfargs+=( --enable-sdjournal=no )
-
- # enable flavors (first is default)
- use rkt_stage1_host && flavors+=",host"
- use rkt_stage1_src && flavors+=",src"
- use rkt_stage1_coreos && flavors+=",coreos"
- use rkt_stage1_fly && flavors+=",fly"
- { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
- if use rkt_stage1_src; then
- myeconfargs+=(
- --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
- --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
- )
- fi
-
- if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- myeconfargs+=(
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
- )
- fi
-
- if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
- use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
- myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
- fi
-
- # Go's 6l linker does not support PIE, disable so cgo binaries
- # which use 6l+gcc for linking can be built correctly.
- if gcc-specs-pie; then
- append-ldflags -nopie
- fi
-
- export CC=$(tc-getCC)
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export BUILDDIR
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- local arch=${ARCH}
- case ${arch} in
- amd64) arch=x86_64;;
- esac
- ARCH=${arch} emake V=3
- ARCH=${arch} emake V=3 bash-completion
-}
-
-src_install() {
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
- use actool && dobin "${S}/${BUILDDIR}/tools/actool"
-
- dobin "${S}/${BUILDDIR}/target/bin/rkt"
-
- insinto /usr/share/rkt
- doins "${S}/${BUILDDIR}/target/bin/"*.aci
-
- # create symlink for default stage1 image path
- if use rkt_stage1_host; then
- dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_src; then
- dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_coreos; then
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_fly; then
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_lkvm; then
- dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_qemu; then
- dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
- fi
-
- systemd_dounit "${S}"/dist/init/systemd/*.service \
- "${S}"/dist/init/systemd/*.timer \
- "${S}"/dist/init/systemd/*.socket
-
- insinto /usr/lib/tmpfiles.d
- doins "${S}"/dist/init/systemd/tmpfiles.d/*
-
- newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
-
- keepdir /etc/${PN}
- fowners :rkt-admin /etc/${PN}
- fperms 2775 /etc/${PN}
-}
diff --git a/app-emulation/rkt/rkt-1.24.0.ebuild b/app-emulation/rkt/rkt-1.24.0.ebuild
deleted file mode 100644
index 4b8e6287dcf..00000000000
--- a/app-emulation/rkt/rkt-1.24.0.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="1235.0.0"
-PXE_SYSTEMD_VERSION="v231"
-KVM_LINUX_VERSION="4.9.2"
-KVMTOOL_VERSION="cfae4d64482ed745214e3c62dd84b79c2ae0f325"
-QEMU_VERSION="v2.8.0"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
- ${PXE_URI} -> ${PXE_FILE}
-"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm_lkvm? (
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
- ${SRC_URI_KVM}
-)
-rkt_stage1_kvm_qemu? (
- http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
- ${SRC_URI_KVM}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="rkt is an App Container runtime for Linux"
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
-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"
-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"
-
-# Some tests fail.
-# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
-RESTRICT="test rkt_stage1_src? ( userpriv )"
-
-DEPEND=">=dev-lang/go-1.5
- app-arch/cpio
- app-crypt/trousers
- sys-fs/squashfs-tools
- dev-perl/Capture-Tiny
- rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
- rkt_stage1_kvm_qemu? (
- sys-apps/attr[static-libs(+)]
- sys-libs/libcap[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- >=x11-libs/pixman-0.28.0[static-libs(+)]
- )"
-
-RDEPEND="!app-emulation/rocket
- rkt_stage1_host? ( systemd? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- ) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-pkg_setup() {
- enewgroup rkt-admin
- enewgroup rkt
-}
-
-src_unpack() {
- local x
- for x in ${A}; do
- case ${x} in
- *.img|linux-*) continue ;;
- kvmtool-*)
- mkdir kvmtool || die
- pushd kvmtool >/dev/null || die
- unpack ${x}
- popd >/dev/null || die
- ;;
- *)
- unpack ${x}
- esac
- done
-}
-
-src_prepare() {
- eapply_user
-
- # This patch breaks linux kernel cc-option checks when the
- # compiler doesn't recognize the -no-pie option.
- rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
-
- # avoid sdjournal include for bug 595874
- if ! use systemd; then
- sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
- -i rkt/rkt.mk || die
- fi
-
- sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
-
- # disable git fetch of systemd
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
- # disable git fetch of kvmtool
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
- # disable git fetch of qemu
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
-'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
-'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
-'$(QEMU_CONF_STAMP): get_qemu_sources\n\n'\
-'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' \
- -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
- -i stage1/usr_from_kvm/qemu.mk || die
-
- # disable fetch of kernel sources
- sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
- -i stage1/usr_from_kvm/kernel.mk || die
-
- if use rkt_stage1_host; then
- # Make systemdUnitsPath consistent with host
- sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
- -i stage1/init/init.go || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- local flavors hypervisors myeconfargs=(
- --with-stage1-default-images-directory="/usr/share/rkt"
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
- )
-
- use systemd || myeconfargs+=( --enable-sdjournal=no )
-
- # enable flavors (first is default)
- use rkt_stage1_host && flavors+=",host"
- use rkt_stage1_src && flavors+=",src"
- use rkt_stage1_coreos && flavors+=",coreos"
- use rkt_stage1_fly && flavors+=",fly"
- { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
- if use rkt_stage1_src; then
- myeconfargs+=(
- --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
- --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
- )
- fi
-
- if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- myeconfargs+=(
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
- )
- fi
-
- if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
- use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
- myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
- fi
-
- # Go's 6l linker does not support PIE, disable so cgo binaries
- # which use 6l+gcc for linking can be built correctly.
- if gcc-specs-pie; then
- append-ldflags -nopie
- fi
-
- export CC=$(tc-getCC)
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export BUILDDIR
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- local arch=${ARCH}
- case ${arch} in
- amd64) arch=x86_64;;
- esac
- ARCH=${arch} emake V=3
- ARCH=${arch} emake V=3 bash-completion
-}
-
-src_install() {
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
- use actool && dobin "${S}/${BUILDDIR}/tools/actool"
-
- dobin "${S}/${BUILDDIR}/target/bin/rkt"
-
- insinto /usr/share/rkt
- doins "${S}/${BUILDDIR}/target/bin/"*.aci
-
- # create symlink for default stage1 image path
- if use rkt_stage1_host; then
- dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_src; then
- dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_coreos; then
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_fly; then
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_lkvm; then
- dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_qemu; then
- dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
- fi
-
- systemd_dounit "${S}"/dist/init/systemd/*.service \
- "${S}"/dist/init/systemd/*.timer \
- "${S}"/dist/init/systemd/*.socket
-
- insinto /usr/lib/tmpfiles.d
- doins "${S}"/dist/init/systemd/tmpfiles.d/*
-
- newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
-
- keepdir /etc/${PN}
- fowners :rkt-admin /etc/${PN}
- fperms 2775 /etc/${PN}
-}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2017-05-26 5:56 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2017-05-26 5:56 UTC (permalink / raw
To: gentoo-commits
commit: 28f9a7b9b116d086ddf5e5543be1120f8f173c58
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 05:44:38 2017 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri May 26 05:56:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28f9a7b9
app-emulation/rkt: version bump to 1.26.0
Package-Manager: Portage-2.3.6, Repoman-2.3.2
app-emulation/rkt/Manifest | 1 +
app-emulation/rkt/rkt-1.26.0.ebuild | 256 ++++++++++++++++++++++++++++++++++++
2 files changed, 257 insertions(+)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index df92e734eed..09d65ec258d 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -2,5 +2,6 @@ DIST kvmtool-cfae4d64482ed745214e3c62dd84b79c2ae0f325.tar.gz 245010 SHA256 4aad2
DIST linux-4.9.2.tar.xz 93189108 SHA256 8dda9aedd17ae0bf1e06ebb4b79082f83fb3ade45cbcc3ca4c30bf3faf085738 SHA512 85adf3715cba4a457efea8359ebed34413ac63ee58fe920c5713501dec1e727e167416e9d67a9e2d9430aa9f3a53ad0ac26a4f749984bc5a3f3c37ac504f75de WHIRLPOOL 74df775ab092a6be6684243d4c0d557c0ce27907c7e8ed97be54a45901e8f507deab1d5e72c35092884836f3fe446f838342ec0b53a3aa1c884489caadaf6a62
DIST qemu-2.8.0.tar.bz2 28368517 SHA256 dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62 SHA512 50f2988d822388ba9fd1bf5dbe68359033ed7432d7f0f9790299f32f63faa6dc72979256b5632ba572d47ee3e74ed40e3e8e331dc6303ec1599f1b4367cb78c2 WHIRLPOOL 0ce4e0539657eb832e4039819e7360c792b6aa41c718f0e0d762f4933217f0d370af94b1d6d9776853575b4a6811d8c85db069bf09d21bd15399ac8b50440ff5
DIST rkt-1.25.0.tar.gz 3385268 SHA256 090da380ae8526d2a819f777fa983aee0df6254c37eb1fd74783d2d4c4ced359 SHA512 7f61ef5a8f5d04545ac2015b19667f45d91a3e04d923bc492e05a71dec14d6cf4e5ed6464ede0cfb538328a780e013aca3e5cd7e3d9cdc029736f5b6498b1f74 WHIRLPOOL cebe2a2f76a7571a540c417a8f7e30cc2b69d72a89814ef58699212455101fdbbbeab5370b7efa45b2298e5b43344488d410100363a8595cfa7bb11006c94ff8
+DIST rkt-1.26.0.tar.gz 3388455 SHA256 35dbecd8ff76bf538465fd783a7690519f32185330d9f4610f762ab19d956b3c SHA512 4386ec05905621ac500e50f8c3d3c10f884e6588dffb195521e59f17f24585e1b39c3180040f1851e4f545e24a82926a99c65f3ba792c43badd4d4e32c0d2f64 WHIRLPOOL 030969112c90befbcc1fc711d393523021180820b93ccd8f48da36253c5a841cd66f717e92181878251973a01fbaad098571211671122602271cc028a2994dfc
DIST rkt-pxe-1235.0.0.img 243713684 SHA256 988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315 SHA512 b19821c63b7b53a1aad3b6e279189f9ceed1f5db1a691d12a70eb7340cceb4c3fd4f7f61a913d9482aec5ce28740b9ee777f86a1ce54f597f50341d701372542 WHIRLPOOL f3905ce3a2a55a027197a2d11ca541323fdfd560d186b4a2c39a8f45e19811067d5de4fbd3656935b12787e1dec79d118d7a01d52a8ef7abd0dad4f38a222b1c
DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
diff --git a/app-emulation/rkt/rkt-1.26.0.ebuild b/app-emulation/rkt/rkt-1.26.0.ebuild
new file mode 100644
index 00000000000..4b8e6287dcf
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.26.0.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="1235.0.0"
+PXE_SYSTEMD_VERSION="v231"
+KVM_LINUX_VERSION="4.9.2"
+KVMTOOL_VERSION="cfae4d64482ed745214e3c62dd84b79c2ae0f325"
+QEMU_VERSION="v2.8.0"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
+"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm_lkvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ ${SRC_URI_KVM}
+)
+rkt_stage1_kvm_qemu? (
+ http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
+ ${SRC_URI_KVM}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
+
+DESCRIPTION="rkt is an App Container runtime for Linux"
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
+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"
+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"
+
+# Some tests fail.
+# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
+RESTRICT="test rkt_stage1_src? ( userpriv )"
+
+DEPEND=">=dev-lang/go-1.5
+ app-arch/cpio
+ app-crypt/trousers
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny
+ rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
+ rkt_stage1_kvm_qemu? (
+ sys-apps/attr[static-libs(+)]
+ sys-libs/libcap[static-libs(+)]
+ sys-libs/zlib[static-libs(+)]
+ >=x11-libs/pixman-0.28.0[static-libs(+)]
+ )"
+
+RDEPEND="!app-emulation/rocket
+ rkt_stage1_host? ( systemd? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ ) )"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+pkg_setup() {
+ enewgroup rkt-admin
+ enewgroup rkt
+}
+
+src_unpack() {
+ local x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
+src_prepare() {
+ eapply_user
+
+ # This patch breaks linux kernel cc-option checks when the
+ # compiler doesn't recognize the -no-pie option.
+ rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
+
+ # avoid sdjournal include for bug 595874
+ if ! use systemd; then
+ sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
+ -i rkt/rkt.mk || die
+ fi
+
+ sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
+
+ # disable git fetch of systemd
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable git fetch of qemu
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
+'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
+'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
+'$(QEMU_CONF_STAMP): get_qemu_sources\n\n'\
+'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' \
+ -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
+ -i stage1/usr_from_kvm/qemu.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ local flavors hypervisors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+ )
+
+ use systemd || myeconfargs+=( --enable-sdjournal=no )
+
+ # enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
+ use rkt_stage1_src && flavors+=",src"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_src; then
+ myeconfargs+=(
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+ )
+ fi
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
+ fi
+
+ if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
+ use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
+ myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} emake V=3
+ ARCH=${arch} emake V=3 bash-completion
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/tools/actool"
+
+ dobin "${S}/${BUILDDIR}/target/bin/rkt"
+
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/target/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_src; then
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_lkvm; then
+ dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_qemu; then
+ dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
+
+ systemd_dounit "${S}"/dist/init/systemd/*.service \
+ "${S}"/dist/init/systemd/*.timer \
+ "${S}"/dist/init/systemd/*.socket
+
+ insinto /usr/lib/tmpfiles.d
+ doins "${S}"/dist/init/systemd/tmpfiles.d/*
+
+ newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
+
+ keepdir /etc/${PN}
+ fowners :rkt-admin /etc/${PN}
+ fperms 2775 /etc/${PN}
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2017-02-26 23:21 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2017-02-26 23:21 UTC (permalink / raw
To: gentoo-commits
commit: a852086179d0278d4c1e300375a12d8b14356466
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 26 23:20:32 2017 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Feb 26 23:21:31 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8520861
app-emulation/rkt: version bump to 1.25.0
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-emulation/rkt/Manifest | 1 +
app-emulation/rkt/rkt-1.25.0.ebuild | 257 ++++++++++++++++++++++++++++++++++++
2 files changed, 258 insertions(+)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index e508f3a3be..59b063ed6a 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -5,5 +5,6 @@ DIST qemu-2.7.0.tar.bz2 26867760 SHA256 326e739506ba690daf69fc17bd3913a6c313d992
DIST qemu-2.8.0.tar.bz2 28368517 SHA256 dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62 SHA512 50f2988d822388ba9fd1bf5dbe68359033ed7432d7f0f9790299f32f63faa6dc72979256b5632ba572d47ee3e74ed40e3e8e331dc6303ec1599f1b4367cb78c2 WHIRLPOOL 0ce4e0539657eb832e4039819e7360c792b6aa41c718f0e0d762f4933217f0d370af94b1d6d9776853575b4a6811d8c85db069bf09d21bd15399ac8b50440ff5
DIST rkt-1.23.0.tar.gz 3350060 SHA256 5cb10a0646e5cc8dccbd099c40bc6b11264591b30fa8e4113bc9e392feffcb2b SHA512 9673f70b385a4e5c61c037783071507e69097f0d0163b3d449ca129bcdc858bc177d38c6551dc9f8b2f074345b4698863bbe62bf4d6c83f5df515406011ddce3 WHIRLPOOL 7d2e7b20205e6e00992091bd3898094b27e75f9e4716c73a0a31df2747cb77c49b11678db478ed7414cf12eef8c3463afded0e2d2a0b93effb9cce0edbed799a
DIST rkt-1.24.0.tar.gz 3359035 SHA256 ffeb9933d58a642a5dde4730eacde9a597345698120cf36283e02cf2ed085e2d SHA512 e5f30df83fc833f6a5f40c7e99207b38cbd01d078b26e9ea7d3587c3e57fe872e187850406fa5200c0245fb42b81223057eb561934004b57c3f2d57a31f3d269 WHIRLPOOL 842e58f90a676ee990c96e0dd4da42aad03dfb9201e7282565ce4f293a697ccb300a398ca66b14fe4ca73d5f4943582f58742a59098c091dcaf0a5bd1b094a6f
+DIST rkt-1.25.0.tar.gz 3385268 SHA256 090da380ae8526d2a819f777fa983aee0df6254c37eb1fd74783d2d4c4ced359 SHA512 7f61ef5a8f5d04545ac2015b19667f45d91a3e04d923bc492e05a71dec14d6cf4e5ed6464ede0cfb538328a780e013aca3e5cd7e3d9cdc029736f5b6498b1f74 WHIRLPOOL cebe2a2f76a7571a540c417a8f7e30cc2b69d72a89814ef58699212455101fdbbbeab5370b7efa45b2298e5b43344488d410100363a8595cfa7bb11006c94ff8
DIST rkt-pxe-1235.0.0.img 243713684 SHA256 988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315 SHA512 b19821c63b7b53a1aad3b6e279189f9ceed1f5db1a691d12a70eb7340cceb4c3fd4f7f61a913d9482aec5ce28740b9ee777f86a1ce54f597f50341d701372542 WHIRLPOOL f3905ce3a2a55a027197a2d11ca541323fdfd560d186b4a2c39a8f45e19811067d5de4fbd3656935b12787e1dec79d118d7a01d52a8ef7abd0dad4f38a222b1c
DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
diff --git a/app-emulation/rkt/rkt-1.25.0.ebuild b/app-emulation/rkt/rkt-1.25.0.ebuild
new file mode 100644
index 0000000000..0d459fd8f6
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.25.0.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="1235.0.0"
+PXE_SYSTEMD_VERSION="v231"
+KVM_LINUX_VERSION="4.9.2"
+KVMTOOL_VERSION="cfae4d64482ed745214e3c62dd84b79c2ae0f325"
+QEMU_VERSION="v2.8.0"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
+"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm_lkvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ ${SRC_URI_KVM}
+)
+rkt_stage1_kvm_qemu? (
+ http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
+ ${SRC_URI_KVM}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
+
+DESCRIPTION="rkt is an App Container runtime for Linux"
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
+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"
+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"
+
+# Some tests fail.
+# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
+RESTRICT="test rkt_stage1_src? ( userpriv )"
+
+DEPEND=">=dev-lang/go-1.5
+ app-arch/cpio
+ app-crypt/trousers
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny
+ rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
+ rkt_stage1_kvm_qemu? (
+ sys-apps/attr[static-libs(+)]
+ sys-libs/libcap[static-libs(+)]
+ sys-libs/zlib[static-libs(+)]
+ >=x11-libs/pixman-0.28.0[static-libs(+)]
+ )"
+
+RDEPEND="!app-emulation/rocket
+ rkt_stage1_host? ( systemd? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ ) )"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+pkg_setup() {
+ enewgroup rkt-admin
+ enewgroup rkt
+}
+
+src_unpack() {
+ local x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
+src_prepare() {
+ eapply_user
+
+ # This patch breaks linux kernel cc-option checks when the
+ # compiler doesn't recognize the -no-pie option.
+ rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
+
+ # avoid sdjournal include for bug 595874
+ if ! use systemd; then
+ sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
+ -i rkt/rkt.mk || die
+ fi
+
+ sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
+
+ # disable git fetch of systemd
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable git fetch of qemu
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
+'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
+'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
+'$(QEMU_CONF_STAMP): get_qemu_sources\n\n'\
+'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' \
+ -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
+ -i stage1/usr_from_kvm/qemu.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ local flavors hypervisors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+ )
+
+ use systemd || myeconfargs+=( --enable-sdjournal=no )
+
+ # enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
+ use rkt_stage1_src && flavors+=",src"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_src; then
+ myeconfargs+=(
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+ )
+ fi
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
+ fi
+
+ if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
+ use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
+ myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} emake V=3
+ ARCH=${arch} emake V=3 bash-completion
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/tools/actool"
+
+ dobin "${S}/${BUILDDIR}/target/bin/rkt"
+
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/target/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_src; then
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_lkvm; then
+ dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_qemu; then
+ dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
+
+ systemd_dounit "${S}"/dist/init/systemd/*.service \
+ "${S}"/dist/init/systemd/*.timer \
+ "${S}"/dist/init/systemd/*.socket
+
+ insinto /usr/lib/tmpfiles.d
+ doins "${S}"/dist/init/systemd/tmpfiles.d/*
+
+ newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
+
+ keepdir /etc/${PN}
+ fowners :rkt-admin /etc/${PN}
+ fperms 2775 /etc/${PN}
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2017-02-09 7:12 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2017-02-09 7:12 UTC (permalink / raw
To: gentoo-commits
commit: c5992d24e7fa6846499df7d02073c5f45843d4f2
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 9 07:11:16 2017 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Feb 9 07:12:28 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5992d24
app-emulation/rkt: version bump to 1.24.0
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-emulation/rkt/Manifest | 3 +
app-emulation/rkt/rkt-1.24.0.ebuild | 257 ++++++++++++++++++++++++++++++++++++
2 files changed, 260 insertions(+)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index afb5f8ed73..e508f3a3be 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,6 +1,9 @@
DIST kvmtool-1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2.tar.gz 244571 SHA256 c72c0e3463a8f0cfe2cdaa8b8e7951f4eb7293c486e44f84b9e421073dbf5ab9 SHA512 13db2bf2ff794f34c2a825c9b1862c85b0f470c81e3d91177979302f921e3970b8dfaeaf54602005fba8903bba52e43b6e8d67edaa0ee8de82002db7b396c3a0 WHIRLPOOL 0904a5783ac27befb207a5fa0030baede68ae589b69abf012ec733ff2e6d9f77b7198273c22fa7404b2c78bcc9ae40abc39d002519700666ba1e54c6550525b2
+DIST kvmtool-cfae4d64482ed745214e3c62dd84b79c2ae0f325.tar.gz 245010 SHA256 4aad2913d66c7a3c308e0ca34c214307850b2556ab35999e7f86c253cb8bbf82 SHA512 7cca005136f3628dfef359f83732d6f8cc062c5e4a8d77f57c6dd5e007ed06c85f0c275c8844228b404755dbf3f4d45f6a149fc64235f4f1abe0058214e24730 WHIRLPOOL 341f9be7ff9517c822da00166cbf5334cf329f51895bb459c3e0bdda2f0c8724957bb79b354eadf9249b4c1f4b8d677c7c6ca57eaa04553804779ec8c53b37f4
DIST linux-4.9.2.tar.xz 93189108 SHA256 8dda9aedd17ae0bf1e06ebb4b79082f83fb3ade45cbcc3ca4c30bf3faf085738 SHA512 85adf3715cba4a457efea8359ebed34413ac63ee58fe920c5713501dec1e727e167416e9d67a9e2d9430aa9f3a53ad0ac26a4f749984bc5a3f3c37ac504f75de WHIRLPOOL 74df775ab092a6be6684243d4c0d557c0ce27907c7e8ed97be54a45901e8f507deab1d5e72c35092884836f3fe446f838342ec0b53a3aa1c884489caadaf6a62
DIST qemu-2.7.0.tar.bz2 26867760 SHA256 326e739506ba690daf69fc17bd3913a6c313d9928d743bd8eddb82f403f81e53 SHA512 654acaa7b3724a288e5d7e2a26ab780d9c9ed9f647fba00a906cbaffbe9d58fd666f2d962514aa2c5b391b4c53811ac3170d2eb51727f090bd19dfe45ca9a9db WHIRLPOOL dcb3e5f7da89dd8e14d636d7ebd476e076e0043880bb9ea3fb1c03cb4bcd4e5c7d3c4719da26c3ce521e3a3db5ae671e86f198ac1bc3474e774d75504fef8b8d
+DIST qemu-2.8.0.tar.bz2 28368517 SHA256 dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62 SHA512 50f2988d822388ba9fd1bf5dbe68359033ed7432d7f0f9790299f32f63faa6dc72979256b5632ba572d47ee3e74ed40e3e8e331dc6303ec1599f1b4367cb78c2 WHIRLPOOL 0ce4e0539657eb832e4039819e7360c792b6aa41c718f0e0d762f4933217f0d370af94b1d6d9776853575b4a6811d8c85db069bf09d21bd15399ac8b50440ff5
DIST rkt-1.23.0.tar.gz 3350060 SHA256 5cb10a0646e5cc8dccbd099c40bc6b11264591b30fa8e4113bc9e392feffcb2b SHA512 9673f70b385a4e5c61c037783071507e69097f0d0163b3d449ca129bcdc858bc177d38c6551dc9f8b2f074345b4698863bbe62bf4d6c83f5df515406011ddce3 WHIRLPOOL 7d2e7b20205e6e00992091bd3898094b27e75f9e4716c73a0a31df2747cb77c49b11678db478ed7414cf12eef8c3463afded0e2d2a0b93effb9cce0edbed799a
+DIST rkt-1.24.0.tar.gz 3359035 SHA256 ffeb9933d58a642a5dde4730eacde9a597345698120cf36283e02cf2ed085e2d SHA512 e5f30df83fc833f6a5f40c7e99207b38cbd01d078b26e9ea7d3587c3e57fe872e187850406fa5200c0245fb42b81223057eb561934004b57c3f2d57a31f3d269 WHIRLPOOL 842e58f90a676ee990c96e0dd4da42aad03dfb9201e7282565ce4f293a697ccb300a398ca66b14fe4ca73d5f4943582f58742a59098c091dcaf0a5bd1b094a6f
DIST rkt-pxe-1235.0.0.img 243713684 SHA256 988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315 SHA512 b19821c63b7b53a1aad3b6e279189f9ceed1f5db1a691d12a70eb7340cceb4c3fd4f7f61a913d9482aec5ce28740b9ee777f86a1ce54f597f50341d701372542 WHIRLPOOL f3905ce3a2a55a027197a2d11ca541323fdfd560d186b4a2c39a8f45e19811067d5de4fbd3656935b12787e1dec79d118d7a01d52a8ef7abd0dad4f38a222b1c
DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
diff --git a/app-emulation/rkt/rkt-1.24.0.ebuild b/app-emulation/rkt/rkt-1.24.0.ebuild
new file mode 100644
index 0000000000..0d459fd8f6
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.24.0.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="1235.0.0"
+PXE_SYSTEMD_VERSION="v231"
+KVM_LINUX_VERSION="4.9.2"
+KVMTOOL_VERSION="cfae4d64482ed745214e3c62dd84b79c2ae0f325"
+QEMU_VERSION="v2.8.0"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
+"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm_lkvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ ${SRC_URI_KVM}
+)
+rkt_stage1_kvm_qemu? (
+ http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
+ ${SRC_URI_KVM}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
+
+DESCRIPTION="rkt is an App Container runtime for Linux"
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
+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"
+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"
+
+# Some tests fail.
+# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
+RESTRICT="test rkt_stage1_src? ( userpriv )"
+
+DEPEND=">=dev-lang/go-1.5
+ app-arch/cpio
+ app-crypt/trousers
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny
+ rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
+ rkt_stage1_kvm_qemu? (
+ sys-apps/attr[static-libs(+)]
+ sys-libs/libcap[static-libs(+)]
+ sys-libs/zlib[static-libs(+)]
+ >=x11-libs/pixman-0.28.0[static-libs(+)]
+ )"
+
+RDEPEND="!app-emulation/rocket
+ rkt_stage1_host? ( systemd? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ ) )"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+pkg_setup() {
+ enewgroup rkt-admin
+ enewgroup rkt
+}
+
+src_unpack() {
+ local x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
+src_prepare() {
+ eapply_user
+
+ # This patch breaks linux kernel cc-option checks when the
+ # compiler doesn't recognize the -no-pie option.
+ rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
+
+ # avoid sdjournal include for bug 595874
+ if ! use systemd; then
+ sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
+ -i rkt/rkt.mk || die
+ fi
+
+ sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
+
+ # disable git fetch of systemd
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable git fetch of qemu
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
+'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
+'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
+'$(QEMU_CONF_STAMP): get_qemu_sources\n\n'\
+'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' \
+ -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
+ -i stage1/usr_from_kvm/qemu.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ local flavors hypervisors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+ )
+
+ use systemd || myeconfargs+=( --enable-sdjournal=no )
+
+ # enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
+ use rkt_stage1_src && flavors+=",src"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_src; then
+ myeconfargs+=(
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+ )
+ fi
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
+ fi
+
+ if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
+ use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
+ myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} emake V=3
+ ARCH=${arch} emake V=3 bash-completion
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/tools/actool"
+
+ dobin "${S}/${BUILDDIR}/target/bin/rkt"
+
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/target/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_src; then
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_lkvm; then
+ dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_qemu; then
+ dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
+
+ systemd_dounit "${S}"/dist/init/systemd/*.service \
+ "${S}"/dist/init/systemd/*.timer \
+ "${S}"/dist/init/systemd/*.socket
+
+ insinto /usr/lib/tmpfiles.d
+ doins "${S}"/dist/init/systemd/tmpfiles.d/*
+
+ newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
+
+ keepdir /etc/${PN}
+ fowners :rkt-admin /etc/${PN}
+ fperms 2775 /etc/${PN}
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2017-02-09 5:22 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2017-02-09 5:22 UTC (permalink / raw
To: gentoo-commits
commit: bbacd6ffcad83243329ceaae85dbc9f607d35b39
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 9 05:21:26 2017 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Feb 9 05:21:26 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbacd6ff
app-emulation/rkt: remove old versions
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-emulation/rkt/Manifest | 3 -
app-emulation/rkt/rkt-1.21.0.ebuild | 257 ------------------------------------
app-emulation/rkt/rkt-1.22.0.ebuild | 257 ------------------------------------
3 files changed, 517 deletions(-)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 8ee84d02d0..afb5f8ed73 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,9 +1,6 @@
DIST kvmtool-1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2.tar.gz 244571 SHA256 c72c0e3463a8f0cfe2cdaa8b8e7951f4eb7293c486e44f84b9e421073dbf5ab9 SHA512 13db2bf2ff794f34c2a825c9b1862c85b0f470c81e3d91177979302f921e3970b8dfaeaf54602005fba8903bba52e43b6e8d67edaa0ee8de82002db7b396c3a0 WHIRLPOOL 0904a5783ac27befb207a5fa0030baede68ae589b69abf012ec733ff2e6d9f77b7198273c22fa7404b2c78bcc9ae40abc39d002519700666ba1e54c6550525b2
-DIST linux-4.8.6.tar.xz 91969848 SHA256 74744e00420856cfc8049fa3b3a55e57a116994226a498ef56801bc9492df36b SHA512 235acc394ce347d4131e86f6ff3f3fa9d552bf227c2483c25da7de99f3dc8fd20c4a04db0c8d59cdfa4fa9d98a5b102a5734f7b7704df6648c6efa5e8a7515ea WHIRLPOOL cb27d5654f7351ff32d057501c594f9b6e15fefe78c588b9e9cfedd88fbdb807ba7cfc1e238444d94f3d46168d6edc1bbb8e3966c2ca0f46c668dd4e9d60a01f
DIST linux-4.9.2.tar.xz 93189108 SHA256 8dda9aedd17ae0bf1e06ebb4b79082f83fb3ade45cbcc3ca4c30bf3faf085738 SHA512 85adf3715cba4a457efea8359ebed34413ac63ee58fe920c5713501dec1e727e167416e9d67a9e2d9430aa9f3a53ad0ac26a4f749984bc5a3f3c37ac504f75de WHIRLPOOL 74df775ab092a6be6684243d4c0d557c0ce27907c7e8ed97be54a45901e8f507deab1d5e72c35092884836f3fe446f838342ec0b53a3aa1c884489caadaf6a62
DIST qemu-2.7.0.tar.bz2 26867760 SHA256 326e739506ba690daf69fc17bd3913a6c313d9928d743bd8eddb82f403f81e53 SHA512 654acaa7b3724a288e5d7e2a26ab780d9c9ed9f647fba00a906cbaffbe9d58fd666f2d962514aa2c5b391b4c53811ac3170d2eb51727f090bd19dfe45ca9a9db WHIRLPOOL dcb3e5f7da89dd8e14d636d7ebd476e076e0043880bb9ea3fb1c03cb4bcd4e5c7d3c4719da26c3ce521e3a3db5ae671e86f198ac1bc3474e774d75504fef8b8d
-DIST rkt-1.21.0.tar.gz 3334473 SHA256 63eed8da954c24c1f9010e7513ee6ac21ffeaf63a648f9d5a0f9e9d3eb92fde5 SHA512 2723aab1aadbe7be0f7ce9c7f4e000c76d8c34d167b1157a08de7fb2248e4b73a7fc765ead557db495bab803f5d5c8d09e1d9441301396e18fa49b21a8c4c7ae WHIRLPOOL 11b28be68dd246ddafb5455becc64ea1b185d1128747dc51103ab692c34cd9157423164c4847be9e9a39338cb5ad6e2db3e588545378179b51a0ce58a1be1935
-DIST rkt-1.22.0.tar.gz 3338862 SHA256 49fda935e0ec628889b0c6ba22277354dbf9b89b4c09429c10800a562bbf1b7c SHA512 2aa6c15a0994e1ba427b05694f6fa12446e2f336ff51593fc6d4776f77d0b798203a0ab97f4c12ada1226c934b4e1866d9a5545f48ae1938e79d696d236ad8c7 WHIRLPOOL 98c8761e47379a02b536b760f327dc65dabd3594d30fdc792326044fc0e825401cc49abf0b5ab6ce6d4bc6072f0008466da4f3d2a12cdad16908e8549c0fa88e
DIST rkt-1.23.0.tar.gz 3350060 SHA256 5cb10a0646e5cc8dccbd099c40bc6b11264591b30fa8e4113bc9e392feffcb2b SHA512 9673f70b385a4e5c61c037783071507e69097f0d0163b3d449ca129bcdc858bc177d38c6551dc9f8b2f074345b4698863bbe62bf4d6c83f5df515406011ddce3 WHIRLPOOL 7d2e7b20205e6e00992091bd3898094b27e75f9e4716c73a0a31df2747cb77c49b11678db478ed7414cf12eef8c3463afded0e2d2a0b93effb9cce0edbed799a
DIST rkt-pxe-1235.0.0.img 243713684 SHA256 988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315 SHA512 b19821c63b7b53a1aad3b6e279189f9ceed1f5db1a691d12a70eb7340cceb4c3fd4f7f61a913d9482aec5ce28740b9ee777f86a1ce54f597f50341d701372542 WHIRLPOOL f3905ce3a2a55a027197a2d11ca541323fdfd560d186b4a2c39a8f45e19811067d5de4fbd3656935b12787e1dec79d118d7a01d52a8ef7abd0dad4f38a222b1c
DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
diff --git a/app-emulation/rkt/rkt-1.21.0.ebuild b/app-emulation/rkt/rkt-1.21.0.ebuild
deleted file mode 100644
index 97a036e13b..0000000000
--- a/app-emulation/rkt/rkt-1.21.0.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="1235.0.0"
-PXE_SYSTEMD_VERSION="v231"
-KVM_LINUX_VERSION="4.8.6"
-KVMTOOL_VERSION="1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2"
-QEMU_VERSION="v2.7.0"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
- ${PXE_URI} -> ${PXE_FILE}
-"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm_lkvm? (
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
- ${SRC_URI_KVM}
-)
-rkt_stage1_kvm_qemu? (
- http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
- ${SRC_URI_KVM}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="rkt is an App Container runtime for Linux"
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
-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"
-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"
-
-# Some tests fail.
-# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
-RESTRICT="test rkt_stage1_src? ( userpriv )"
-
-DEPEND=">=dev-lang/go-1.5
- app-arch/cpio
- app-crypt/trousers
- sys-fs/squashfs-tools
- dev-perl/Capture-Tiny
- rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
- rkt_stage1_kvm_qemu? (
- sys-apps/attr[static-libs(+)]
- sys-libs/libcap[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- >=x11-libs/pixman-0.28.0[static-libs(+)]
- )"
-
-RDEPEND="!app-emulation/rocket
- rkt_stage1_host? ( systemd? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- ) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-pkg_setup() {
- enewgroup rkt-admin
- enewgroup rkt
-}
-
-src_unpack() {
- local x
- for x in ${A}; do
- case ${x} in
- *.img|linux-*) continue ;;
- kvmtool-*)
- mkdir kvmtool || die
- pushd kvmtool >/dev/null || die
- unpack ${x}
- popd >/dev/null || die
- ;;
- *)
- unpack ${x}
- esac
- done
-}
-
-src_prepare() {
- eapply_user
-
- # This patch breaks linux kernel cc-option checks when the
- # compiler doesn't recognize the -no-pie option.
- rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
-
- # avoid sdjournal include for bug 595874
- if ! use systemd; then
- sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
- -i rkt/rkt.mk || die
- fi
-
- sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
-
- # disable git fetch of systemd
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
- # disable git fetch of kvmtool
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
- # disable git fetch of qemu
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
-'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
-'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
-'$(QEMU_CLONE_STAMP): get_qemu_sources\n\n'\
-'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' \
- -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
- -i stage1/usr_from_kvm/qemu.mk || die
-
- # disable fetch of kernel sources
- sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
- -i stage1/usr_from_kvm/kernel.mk || die
-
- if use rkt_stage1_host; then
- # Make systemdUnitsPath consistent with host
- sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
- -i stage1/init/init.go || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- local flavors hypervisors myeconfargs=(
- --with-stage1-default-images-directory="/usr/share/rkt"
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
- )
-
- use systemd || myeconfargs+=( --enable-sdjournal=no )
-
- # enable flavors (first is default)
- use rkt_stage1_host && flavors+=",host"
- use rkt_stage1_src && flavors+=",src"
- use rkt_stage1_coreos && flavors+=",coreos"
- use rkt_stage1_fly && flavors+=",fly"
- { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
- if use rkt_stage1_src; then
- myeconfargs+=(
- --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
- --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
- )
- fi
-
- if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- myeconfargs+=(
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
- )
- fi
-
- if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
- use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
- myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
- fi
-
- # Go's 6l linker does not support PIE, disable so cgo binaries
- # which use 6l+gcc for linking can be built correctly.
- if gcc-specs-pie; then
- append-ldflags -nopie
- fi
-
- export CC=$(tc-getCC)
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export BUILDDIR
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- local arch=${ARCH}
- case ${arch} in
- amd64) arch=x86_64;;
- esac
- ARCH=${arch} emake V=3
- ARCH=${arch} emake V=3 bash-completion
-}
-
-src_install() {
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
- use actool && dobin "${S}/${BUILDDIR}/tools/actool"
-
- dobin "${S}/${BUILDDIR}/target/bin/rkt"
-
- insinto /usr/share/rkt
- doins "${S}/${BUILDDIR}/target/bin/"*.aci
-
- # create symlink for default stage1 image path
- if use rkt_stage1_host; then
- dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_src; then
- dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_coreos; then
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_fly; then
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_lkvm; then
- dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_qemu; then
- dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
- fi
-
- systemd_dounit "${S}"/dist/init/systemd/*.service \
- "${S}"/dist/init/systemd/*.timer \
- "${S}"/dist/init/systemd/*.socket
-
- insinto /usr/lib/tmpfiles.d
- doins "${S}"/dist/init/systemd/tmpfiles.d/*
-
- newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
-
- keepdir /etc/${PN}
- fowners :rkt-admin /etc/${PN}
- fperms 2775 /etc/${PN}
-}
diff --git a/app-emulation/rkt/rkt-1.22.0.ebuild b/app-emulation/rkt/rkt-1.22.0.ebuild
deleted file mode 100644
index 7e401a48d7..0000000000
--- a/app-emulation/rkt/rkt-1.22.0.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="1235.0.0"
-PXE_SYSTEMD_VERSION="v231"
-KVM_LINUX_VERSION="4.8.6"
-KVMTOOL_VERSION="1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2"
-QEMU_VERSION="v2.7.0"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
- ${PXE_URI} -> ${PXE_FILE}
-"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm_lkvm? (
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
- ${SRC_URI_KVM}
-)
-rkt_stage1_kvm_qemu? (
- http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
- ${SRC_URI_KVM}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="rkt is an App Container runtime for Linux"
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
-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"
-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"
-
-# Some tests fail.
-# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
-RESTRICT="test rkt_stage1_src? ( userpriv )"
-
-DEPEND=">=dev-lang/go-1.5
- app-arch/cpio
- app-crypt/trousers
- sys-fs/squashfs-tools
- dev-perl/Capture-Tiny
- rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
- rkt_stage1_kvm_qemu? (
- sys-apps/attr[static-libs(+)]
- sys-libs/libcap[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- >=x11-libs/pixman-0.28.0[static-libs(+)]
- )"
-
-RDEPEND="!app-emulation/rocket
- rkt_stage1_host? ( systemd? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- ) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-pkg_setup() {
- enewgroup rkt-admin
- enewgroup rkt
-}
-
-src_unpack() {
- local x
- for x in ${A}; do
- case ${x} in
- *.img|linux-*) continue ;;
- kvmtool-*)
- mkdir kvmtool || die
- pushd kvmtool >/dev/null || die
- unpack ${x}
- popd >/dev/null || die
- ;;
- *)
- unpack ${x}
- esac
- done
-}
-
-src_prepare() {
- eapply_user
-
- # This patch breaks linux kernel cc-option checks when the
- # compiler doesn't recognize the -no-pie option.
- rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
-
- # avoid sdjournal include for bug 595874
- if ! use systemd; then
- sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
- -i rkt/rkt.mk || die
- fi
-
- sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
-
- # disable git fetch of systemd
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
- # disable git fetch of kvmtool
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
- # disable git fetch of qemu
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
-'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
-'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
-'$(QEMU_CONF_STAMP): get_qemu_sources\n\n'\
-'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' \
- -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
- -i stage1/usr_from_kvm/qemu.mk || die
-
- # disable fetch of kernel sources
- sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
- -i stage1/usr_from_kvm/kernel.mk || die
-
- if use rkt_stage1_host; then
- # Make systemdUnitsPath consistent with host
- sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
- -i stage1/init/init.go || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- local flavors hypervisors myeconfargs=(
- --with-stage1-default-images-directory="/usr/share/rkt"
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
- )
-
- use systemd || myeconfargs+=( --enable-sdjournal=no )
-
- # enable flavors (first is default)
- use rkt_stage1_host && flavors+=",host"
- use rkt_stage1_src && flavors+=",src"
- use rkt_stage1_coreos && flavors+=",coreos"
- use rkt_stage1_fly && flavors+=",fly"
- { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
- if use rkt_stage1_src; then
- myeconfargs+=(
- --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
- --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
- )
- fi
-
- if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- myeconfargs+=(
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
- )
- fi
-
- if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
- use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
- myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
- fi
-
- # Go's 6l linker does not support PIE, disable so cgo binaries
- # which use 6l+gcc for linking can be built correctly.
- if gcc-specs-pie; then
- append-ldflags -nopie
- fi
-
- export CC=$(tc-getCC)
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export BUILDDIR
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- local arch=${ARCH}
- case ${arch} in
- amd64) arch=x86_64;;
- esac
- ARCH=${arch} emake V=3
- ARCH=${arch} emake V=3 bash-completion
-}
-
-src_install() {
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
- use actool && dobin "${S}/${BUILDDIR}/tools/actool"
-
- dobin "${S}/${BUILDDIR}/target/bin/rkt"
-
- insinto /usr/share/rkt
- doins "${S}/${BUILDDIR}/target/bin/"*.aci
-
- # create symlink for default stage1 image path
- if use rkt_stage1_host; then
- dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_src; then
- dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_coreos; then
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_fly; then
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_lkvm; then
- dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_qemu; then
- dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
- fi
-
- systemd_dounit "${S}"/dist/init/systemd/*.service \
- "${S}"/dist/init/systemd/*.timer \
- "${S}"/dist/init/systemd/*.socket
-
- insinto /usr/lib/tmpfiles.d
- doins "${S}"/dist/init/systemd/tmpfiles.d/*
-
- newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
-
- keepdir /etc/${PN}
- fowners :rkt-admin /etc/${PN}
- fperms 2775 /etc/${PN}
-}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2017-01-31 21:58 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2017-01-31 21:58 UTC (permalink / raw
To: gentoo-commits
commit: e69a2cfda7bcc849d53cbb335c282ae94e2851b4
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 31 21:57:08 2017 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jan 31 21:58:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e69a2cfd
app-emulation/rkt: version bump to 1.23.0
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-emulation/rkt/Manifest | 2 +
app-emulation/rkt/rkt-1.23.0.ebuild | 257 ++++++++++++++++++++++++++++++++++++
2 files changed, 259 insertions(+)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 00cd107..8ee84d0 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,7 +1,9 @@
DIST kvmtool-1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2.tar.gz 244571 SHA256 c72c0e3463a8f0cfe2cdaa8b8e7951f4eb7293c486e44f84b9e421073dbf5ab9 SHA512 13db2bf2ff794f34c2a825c9b1862c85b0f470c81e3d91177979302f921e3970b8dfaeaf54602005fba8903bba52e43b6e8d67edaa0ee8de82002db7b396c3a0 WHIRLPOOL 0904a5783ac27befb207a5fa0030baede68ae589b69abf012ec733ff2e6d9f77b7198273c22fa7404b2c78bcc9ae40abc39d002519700666ba1e54c6550525b2
DIST linux-4.8.6.tar.xz 91969848 SHA256 74744e00420856cfc8049fa3b3a55e57a116994226a498ef56801bc9492df36b SHA512 235acc394ce347d4131e86f6ff3f3fa9d552bf227c2483c25da7de99f3dc8fd20c4a04db0c8d59cdfa4fa9d98a5b102a5734f7b7704df6648c6efa5e8a7515ea WHIRLPOOL cb27d5654f7351ff32d057501c594f9b6e15fefe78c588b9e9cfedd88fbdb807ba7cfc1e238444d94f3d46168d6edc1bbb8e3966c2ca0f46c668dd4e9d60a01f
+DIST linux-4.9.2.tar.xz 93189108 SHA256 8dda9aedd17ae0bf1e06ebb4b79082f83fb3ade45cbcc3ca4c30bf3faf085738 SHA512 85adf3715cba4a457efea8359ebed34413ac63ee58fe920c5713501dec1e727e167416e9d67a9e2d9430aa9f3a53ad0ac26a4f749984bc5a3f3c37ac504f75de WHIRLPOOL 74df775ab092a6be6684243d4c0d557c0ce27907c7e8ed97be54a45901e8f507deab1d5e72c35092884836f3fe446f838342ec0b53a3aa1c884489caadaf6a62
DIST qemu-2.7.0.tar.bz2 26867760 SHA256 326e739506ba690daf69fc17bd3913a6c313d9928d743bd8eddb82f403f81e53 SHA512 654acaa7b3724a288e5d7e2a26ab780d9c9ed9f647fba00a906cbaffbe9d58fd666f2d962514aa2c5b391b4c53811ac3170d2eb51727f090bd19dfe45ca9a9db WHIRLPOOL dcb3e5f7da89dd8e14d636d7ebd476e076e0043880bb9ea3fb1c03cb4bcd4e5c7d3c4719da26c3ce521e3a3db5ae671e86f198ac1bc3474e774d75504fef8b8d
DIST rkt-1.21.0.tar.gz 3334473 SHA256 63eed8da954c24c1f9010e7513ee6ac21ffeaf63a648f9d5a0f9e9d3eb92fde5 SHA512 2723aab1aadbe7be0f7ce9c7f4e000c76d8c34d167b1157a08de7fb2248e4b73a7fc765ead557db495bab803f5d5c8d09e1d9441301396e18fa49b21a8c4c7ae WHIRLPOOL 11b28be68dd246ddafb5455becc64ea1b185d1128747dc51103ab692c34cd9157423164c4847be9e9a39338cb5ad6e2db3e588545378179b51a0ce58a1be1935
DIST rkt-1.22.0.tar.gz 3338862 SHA256 49fda935e0ec628889b0c6ba22277354dbf9b89b4c09429c10800a562bbf1b7c SHA512 2aa6c15a0994e1ba427b05694f6fa12446e2f336ff51593fc6d4776f77d0b798203a0ab97f4c12ada1226c934b4e1866d9a5545f48ae1938e79d696d236ad8c7 WHIRLPOOL 98c8761e47379a02b536b760f327dc65dabd3594d30fdc792326044fc0e825401cc49abf0b5ab6ce6d4bc6072f0008466da4f3d2a12cdad16908e8549c0fa88e
+DIST rkt-1.23.0.tar.gz 3350060 SHA256 5cb10a0646e5cc8dccbd099c40bc6b11264591b30fa8e4113bc9e392feffcb2b SHA512 9673f70b385a4e5c61c037783071507e69097f0d0163b3d449ca129bcdc858bc177d38c6551dc9f8b2f074345b4698863bbe62bf4d6c83f5df515406011ddce3 WHIRLPOOL 7d2e7b20205e6e00992091bd3898094b27e75f9e4716c73a0a31df2747cb77c49b11678db478ed7414cf12eef8c3463afded0e2d2a0b93effb9cce0edbed799a
DIST rkt-pxe-1235.0.0.img 243713684 SHA256 988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315 SHA512 b19821c63b7b53a1aad3b6e279189f9ceed1f5db1a691d12a70eb7340cceb4c3fd4f7f61a913d9482aec5ce28740b9ee777f86a1ce54f597f50341d701372542 WHIRLPOOL f3905ce3a2a55a027197a2d11ca541323fdfd560d186b4a2c39a8f45e19811067d5de4fbd3656935b12787e1dec79d118d7a01d52a8ef7abd0dad4f38a222b1c
DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
diff --git a/app-emulation/rkt/rkt-1.23.0.ebuild b/app-emulation/rkt/rkt-1.23.0.ebuild
new file mode 100644
index 00000000..6cb2d50
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.23.0.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="1235.0.0"
+PXE_SYSTEMD_VERSION="v231"
+KVM_LINUX_VERSION="4.9.2"
+KVMTOOL_VERSION="1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2"
+QEMU_VERSION="v2.7.0"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
+"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm_lkvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ ${SRC_URI_KVM}
+)
+rkt_stage1_kvm_qemu? (
+ http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
+ ${SRC_URI_KVM}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
+
+DESCRIPTION="rkt is an App Container runtime for Linux"
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
+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"
+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"
+
+# Some tests fail.
+# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
+RESTRICT="test rkt_stage1_src? ( userpriv )"
+
+DEPEND=">=dev-lang/go-1.5
+ app-arch/cpio
+ app-crypt/trousers
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny
+ rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
+ rkt_stage1_kvm_qemu? (
+ sys-apps/attr[static-libs(+)]
+ sys-libs/libcap[static-libs(+)]
+ sys-libs/zlib[static-libs(+)]
+ >=x11-libs/pixman-0.28.0[static-libs(+)]
+ )"
+
+RDEPEND="!app-emulation/rocket
+ rkt_stage1_host? ( systemd? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ ) )"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+pkg_setup() {
+ enewgroup rkt-admin
+ enewgroup rkt
+}
+
+src_unpack() {
+ local x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
+src_prepare() {
+ eapply_user
+
+ # This patch breaks linux kernel cc-option checks when the
+ # compiler doesn't recognize the -no-pie option.
+ rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
+
+ # avoid sdjournal include for bug 595874
+ if ! use systemd; then
+ sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
+ -i rkt/rkt.mk || die
+ fi
+
+ sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
+
+ # disable git fetch of systemd
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable git fetch of qemu
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
+'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
+'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
+'$(QEMU_CONF_STAMP): get_qemu_sources\n\n'\
+'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' \
+ -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
+ -i stage1/usr_from_kvm/qemu.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ local flavors hypervisors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+ )
+
+ use systemd || myeconfargs+=( --enable-sdjournal=no )
+
+ # enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
+ use rkt_stage1_src && flavors+=",src"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_src; then
+ myeconfargs+=(
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+ )
+ fi
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
+ fi
+
+ if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
+ use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
+ myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} emake V=3
+ ARCH=${arch} emake V=3 bash-completion
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/tools/actool"
+
+ dobin "${S}/${BUILDDIR}/target/bin/rkt"
+
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/target/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_src; then
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_lkvm; then
+ dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_qemu; then
+ dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
+
+ systemd_dounit "${S}"/dist/init/systemd/*.service \
+ "${S}"/dist/init/systemd/*.timer \
+ "${S}"/dist/init/systemd/*.socket
+
+ insinto /usr/lib/tmpfiles.d
+ doins "${S}"/dist/init/systemd/tmpfiles.d/*
+
+ newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
+
+ keepdir /etc/${PN}
+ fowners :rkt-admin /etc/${PN}
+ fperms 2775 /etc/${PN}
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2017-01-08 22:29 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2017-01-08 22:29 UTC (permalink / raw
To: gentoo-commits
commit: dcc047d7da26c1e39afdd1d92cf91030abf6046d
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 8 22:22:57 2017 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Jan 8 22:29:22 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcc047d7
app-emulation/rkt: version bump to 1.22.0
Package-Manager: portage-2.3.3
app-emulation/rkt/Manifest | 1 +
app-emulation/rkt/rkt-1.22.0.ebuild | 257 ++++++++++++++++++++++++++++++++++++
2 files changed, 258 insertions(+)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index fa3fd04..00cd107 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -2,5 +2,6 @@ DIST kvmtool-1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2.tar.gz 244571 SHA256 c72c0
DIST linux-4.8.6.tar.xz 91969848 SHA256 74744e00420856cfc8049fa3b3a55e57a116994226a498ef56801bc9492df36b SHA512 235acc394ce347d4131e86f6ff3f3fa9d552bf227c2483c25da7de99f3dc8fd20c4a04db0c8d59cdfa4fa9d98a5b102a5734f7b7704df6648c6efa5e8a7515ea WHIRLPOOL cb27d5654f7351ff32d057501c594f9b6e15fefe78c588b9e9cfedd88fbdb807ba7cfc1e238444d94f3d46168d6edc1bbb8e3966c2ca0f46c668dd4e9d60a01f
DIST qemu-2.7.0.tar.bz2 26867760 SHA256 326e739506ba690daf69fc17bd3913a6c313d9928d743bd8eddb82f403f81e53 SHA512 654acaa7b3724a288e5d7e2a26ab780d9c9ed9f647fba00a906cbaffbe9d58fd666f2d962514aa2c5b391b4c53811ac3170d2eb51727f090bd19dfe45ca9a9db WHIRLPOOL dcb3e5f7da89dd8e14d636d7ebd476e076e0043880bb9ea3fb1c03cb4bcd4e5c7d3c4719da26c3ce521e3a3db5ae671e86f198ac1bc3474e774d75504fef8b8d
DIST rkt-1.21.0.tar.gz 3334473 SHA256 63eed8da954c24c1f9010e7513ee6ac21ffeaf63a648f9d5a0f9e9d3eb92fde5 SHA512 2723aab1aadbe7be0f7ce9c7f4e000c76d8c34d167b1157a08de7fb2248e4b73a7fc765ead557db495bab803f5d5c8d09e1d9441301396e18fa49b21a8c4c7ae WHIRLPOOL 11b28be68dd246ddafb5455becc64ea1b185d1128747dc51103ab692c34cd9157423164c4847be9e9a39338cb5ad6e2db3e588545378179b51a0ce58a1be1935
+DIST rkt-1.22.0.tar.gz 3338862 SHA256 49fda935e0ec628889b0c6ba22277354dbf9b89b4c09429c10800a562bbf1b7c SHA512 2aa6c15a0994e1ba427b05694f6fa12446e2f336ff51593fc6d4776f77d0b798203a0ab97f4c12ada1226c934b4e1866d9a5545f48ae1938e79d696d236ad8c7 WHIRLPOOL 98c8761e47379a02b536b760f327dc65dabd3594d30fdc792326044fc0e825401cc49abf0b5ab6ce6d4bc6072f0008466da4f3d2a12cdad16908e8549c0fa88e
DIST rkt-pxe-1235.0.0.img 243713684 SHA256 988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315 SHA512 b19821c63b7b53a1aad3b6e279189f9ceed1f5db1a691d12a70eb7340cceb4c3fd4f7f61a913d9482aec5ce28740b9ee777f86a1ce54f597f50341d701372542 WHIRLPOOL f3905ce3a2a55a027197a2d11ca541323fdfd560d186b4a2c39a8f45e19811067d5de4fbd3656935b12787e1dec79d118d7a01d52a8ef7abd0dad4f38a222b1c
DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
diff --git a/app-emulation/rkt/rkt-1.22.0.ebuild b/app-emulation/rkt/rkt-1.22.0.ebuild
new file mode 100644
index 00000000..7e401a4
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.22.0.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="1235.0.0"
+PXE_SYSTEMD_VERSION="v231"
+KVM_LINUX_VERSION="4.8.6"
+KVMTOOL_VERSION="1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2"
+QEMU_VERSION="v2.7.0"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
+"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm_lkvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ ${SRC_URI_KVM}
+)
+rkt_stage1_kvm_qemu? (
+ http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
+ ${SRC_URI_KVM}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
+
+DESCRIPTION="rkt is an App Container runtime for Linux"
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
+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"
+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"
+
+# Some tests fail.
+# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
+RESTRICT="test rkt_stage1_src? ( userpriv )"
+
+DEPEND=">=dev-lang/go-1.5
+ app-arch/cpio
+ app-crypt/trousers
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny
+ rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
+ rkt_stage1_kvm_qemu? (
+ sys-apps/attr[static-libs(+)]
+ sys-libs/libcap[static-libs(+)]
+ sys-libs/zlib[static-libs(+)]
+ >=x11-libs/pixman-0.28.0[static-libs(+)]
+ )"
+
+RDEPEND="!app-emulation/rocket
+ rkt_stage1_host? ( systemd? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ ) )"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+pkg_setup() {
+ enewgroup rkt-admin
+ enewgroup rkt
+}
+
+src_unpack() {
+ local x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
+src_prepare() {
+ eapply_user
+
+ # This patch breaks linux kernel cc-option checks when the
+ # compiler doesn't recognize the -no-pie option.
+ rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
+
+ # avoid sdjournal include for bug 595874
+ if ! use systemd; then
+ sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
+ -i rkt/rkt.mk || die
+ fi
+
+ sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
+
+ # disable git fetch of systemd
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable git fetch of qemu
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
+'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
+'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
+'$(QEMU_CONF_STAMP): get_qemu_sources\n\n'\
+'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' \
+ -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
+ -i stage1/usr_from_kvm/qemu.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ local flavors hypervisors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+ )
+
+ use systemd || myeconfargs+=( --enable-sdjournal=no )
+
+ # enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
+ use rkt_stage1_src && flavors+=",src"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_src; then
+ myeconfargs+=(
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+ )
+ fi
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
+ fi
+
+ if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
+ use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
+ myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} emake V=3
+ ARCH=${arch} emake V=3 bash-completion
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/tools/actool"
+
+ dobin "${S}/${BUILDDIR}/target/bin/rkt"
+
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/target/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_src; then
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_lkvm; then
+ dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_qemu; then
+ dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
+
+ systemd_dounit "${S}"/dist/init/systemd/*.service \
+ "${S}"/dist/init/systemd/*.timer \
+ "${S}"/dist/init/systemd/*.socket
+
+ insinto /usr/lib/tmpfiles.d
+ doins "${S}"/dist/init/systemd/tmpfiles.d/*
+
+ newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
+
+ keepdir /etc/${PN}
+ fowners :rkt-admin /etc/${PN}
+ fperms 2775 /etc/${PN}
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2017-01-08 21:13 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2017-01-08 21:13 UTC (permalink / raw
To: gentoo-commits
commit: 210f613eb52ab9917c7f5f7a5e1ab17d18388ea4
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 8 21:12:39 2017 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Jan 8 21:13:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=210f613e
app-emulation/rkt: remove old versions
Package-Manager: portage-2.3.3
app-emulation/rkt/Manifest | 7 -
app-emulation/rkt/rkt-1.18.0.ebuild | 249 ----------------------------------
app-emulation/rkt/rkt-1.19.0.ebuild | 257 ------------------------------------
app-emulation/rkt/rkt-1.20.0.ebuild | 257 ------------------------------------
4 files changed, 770 deletions(-)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 932f9d4..fa3fd04 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,13 +1,6 @@
DIST kvmtool-1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2.tar.gz 244571 SHA256 c72c0e3463a8f0cfe2cdaa8b8e7951f4eb7293c486e44f84b9e421073dbf5ab9 SHA512 13db2bf2ff794f34c2a825c9b1862c85b0f470c81e3d91177979302f921e3970b8dfaeaf54602005fba8903bba52e43b6e8d67edaa0ee8de82002db7b396c3a0 WHIRLPOOL 0904a5783ac27befb207a5fa0030baede68ae589b69abf012ec733ff2e6d9f77b7198273c22fa7404b2c78bcc9ae40abc39d002519700666ba1e54c6550525b2
-DIST kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz 243930 SHA256 89f4cc94364298aa5b9c39c660ebd82a4beb5351cc838d418e7e21afefb5c1f0 SHA512 70aea2324273603b77aa64c95efd36df35c74514fa820013bfee386332289119cc148aed2983a8c6fd9ddfa5bc3db39c5aa0ee32bfc2077787338a47f2954f2f WHIRLPOOL ee47d7e38509eddf90ef0cf7d0cd3761c623e55a1003e8810e645759dc9615e33fbae22ab5576627f9f86eee8b4ca96c4bdf692b7ab073f1f222734bc378477a
-DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5
DIST linux-4.8.6.tar.xz 91969848 SHA256 74744e00420856cfc8049fa3b3a55e57a116994226a498ef56801bc9492df36b SHA512 235acc394ce347d4131e86f6ff3f3fa9d552bf227c2483c25da7de99f3dc8fd20c4a04db0c8d59cdfa4fa9d98a5b102a5734f7b7704df6648c6efa5e8a7515ea WHIRLPOOL cb27d5654f7351ff32d057501c594f9b6e15fefe78c588b9e9cfedd88fbdb807ba7cfc1e238444d94f3d46168d6edc1bbb8e3966c2ca0f46c668dd4e9d60a01f
-DIST qemu-2.6.1.tar.bz2 25762855 SHA256 4942fd1b6ee31f2f55ffc2201dd7397e6b9c55a2ef332e6d660c730d268e08d1 SHA512 adb55d0774618c9cd02d376222814f2047977bfbca73248841275084ae537db583db4ac6cfa5cc65c3182941d5f4b40f2f7f4661b2cd93cbb3796e2f325bc919 WHIRLPOOL 1b9c0de78fcf874fd307ce2ee49448e96140fae0ea5739af28947bf8f241e768b47abe3edd2d798b826d99cfd4ca143cf71192d254b54ab47515ac59327fc172
DIST qemu-2.7.0.tar.bz2 26867760 SHA256 326e739506ba690daf69fc17bd3913a6c313d9928d743bd8eddb82f403f81e53 SHA512 654acaa7b3724a288e5d7e2a26ab780d9c9ed9f647fba00a906cbaffbe9d58fd666f2d962514aa2c5b391b4c53811ac3170d2eb51727f090bd19dfe45ca9a9db WHIRLPOOL dcb3e5f7da89dd8e14d636d7ebd476e076e0043880bb9ea3fb1c03cb4bcd4e5c7d3c4719da26c3ce521e3a3db5ae671e86f198ac1bc3474e774d75504fef8b8d
-DIST rkt-1.18.0.tar.gz 3042834 SHA256 3897afeb743f77509cf7bfb484800e5b75eadb15f42bc0258e2e5b5598ae8290 SHA512 e47da81dde38f5c63cfd2955b1219c4339b51d5bf396042d7872893c5475f796b0279218380fa43ebe3ed7bbdfaf360ed286095193a279c364623dcbd8d9da14 WHIRLPOOL 409451eb50dfdd0726641ea843e48ebcc10629b6b6e85ce7ece4b1f6cb5b8586645f3990b0d9510ba6b7b3c0f0beb58f1c740e8cb5610fea675eb0c3ea1305a6
-DIST rkt-1.19.0.tar.gz 3071413 SHA256 49b5c1cc9a376a241e8b72b9702a911c3daa9187715e70fddbf2d267140b627a SHA512 0d14716de6cdb2bf6c7d8b1ddd4ae839f98cb05290a8d85f3ed7b604dce5250556d849909c21c51889c43f0779c20f76f708a83bb6ba2b2d7c1f1761cec22a0c WHIRLPOOL 4c0d99fd77444c992be0fc4be7461c8e34b7e26dd64f17f1468d8a0b93b4878d32ded7bcac96a01cf8d6c981bd1ed8b25fae9efde5574a8fb64c7e9f9b290f96
-DIST rkt-1.20.0.tar.gz 3315218 SHA256 3b0a08971cc22004fe8367f8d3e35d5f66fcd0191802b4e35c5c273c1f772096 SHA512 37c46a044838660eb22d74ff5cc16c7d9a29b178a5ccece97d484e4aebfd587a7558d665d2a2162adee859135330d4504a4dca60faf4ce5e3552633924c3b960 WHIRLPOOL 65c734f97f942886c7e7c6bcdc5a99bf3350b7f6286a015af57750c2b7d1282cd2c032d9bdc10d3209fb94c817fbc6f3cf1c8ea5307a820ba9a817d78afd38ca
DIST rkt-1.21.0.tar.gz 3334473 SHA256 63eed8da954c24c1f9010e7513ee6ac21ffeaf63a648f9d5a0f9e9d3eb92fde5 SHA512 2723aab1aadbe7be0f7ce9c7f4e000c76d8c34d167b1157a08de7fb2248e4b73a7fc765ead557db495bab803f5d5c8d09e1d9441301396e18fa49b21a8c4c7ae WHIRLPOOL 11b28be68dd246ddafb5455becc64ea1b185d1128747dc51103ab692c34cd9157423164c4847be9e9a39338cb5ad6e2db3e588545378179b51a0ce58a1be1935
-DIST rkt-pxe-1192.0.0.img 233603403 SHA256 a6233ff4b91457181c3f9eed942af9df66161f5ae84256fbe2d08b5d184c35be SHA512 8e6e5311e209453992da80722229723854b66b983b31922ba68131dbf1c009989e3181ecd6fc9876d1e1eb1956f6463bb66d6ff9114904c4b6dca6c0474fcdee WHIRLPOOL 1d3b0914a38be7518f4f0abc6050aab82318a380bbb2b722671f5e1111aa11fa019ccbd029eaa7f8262bcef90ce159c36eb09dfb8911dd60c57637da4e00270e
DIST rkt-pxe-1235.0.0.img 243713684 SHA256 988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315 SHA512 b19821c63b7b53a1aad3b6e279189f9ceed1f5db1a691d12a70eb7340cceb4c3fd4f7f61a913d9482aec5ce28740b9ee777f86a1ce54f597f50341d701372542 WHIRLPOOL f3905ce3a2a55a027197a2d11ca541323fdfd560d186b4a2c39a8f45e19811067d5de4fbd3656935b12787e1dec79d118d7a01d52a8ef7abd0dad4f38a222b1c
DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
diff --git a/app-emulation/rkt/rkt-1.18.0.ebuild b/app-emulation/rkt/rkt-1.18.0.ebuild
deleted file mode 100644
index b3e3df4..00000000
--- a/app-emulation/rkt/rkt-1.18.0.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="1192.0.0"
-PXE_SYSTEMD_VERSION="v231"
-KVM_LINUX_VERSION="4.3.1"
-KVMTOOL_VERSION="d62653e177597251c24494a6dda60acd6d846671"
-QEMU_VERSION="v2.6.1"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
- ${PXE_URI} -> ${PXE_FILE}
-"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm_lkvm? (
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
- ${SRC_URI_KVM}
-)
-rkt_stage1_kvm_qemu? (
- http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
- ${SRC_URI_KVM}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="rkt is an App Container runtime for Linux"
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
-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"
-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"
-
-DEPEND=">=dev-lang/go-1.5
- app-arch/cpio
- app-crypt/trousers
- sys-fs/squashfs-tools
- dev-perl/Capture-Tiny
- rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
- rkt_stage1_kvm_qemu? (
- sys-apps/attr[static-libs(+)]
- sys-libs/libcap[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- >=x11-libs/pixman-0.28.0[static-libs(+)]
- )"
-
-RDEPEND="!app-emulation/rocket
- rkt_stage1_host? ( systemd? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- ) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-pkg_setup() {
- enewgroup rkt-admin
- enewgroup rkt
-}
-
-src_unpack() {
- local x
- for x in ${A}; do
- case ${x} in
- *.img|linux-*) continue ;;
- kvmtool-*)
- mkdir kvmtool || die
- pushd kvmtool >/dev/null || die
- unpack ${x}
- popd >/dev/null || die
- ;;
- *)
- unpack ${x}
- esac
- done
-}
-
-src_prepare() {
- eapply_user
-
- # avoid sdjournal include for bug 595874
- if ! use systemd; then
- sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
- -i rkt/rkt.mk || die
- fi
-
- sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
-
- # disable git fetch of systemd
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
- # disable git fetch of kvmtool
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
- # disable git fetch of qemu
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
-'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
-'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
-'$(QEMU_CLONE_STAMP): get_qemu_sources\n\n'\
-'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' \
- -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
- -i stage1/usr_from_kvm/qemu.mk || die
-
- # disable fetch of kernel sources
- sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
- -i stage1/usr_from_kvm/kernel.mk || die
-
- if use rkt_stage1_host; then
- # Make systemdUnitsPath consistent with host
- sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
- -i stage1/init/init.go || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- local flavors hypervisors myeconfargs=(
- --with-stage1-default-images-directory="/usr/share/rkt"
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
- )
-
- use systemd || myeconfargs+=( --enable-sdjournal=no )
-
- # enable flavors (first is default)
- use rkt_stage1_host && flavors+=",host"
- use rkt_stage1_src && flavors+=",src"
- use rkt_stage1_coreos && flavors+=",coreos"
- use rkt_stage1_fly && flavors+=",fly"
- { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
- if use rkt_stage1_src; then
- myeconfargs+=(
- --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
- --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
- )
- fi
-
- if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- myeconfargs+=(
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
- )
- fi
-
- if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
- use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
- myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
- fi
-
- # Go's 6l linker does not support PIE, disable so cgo binaries
- # which use 6l+gcc for linking can be built correctly.
- if gcc-specs-pie; then
- append-ldflags -nopie
- fi
-
- export CC=$(tc-getCC)
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export BUILDDIR
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- local arch=${ARCH}
- case ${arch} in
- amd64) arch=x86_64;;
- esac
- ARCH=${arch} emake V=3
- ARCH=${arch} emake V=3 bash-completion
-}
-
-src_install() {
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
- use actool && dobin "${S}/${BUILDDIR}/tools/actool"
-
- dobin "${S}/${BUILDDIR}/target/bin/rkt"
-
- insinto /usr/share/rkt
- doins "${S}/${BUILDDIR}/target/bin/"*.aci
-
- # create symlink for default stage1 image path
- if use rkt_stage1_host; then
- dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_src; then
- dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_coreos; then
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_fly; then
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_lkvm; then
- dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_qemu; then
- dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
- fi
-
- systemd_dounit "${S}"/dist/init/systemd/*.service \
- "${S}"/dist/init/systemd/*.timer \
- "${S}"/dist/init/systemd/*.socket
-
- insinto /usr/lib/tmpfiles.d
- doins "${S}"/dist/init/systemd/tmpfiles.d/*
-
- newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
-
- keepdir /etc/${PN}
- fowners :rkt-admin /etc/${PN}
- fperms 2775 /etc/${PN}
-}
diff --git a/app-emulation/rkt/rkt-1.19.0.ebuild b/app-emulation/rkt/rkt-1.19.0.ebuild
deleted file mode 100644
index 559845b..00000000
--- a/app-emulation/rkt/rkt-1.19.0.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="1192.0.0"
-PXE_SYSTEMD_VERSION="v231"
-KVM_LINUX_VERSION="4.8.6"
-KVMTOOL_VERSION="1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2"
-QEMU_VERSION="v2.7.0"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
- ${PXE_URI} -> ${PXE_FILE}
-"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm_lkvm? (
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
- ${SRC_URI_KVM}
-)
-rkt_stage1_kvm_qemu? (
- http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
- ${SRC_URI_KVM}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="rkt is an App Container runtime for Linux"
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
-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"
-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"
-
-# Some tests fail.
-# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
-RESTRICT="test rkt_stage1_src? ( userpriv )"
-
-DEPEND=">=dev-lang/go-1.5
- app-arch/cpio
- app-crypt/trousers
- sys-fs/squashfs-tools
- dev-perl/Capture-Tiny
- rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
- rkt_stage1_kvm_qemu? (
- sys-apps/attr[static-libs(+)]
- sys-libs/libcap[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- >=x11-libs/pixman-0.28.0[static-libs(+)]
- )"
-
-RDEPEND="!app-emulation/rocket
- rkt_stage1_host? ( systemd? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- ) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-pkg_setup() {
- enewgroup rkt-admin
- enewgroup rkt
-}
-
-src_unpack() {
- local x
- for x in ${A}; do
- case ${x} in
- *.img|linux-*) continue ;;
- kvmtool-*)
- mkdir kvmtool || die
- pushd kvmtool >/dev/null || die
- unpack ${x}
- popd >/dev/null || die
- ;;
- *)
- unpack ${x}
- esac
- done
-}
-
-src_prepare() {
- eapply_user
-
- # This patch breaks linux kernel cc-option checks when the
- # compiler doesn't recognize the -no-pie option.
- rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
-
- # avoid sdjournal include for bug 595874
- if ! use systemd; then
- sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
- -i rkt/rkt.mk || die
- fi
-
- sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
-
- # disable git fetch of systemd
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
- # disable git fetch of kvmtool
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
- # disable git fetch of qemu
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
-'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
-'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
-'$(QEMU_CLONE_STAMP): get_qemu_sources\n\n'\
-'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' \
- -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
- -i stage1/usr_from_kvm/qemu.mk || die
-
- # disable fetch of kernel sources
- sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
- -i stage1/usr_from_kvm/kernel.mk || die
-
- if use rkt_stage1_host; then
- # Make systemdUnitsPath consistent with host
- sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
- -i stage1/init/init.go || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- local flavors hypervisors myeconfargs=(
- --with-stage1-default-images-directory="/usr/share/rkt"
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
- )
-
- use systemd || myeconfargs+=( --enable-sdjournal=no )
-
- # enable flavors (first is default)
- use rkt_stage1_host && flavors+=",host"
- use rkt_stage1_src && flavors+=",src"
- use rkt_stage1_coreos && flavors+=",coreos"
- use rkt_stage1_fly && flavors+=",fly"
- { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
- if use rkt_stage1_src; then
- myeconfargs+=(
- --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
- --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
- )
- fi
-
- if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- myeconfargs+=(
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
- )
- fi
-
- if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
- use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
- myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
- fi
-
- # Go's 6l linker does not support PIE, disable so cgo binaries
- # which use 6l+gcc for linking can be built correctly.
- if gcc-specs-pie; then
- append-ldflags -nopie
- fi
-
- export CC=$(tc-getCC)
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export BUILDDIR
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- local arch=${ARCH}
- case ${arch} in
- amd64) arch=x86_64;;
- esac
- ARCH=${arch} emake V=3
- ARCH=${arch} emake V=3 bash-completion
-}
-
-src_install() {
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
- use actool && dobin "${S}/${BUILDDIR}/tools/actool"
-
- dobin "${S}/${BUILDDIR}/target/bin/rkt"
-
- insinto /usr/share/rkt
- doins "${S}/${BUILDDIR}/target/bin/"*.aci
-
- # create symlink for default stage1 image path
- if use rkt_stage1_host; then
- dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_src; then
- dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_coreos; then
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_fly; then
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_lkvm; then
- dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_qemu; then
- dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
- fi
-
- systemd_dounit "${S}"/dist/init/systemd/*.service \
- "${S}"/dist/init/systemd/*.timer \
- "${S}"/dist/init/systemd/*.socket
-
- insinto /usr/lib/tmpfiles.d
- doins "${S}"/dist/init/systemd/tmpfiles.d/*
-
- newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
-
- keepdir /etc/${PN}
- fowners :rkt-admin /etc/${PN}
- fperms 2775 /etc/${PN}
-}
diff --git a/app-emulation/rkt/rkt-1.20.0.ebuild b/app-emulation/rkt/rkt-1.20.0.ebuild
deleted file mode 100644
index 97a036e..00000000
--- a/app-emulation/rkt/rkt-1.20.0.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="1235.0.0"
-PXE_SYSTEMD_VERSION="v231"
-KVM_LINUX_VERSION="4.8.6"
-KVMTOOL_VERSION="1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2"
-QEMU_VERSION="v2.7.0"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
- ${PXE_URI} -> ${PXE_FILE}
-"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm_lkvm? (
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
- ${SRC_URI_KVM}
-)
-rkt_stage1_kvm_qemu? (
- http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
- ${SRC_URI_KVM}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="rkt is an App Container runtime for Linux"
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
-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"
-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"
-
-# Some tests fail.
-# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
-RESTRICT="test rkt_stage1_src? ( userpriv )"
-
-DEPEND=">=dev-lang/go-1.5
- app-arch/cpio
- app-crypt/trousers
- sys-fs/squashfs-tools
- dev-perl/Capture-Tiny
- rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
- rkt_stage1_kvm_qemu? (
- sys-apps/attr[static-libs(+)]
- sys-libs/libcap[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- >=x11-libs/pixman-0.28.0[static-libs(+)]
- )"
-
-RDEPEND="!app-emulation/rocket
- rkt_stage1_host? ( systemd? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- ) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-pkg_setup() {
- enewgroup rkt-admin
- enewgroup rkt
-}
-
-src_unpack() {
- local x
- for x in ${A}; do
- case ${x} in
- *.img|linux-*) continue ;;
- kvmtool-*)
- mkdir kvmtool || die
- pushd kvmtool >/dev/null || die
- unpack ${x}
- popd >/dev/null || die
- ;;
- *)
- unpack ${x}
- esac
- done
-}
-
-src_prepare() {
- eapply_user
-
- # This patch breaks linux kernel cc-option checks when the
- # compiler doesn't recognize the -no-pie option.
- rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
-
- # avoid sdjournal include for bug 595874
- if ! use systemd; then
- sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
- -i rkt/rkt.mk || die
- fi
-
- sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
-
- # disable git fetch of systemd
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
- # disable git fetch of kvmtool
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
- # disable git fetch of qemu
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
-'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
-'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
-'$(QEMU_CLONE_STAMP): get_qemu_sources\n\n'\
-'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' \
- -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
- -i stage1/usr_from_kvm/qemu.mk || die
-
- # disable fetch of kernel sources
- sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
- -i stage1/usr_from_kvm/kernel.mk || die
-
- if use rkt_stage1_host; then
- # Make systemdUnitsPath consistent with host
- sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
- -i stage1/init/init.go || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- local flavors hypervisors myeconfargs=(
- --with-stage1-default-images-directory="/usr/share/rkt"
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
- )
-
- use systemd || myeconfargs+=( --enable-sdjournal=no )
-
- # enable flavors (first is default)
- use rkt_stage1_host && flavors+=",host"
- use rkt_stage1_src && flavors+=",src"
- use rkt_stage1_coreos && flavors+=",coreos"
- use rkt_stage1_fly && flavors+=",fly"
- { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
- if use rkt_stage1_src; then
- myeconfargs+=(
- --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
- --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
- )
- fi
-
- if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- myeconfargs+=(
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
- )
- fi
-
- if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
- use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
- myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
- fi
-
- # Go's 6l linker does not support PIE, disable so cgo binaries
- # which use 6l+gcc for linking can be built correctly.
- if gcc-specs-pie; then
- append-ldflags -nopie
- fi
-
- export CC=$(tc-getCC)
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export BUILDDIR
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- local arch=${ARCH}
- case ${arch} in
- amd64) arch=x86_64;;
- esac
- ARCH=${arch} emake V=3
- ARCH=${arch} emake V=3 bash-completion
-}
-
-src_install() {
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
- use actool && dobin "${S}/${BUILDDIR}/tools/actool"
-
- dobin "${S}/${BUILDDIR}/target/bin/rkt"
-
- insinto /usr/share/rkt
- doins "${S}/${BUILDDIR}/target/bin/"*.aci
-
- # create symlink for default stage1 image path
- if use rkt_stage1_host; then
- dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_src; then
- dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_coreos; then
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_fly; then
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_lkvm; then
- dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_qemu; then
- dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
- fi
-
- systemd_dounit "${S}"/dist/init/systemd/*.service \
- "${S}"/dist/init/systemd/*.timer \
- "${S}"/dist/init/systemd/*.socket
-
- insinto /usr/lib/tmpfiles.d
- doins "${S}"/dist/init/systemd/tmpfiles.d/*
-
- newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
-
- keepdir /etc/${PN}
- fowners :rkt-admin /etc/${PN}
- fperms 2775 /etc/${PN}
-}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-12-13 7:22 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-12-13 7:22 UTC (permalink / raw
To: gentoo-commits
commit: 0cbb870b82328237b74261ecffc5c2c9a9b535f4
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 13 07:21:33 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Dec 13 07:22:19 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cbb870b
app-emulation/rkt: version bump to 1.21.0
Package-Manager: portage-2.3.3
app-emulation/rkt/Manifest | 1 +
app-emulation/rkt/rkt-1.21.0.ebuild | 257 ++++++++++++++++++++++++++++++++++++
2 files changed, 258 insertions(+)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 0a32a0b..932f9d4 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -7,6 +7,7 @@ DIST qemu-2.7.0.tar.bz2 26867760 SHA256 326e739506ba690daf69fc17bd3913a6c313d992
DIST rkt-1.18.0.tar.gz 3042834 SHA256 3897afeb743f77509cf7bfb484800e5b75eadb15f42bc0258e2e5b5598ae8290 SHA512 e47da81dde38f5c63cfd2955b1219c4339b51d5bf396042d7872893c5475f796b0279218380fa43ebe3ed7bbdfaf360ed286095193a279c364623dcbd8d9da14 WHIRLPOOL 409451eb50dfdd0726641ea843e48ebcc10629b6b6e85ce7ece4b1f6cb5b8586645f3990b0d9510ba6b7b3c0f0beb58f1c740e8cb5610fea675eb0c3ea1305a6
DIST rkt-1.19.0.tar.gz 3071413 SHA256 49b5c1cc9a376a241e8b72b9702a911c3daa9187715e70fddbf2d267140b627a SHA512 0d14716de6cdb2bf6c7d8b1ddd4ae839f98cb05290a8d85f3ed7b604dce5250556d849909c21c51889c43f0779c20f76f708a83bb6ba2b2d7c1f1761cec22a0c WHIRLPOOL 4c0d99fd77444c992be0fc4be7461c8e34b7e26dd64f17f1468d8a0b93b4878d32ded7bcac96a01cf8d6c981bd1ed8b25fae9efde5574a8fb64c7e9f9b290f96
DIST rkt-1.20.0.tar.gz 3315218 SHA256 3b0a08971cc22004fe8367f8d3e35d5f66fcd0191802b4e35c5c273c1f772096 SHA512 37c46a044838660eb22d74ff5cc16c7d9a29b178a5ccece97d484e4aebfd587a7558d665d2a2162adee859135330d4504a4dca60faf4ce5e3552633924c3b960 WHIRLPOOL 65c734f97f942886c7e7c6bcdc5a99bf3350b7f6286a015af57750c2b7d1282cd2c032d9bdc10d3209fb94c817fbc6f3cf1c8ea5307a820ba9a817d78afd38ca
+DIST rkt-1.21.0.tar.gz 3334473 SHA256 63eed8da954c24c1f9010e7513ee6ac21ffeaf63a648f9d5a0f9e9d3eb92fde5 SHA512 2723aab1aadbe7be0f7ce9c7f4e000c76d8c34d167b1157a08de7fb2248e4b73a7fc765ead557db495bab803f5d5c8d09e1d9441301396e18fa49b21a8c4c7ae WHIRLPOOL 11b28be68dd246ddafb5455becc64ea1b185d1128747dc51103ab692c34cd9157423164c4847be9e9a39338cb5ad6e2db3e588545378179b51a0ce58a1be1935
DIST rkt-pxe-1192.0.0.img 233603403 SHA256 a6233ff4b91457181c3f9eed942af9df66161f5ae84256fbe2d08b5d184c35be SHA512 8e6e5311e209453992da80722229723854b66b983b31922ba68131dbf1c009989e3181ecd6fc9876d1e1eb1956f6463bb66d6ff9114904c4b6dca6c0474fcdee WHIRLPOOL 1d3b0914a38be7518f4f0abc6050aab82318a380bbb2b722671f5e1111aa11fa019ccbd029eaa7f8262bcef90ce159c36eb09dfb8911dd60c57637da4e00270e
DIST rkt-pxe-1235.0.0.img 243713684 SHA256 988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315 SHA512 b19821c63b7b53a1aad3b6e279189f9ceed1f5db1a691d12a70eb7340cceb4c3fd4f7f61a913d9482aec5ce28740b9ee777f86a1ce54f597f50341d701372542 WHIRLPOOL f3905ce3a2a55a027197a2d11ca541323fdfd560d186b4a2c39a8f45e19811067d5de4fbd3656935b12787e1dec79d118d7a01d52a8ef7abd0dad4f38a222b1c
DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
diff --git a/app-emulation/rkt/rkt-1.21.0.ebuild b/app-emulation/rkt/rkt-1.21.0.ebuild
new file mode 100644
index 00000000..97a036e
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.21.0.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="1235.0.0"
+PXE_SYSTEMD_VERSION="v231"
+KVM_LINUX_VERSION="4.8.6"
+KVMTOOL_VERSION="1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2"
+QEMU_VERSION="v2.7.0"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
+"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm_lkvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ ${SRC_URI_KVM}
+)
+rkt_stage1_kvm_qemu? (
+ http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
+ ${SRC_URI_KVM}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
+
+DESCRIPTION="rkt is an App Container runtime for Linux"
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
+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"
+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"
+
+# Some tests fail.
+# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
+RESTRICT="test rkt_stage1_src? ( userpriv )"
+
+DEPEND=">=dev-lang/go-1.5
+ app-arch/cpio
+ app-crypt/trousers
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny
+ rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
+ rkt_stage1_kvm_qemu? (
+ sys-apps/attr[static-libs(+)]
+ sys-libs/libcap[static-libs(+)]
+ sys-libs/zlib[static-libs(+)]
+ >=x11-libs/pixman-0.28.0[static-libs(+)]
+ )"
+
+RDEPEND="!app-emulation/rocket
+ rkt_stage1_host? ( systemd? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ ) )"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+pkg_setup() {
+ enewgroup rkt-admin
+ enewgroup rkt
+}
+
+src_unpack() {
+ local x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
+src_prepare() {
+ eapply_user
+
+ # This patch breaks linux kernel cc-option checks when the
+ # compiler doesn't recognize the -no-pie option.
+ rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
+
+ # avoid sdjournal include for bug 595874
+ if ! use systemd; then
+ sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
+ -i rkt/rkt.mk || die
+ fi
+
+ sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
+
+ # disable git fetch of systemd
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable git fetch of qemu
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
+'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
+'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
+'$(QEMU_CLONE_STAMP): get_qemu_sources\n\n'\
+'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' \
+ -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
+ -i stage1/usr_from_kvm/qemu.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ local flavors hypervisors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+ )
+
+ use systemd || myeconfargs+=( --enable-sdjournal=no )
+
+ # enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
+ use rkt_stage1_src && flavors+=",src"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_src; then
+ myeconfargs+=(
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+ )
+ fi
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
+ fi
+
+ if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
+ use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
+ myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} emake V=3
+ ARCH=${arch} emake V=3 bash-completion
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/tools/actool"
+
+ dobin "${S}/${BUILDDIR}/target/bin/rkt"
+
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/target/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_src; then
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_lkvm; then
+ dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_qemu; then
+ dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
+
+ systemd_dounit "${S}"/dist/init/systemd/*.service \
+ "${S}"/dist/init/systemd/*.timer \
+ "${S}"/dist/init/systemd/*.socket
+
+ insinto /usr/lib/tmpfiles.d
+ doins "${S}"/dist/init/systemd/tmpfiles.d/*
+
+ newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
+
+ keepdir /etc/${PN}
+ fowners :rkt-admin /etc/${PN}
+ fperms 2775 /etc/${PN}
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-11-28 1:54 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-11-28 1:54 UTC (permalink / raw
To: gentoo-commits
commit: 0e2671c891f5cd924eecb8ff9555086e9e670a99
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 28 01:53:20 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Nov 28 01:53:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e2671c8
app-emulation/rkt: remove old versions
Package-Manager: portage-2.3.2
app-emulation/rkt/Manifest | 3 -
app-emulation/rkt/rkt-1.16.0.ebuild | 245 -----------------------------------
app-emulation/rkt/rkt-1.17.0.ebuild | 247 ------------------------------------
3 files changed, 495 deletions(-)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index a5f038a..0a32a0b 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -4,12 +4,9 @@ DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9f
DIST linux-4.8.6.tar.xz 91969848 SHA256 74744e00420856cfc8049fa3b3a55e57a116994226a498ef56801bc9492df36b SHA512 235acc394ce347d4131e86f6ff3f3fa9d552bf227c2483c25da7de99f3dc8fd20c4a04db0c8d59cdfa4fa9d98a5b102a5734f7b7704df6648c6efa5e8a7515ea WHIRLPOOL cb27d5654f7351ff32d057501c594f9b6e15fefe78c588b9e9cfedd88fbdb807ba7cfc1e238444d94f3d46168d6edc1bbb8e3966c2ca0f46c668dd4e9d60a01f
DIST qemu-2.6.1.tar.bz2 25762855 SHA256 4942fd1b6ee31f2f55ffc2201dd7397e6b9c55a2ef332e6d660c730d268e08d1 SHA512 adb55d0774618c9cd02d376222814f2047977bfbca73248841275084ae537db583db4ac6cfa5cc65c3182941d5f4b40f2f7f4661b2cd93cbb3796e2f325bc919 WHIRLPOOL 1b9c0de78fcf874fd307ce2ee49448e96140fae0ea5739af28947bf8f241e768b47abe3edd2d798b826d99cfd4ca143cf71192d254b54ab47515ac59327fc172
DIST qemu-2.7.0.tar.bz2 26867760 SHA256 326e739506ba690daf69fc17bd3913a6c313d9928d743bd8eddb82f403f81e53 SHA512 654acaa7b3724a288e5d7e2a26ab780d9c9ed9f647fba00a906cbaffbe9d58fd666f2d962514aa2c5b391b4c53811ac3170d2eb51727f090bd19dfe45ca9a9db WHIRLPOOL dcb3e5f7da89dd8e14d636d7ebd476e076e0043880bb9ea3fb1c03cb4bcd4e5c7d3c4719da26c3ce521e3a3db5ae671e86f198ac1bc3474e774d75504fef8b8d
-DIST rkt-1.16.0.tar.gz 3028683 SHA256 8c7bb07217b68e153d54e45646072fd267ee1ee88a410887f2d8f75eb4752e89 SHA512 b270c8340ca5a22c48209f9d8fa6c55e8cd1b8e238117c4e3a9e5d4fff04bde194e53d10112dd429f5f1c36e0395ca42ae6bd12fd5ebff68a50d3546a1a8d31d WHIRLPOOL d532cfac6347d675b5cbf96e9c38d4cdbb4f4fbd493474567755ff3560c31b8edc59c2cf83f51953ac56c81f7f1af84c625cf1c7f571a48275b6df3dd8f171f3
-DIST rkt-1.17.0.tar.gz 3031700 SHA256 9cebd53d14f37fdfae6f2cb4114d472399773d14f2b8cbff6ea60dcb11a57604 SHA512 ee7346391a386fb3bbd52b751d2814700d5fde5c616b0dd76c4bb0f78f9d5e9d7f9ee574a2feee121ccee7f0a900e76b77428f3f6de8c6b6cb3bd324d763b1f0 WHIRLPOOL dbf7a8ad99e3e0ae40be6ac36e6794afe7d5f9a07def1bb4f88ada9abe13e2b2af3e6ae44d7850b228d16249c5fc9b72083271bc74cc56f3c4de20e35092f903
DIST rkt-1.18.0.tar.gz 3042834 SHA256 3897afeb743f77509cf7bfb484800e5b75eadb15f42bc0258e2e5b5598ae8290 SHA512 e47da81dde38f5c63cfd2955b1219c4339b51d5bf396042d7872893c5475f796b0279218380fa43ebe3ed7bbdfaf360ed286095193a279c364623dcbd8d9da14 WHIRLPOOL 409451eb50dfdd0726641ea843e48ebcc10629b6b6e85ce7ece4b1f6cb5b8586645f3990b0d9510ba6b7b3c0f0beb58f1c740e8cb5610fea675eb0c3ea1305a6
DIST rkt-1.19.0.tar.gz 3071413 SHA256 49b5c1cc9a376a241e8b72b9702a911c3daa9187715e70fddbf2d267140b627a SHA512 0d14716de6cdb2bf6c7d8b1ddd4ae839f98cb05290a8d85f3ed7b604dce5250556d849909c21c51889c43f0779c20f76f708a83bb6ba2b2d7c1f1761cec22a0c WHIRLPOOL 4c0d99fd77444c992be0fc4be7461c8e34b7e26dd64f17f1468d8a0b93b4878d32ded7bcac96a01cf8d6c981bd1ed8b25fae9efde5574a8fb64c7e9f9b290f96
DIST rkt-1.20.0.tar.gz 3315218 SHA256 3b0a08971cc22004fe8367f8d3e35d5f66fcd0191802b4e35c5c273c1f772096 SHA512 37c46a044838660eb22d74ff5cc16c7d9a29b178a5ccece97d484e4aebfd587a7558d665d2a2162adee859135330d4504a4dca60faf4ce5e3552633924c3b960 WHIRLPOOL 65c734f97f942886c7e7c6bcdc5a99bf3350b7f6286a015af57750c2b7d1282cd2c032d9bdc10d3209fb94c817fbc6f3cf1c8ea5307a820ba9a817d78afd38ca
-DIST rkt-pxe-1151.0.0.img 243335216 SHA256 6f08697bea372af916a150f9846110e8855305653e5582b2c2ea04f14253e5c8 SHA512 fe7c4ec8cb4d11ba704b9f78c43557a374fda70dbfd7c3f4f9e768cf5ae365aab7a1fee8d51e19bbad6809ad4cdfe4eed60e5cdb6babd869a3a91b503b7256e8 WHIRLPOOL 92f8a65a9c50c11fa9c56acee53dd5623dd186664f44c6517bac4ee5be6a9dd2a9141ef522d978cc5b282c6638e17bf7b3559d68d6ea6c0752821799c0c88a5c
DIST rkt-pxe-1192.0.0.img 233603403 SHA256 a6233ff4b91457181c3f9eed942af9df66161f5ae84256fbe2d08b5d184c35be SHA512 8e6e5311e209453992da80722229723854b66b983b31922ba68131dbf1c009989e3181ecd6fc9876d1e1eb1956f6463bb66d6ff9114904c4b6dca6c0474fcdee WHIRLPOOL 1d3b0914a38be7518f4f0abc6050aab82318a380bbb2b722671f5e1111aa11fa019ccbd029eaa7f8262bcef90ce159c36eb09dfb8911dd60c57637da4e00270e
DIST rkt-pxe-1235.0.0.img 243713684 SHA256 988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315 SHA512 b19821c63b7b53a1aad3b6e279189f9ceed1f5db1a691d12a70eb7340cceb4c3fd4f7f61a913d9482aec5ce28740b9ee777f86a1ce54f597f50341d701372542 WHIRLPOOL f3905ce3a2a55a027197a2d11ca541323fdfd560d186b4a2c39a8f45e19811067d5de4fbd3656935b12787e1dec79d118d7a01d52a8ef7abd0dad4f38a222b1c
DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
diff --git a/app-emulation/rkt/rkt-1.16.0.ebuild b/app-emulation/rkt/rkt-1.16.0.ebuild
deleted file mode 100644
index 00f2ec2..00000000
--- a/app-emulation/rkt/rkt-1.16.0.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="1151.0.0"
-PXE_SYSTEMD_VERSION="v231"
-KVM_LINUX_VERSION="4.3.1"
-KVMTOOL_VERSION="d62653e177597251c24494a6dda60acd6d846671"
-QEMU_VERSION="v2.6.1"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
- ${PXE_URI} -> ${PXE_FILE}
-"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm_lkvm? (
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
- ${SRC_URI_KVM}
-)
-rkt_stage1_kvm_qemu? (
- http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
- ${SRC_URI_KVM}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="rkt is an App Container runtime for Linux"
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
-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"
-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"
-
-DEPEND=">=dev-lang/go-1.5
- app-arch/cpio
- app-crypt/trousers
- sys-fs/squashfs-tools
- dev-perl/Capture-Tiny
- rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
- rkt_stage1_kvm_qemu? (
- sys-libs/libcap[static-libs(+)]
- >=x11-libs/pixman-0.28.0[static-libs(+)]
- )"
-
-RDEPEND="!app-emulation/rocket
- rkt_stage1_host? ( systemd? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- ) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-pkg_setup() {
- enewgroup rkt-admin
- enewgroup rkt
-}
-
-src_unpack() {
- local x
- for x in ${A}; do
- case ${x} in
- *.img|linux-*) continue ;;
- kvmtool-*)
- mkdir kvmtool || die
- pushd kvmtool >/dev/null || die
- unpack ${x}
- popd >/dev/null || die
- ;;
- *)
- unpack ${x}
- esac
- done
-}
-
-src_prepare() {
- eapply_user
-
- # avoid sdjournal include for bug 595874
- if ! use systemd; then
- sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
- -i rkt/rkt.mk || die
- fi
-
- sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
-
- # disable git fetch of systemd
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
- # disable git fetch of kvmtool
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
- # disable git fetch of qemu
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
-'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
-'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
-'$(QEMU_CLONE_STAMP): get_qemu_sources\n\n'\
-'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' \
- -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-opengl|' \
- -i stage1/usr_from_kvm/qemu.mk || die
-
- # disable fetch of kernel sources
- sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
- -i stage1/usr_from_kvm/kernel.mk || die
-
- if use rkt_stage1_host; then
- # Make systemdUnitsPath consistent with host
- sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
- -i stage1/init/init.go || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- local flavors hypervisors myeconfargs=(
- --with-stage1-default-images-directory="/usr/share/rkt"
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
- )
-
- use systemd || myeconfargs+=( --enable-sdjournal=no )
-
- # enable flavors (first is default)
- use rkt_stage1_host && flavors+=",host"
- use rkt_stage1_src && flavors+=",src"
- use rkt_stage1_coreos && flavors+=",coreos"
- use rkt_stage1_fly && flavors+=",fly"
- { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
- if use rkt_stage1_src; then
- myeconfargs+=(
- --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
- --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
- )
- fi
-
- if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- myeconfargs+=(
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
- )
- fi
-
- if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
- use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
- myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
- fi
-
- # Go's 6l linker does not support PIE, disable so cgo binaries
- # which use 6l+gcc for linking can be built correctly.
- if gcc-specs-pie; then
- append-ldflags -nopie
- fi
-
- export CC=$(tc-getCC)
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export BUILDDIR
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- local arch=${ARCH}
- case ${arch} in
- amd64) arch=x86_64;;
- esac
- ARCH=${arch} emake V=3
- ARCH=${arch} emake V=3 bash-completion
-}
-
-src_install() {
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
- use actool && dobin "${S}/${BUILDDIR}/tools/actool"
-
- dobin "${S}/${BUILDDIR}/target/bin/rkt"
-
- insinto /usr/share/rkt
- doins "${S}/${BUILDDIR}/target/bin/"*.aci
-
- # create symlink for default stage1 image path
- if use rkt_stage1_host; then
- dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_src; then
- dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_coreos; then
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_fly; then
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_lkvm; then
- dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_qemu; then
- dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
- fi
-
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
-
- newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
-
- keepdir /etc/${PN}
- fowners :rkt-admin /etc/${PN}
- fperms 2775 /etc/${PN}
-}
diff --git a/app-emulation/rkt/rkt-1.17.0.ebuild b/app-emulation/rkt/rkt-1.17.0.ebuild
deleted file mode 100644
index 9e0068c..00000000
--- a/app-emulation/rkt/rkt-1.17.0.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="1151.0.0"
-PXE_SYSTEMD_VERSION="v231"
-KVM_LINUX_VERSION="4.3.1"
-KVMTOOL_VERSION="d62653e177597251c24494a6dda60acd6d846671"
-QEMU_VERSION="v2.6.1"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
- ${PXE_URI} -> ${PXE_FILE}
-"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm_lkvm? (
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
- ${SRC_URI_KVM}
-)
-rkt_stage1_kvm_qemu? (
- http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
- ${SRC_URI_KVM}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="rkt is an App Container runtime for Linux"
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
-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"
-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"
-
-DEPEND=">=dev-lang/go-1.5
- app-arch/cpio
- app-crypt/trousers
- sys-fs/squashfs-tools
- dev-perl/Capture-Tiny
- rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
- rkt_stage1_kvm_qemu? (
- sys-libs/libcap[static-libs(+)]
- >=x11-libs/pixman-0.28.0[static-libs(+)]
- )"
-
-RDEPEND="!app-emulation/rocket
- rkt_stage1_host? ( systemd? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- ) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-pkg_setup() {
- enewgroup rkt-admin
- enewgroup rkt
-}
-
-src_unpack() {
- local x
- for x in ${A}; do
- case ${x} in
- *.img|linux-*) continue ;;
- kvmtool-*)
- mkdir kvmtool || die
- pushd kvmtool >/dev/null || die
- unpack ${x}
- popd >/dev/null || die
- ;;
- *)
- unpack ${x}
- esac
- done
-}
-
-src_prepare() {
- eapply_user
-
- # avoid sdjournal include for bug 595874
- if ! use systemd; then
- sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
- -i rkt/rkt.mk || die
- fi
-
- sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
-
- # disable git fetch of systemd
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
- # disable git fetch of kvmtool
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
- # disable git fetch of qemu
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
-'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
-'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
-'$(QEMU_CLONE_STAMP): get_qemu_sources\n\n'\
-'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' \
- -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-opengl|' \
- -i stage1/usr_from_kvm/qemu.mk || die
-
- # disable fetch of kernel sources
- sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
- -i stage1/usr_from_kvm/kernel.mk || die
-
- if use rkt_stage1_host; then
- # Make systemdUnitsPath consistent with host
- sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
- -i stage1/init/init.go || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- local flavors hypervisors myeconfargs=(
- --with-stage1-default-images-directory="/usr/share/rkt"
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
- )
-
- use systemd || myeconfargs+=( --enable-sdjournal=no )
-
- # enable flavors (first is default)
- use rkt_stage1_host && flavors+=",host"
- use rkt_stage1_src && flavors+=",src"
- use rkt_stage1_coreos && flavors+=",coreos"
- use rkt_stage1_fly && flavors+=",fly"
- { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
- if use rkt_stage1_src; then
- myeconfargs+=(
- --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
- --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
- )
- fi
-
- if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- myeconfargs+=(
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
- )
- fi
-
- if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
- use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
- myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
- fi
-
- # Go's 6l linker does not support PIE, disable so cgo binaries
- # which use 6l+gcc for linking can be built correctly.
- if gcc-specs-pie; then
- append-ldflags -nopie
- fi
-
- export CC=$(tc-getCC)
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export BUILDDIR
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- local arch=${ARCH}
- case ${arch} in
- amd64) arch=x86_64;;
- esac
- ARCH=${arch} emake V=3
- ARCH=${arch} emake V=3 bash-completion
-}
-
-src_install() {
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
- use actool && dobin "${S}/${BUILDDIR}/tools/actool"
-
- dobin "${S}/${BUILDDIR}/target/bin/rkt"
-
- insinto /usr/share/rkt
- doins "${S}/${BUILDDIR}/target/bin/"*.aci
-
- # create symlink for default stage1 image path
- if use rkt_stage1_host; then
- dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_src; then
- dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_coreos; then
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_fly; then
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_lkvm; then
- dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_qemu; then
- dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
- fi
-
- systemd_dounit "${S}"/dist/init/systemd/*.service \
- "${S}"/dist/init/systemd/*.timer \
- "${S}"/dist/init/systemd/*.socket
-
- insinto /usr/lib/tmpfiles.d
- doins "${S}"/dist/init/systemd/tmpfiles.d/*
-
- newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
-
- keepdir /etc/${PN}
- fowners :rkt-admin /etc/${PN}
- fperms 2775 /etc/${PN}
-}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-11-28 1:52 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-11-28 1:52 UTC (permalink / raw
To: gentoo-commits
commit: a3b8b4a629a69bc56c084531d3e9eb87936b7153
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 28 01:51:38 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Nov 28 01:52:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3b8b4a6
app-emulation/rkt: version bump to 1.20.0
Package-Manager: portage-2.3.2
app-emulation/rkt/Manifest | 2 +
app-emulation/rkt/rkt-1.20.0.ebuild | 257 ++++++++++++++++++++++++++++++++++++
2 files changed, 259 insertions(+)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 1a86a21..a5f038a 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -8,6 +8,8 @@ DIST rkt-1.16.0.tar.gz 3028683 SHA256 8c7bb07217b68e153d54e45646072fd267ee1ee88a
DIST rkt-1.17.0.tar.gz 3031700 SHA256 9cebd53d14f37fdfae6f2cb4114d472399773d14f2b8cbff6ea60dcb11a57604 SHA512 ee7346391a386fb3bbd52b751d2814700d5fde5c616b0dd76c4bb0f78f9d5e9d7f9ee574a2feee121ccee7f0a900e76b77428f3f6de8c6b6cb3bd324d763b1f0 WHIRLPOOL dbf7a8ad99e3e0ae40be6ac36e6794afe7d5f9a07def1bb4f88ada9abe13e2b2af3e6ae44d7850b228d16249c5fc9b72083271bc74cc56f3c4de20e35092f903
DIST rkt-1.18.0.tar.gz 3042834 SHA256 3897afeb743f77509cf7bfb484800e5b75eadb15f42bc0258e2e5b5598ae8290 SHA512 e47da81dde38f5c63cfd2955b1219c4339b51d5bf396042d7872893c5475f796b0279218380fa43ebe3ed7bbdfaf360ed286095193a279c364623dcbd8d9da14 WHIRLPOOL 409451eb50dfdd0726641ea843e48ebcc10629b6b6e85ce7ece4b1f6cb5b8586645f3990b0d9510ba6b7b3c0f0beb58f1c740e8cb5610fea675eb0c3ea1305a6
DIST rkt-1.19.0.tar.gz 3071413 SHA256 49b5c1cc9a376a241e8b72b9702a911c3daa9187715e70fddbf2d267140b627a SHA512 0d14716de6cdb2bf6c7d8b1ddd4ae839f98cb05290a8d85f3ed7b604dce5250556d849909c21c51889c43f0779c20f76f708a83bb6ba2b2d7c1f1761cec22a0c WHIRLPOOL 4c0d99fd77444c992be0fc4be7461c8e34b7e26dd64f17f1468d8a0b93b4878d32ded7bcac96a01cf8d6c981bd1ed8b25fae9efde5574a8fb64c7e9f9b290f96
+DIST rkt-1.20.0.tar.gz 3315218 SHA256 3b0a08971cc22004fe8367f8d3e35d5f66fcd0191802b4e35c5c273c1f772096 SHA512 37c46a044838660eb22d74ff5cc16c7d9a29b178a5ccece97d484e4aebfd587a7558d665d2a2162adee859135330d4504a4dca60faf4ce5e3552633924c3b960 WHIRLPOOL 65c734f97f942886c7e7c6bcdc5a99bf3350b7f6286a015af57750c2b7d1282cd2c032d9bdc10d3209fb94c817fbc6f3cf1c8ea5307a820ba9a817d78afd38ca
DIST rkt-pxe-1151.0.0.img 243335216 SHA256 6f08697bea372af916a150f9846110e8855305653e5582b2c2ea04f14253e5c8 SHA512 fe7c4ec8cb4d11ba704b9f78c43557a374fda70dbfd7c3f4f9e768cf5ae365aab7a1fee8d51e19bbad6809ad4cdfe4eed60e5cdb6babd869a3a91b503b7256e8 WHIRLPOOL 92f8a65a9c50c11fa9c56acee53dd5623dd186664f44c6517bac4ee5be6a9dd2a9141ef522d978cc5b282c6638e17bf7b3559d68d6ea6c0752821799c0c88a5c
DIST rkt-pxe-1192.0.0.img 233603403 SHA256 a6233ff4b91457181c3f9eed942af9df66161f5ae84256fbe2d08b5d184c35be SHA512 8e6e5311e209453992da80722229723854b66b983b31922ba68131dbf1c009989e3181ecd6fc9876d1e1eb1956f6463bb66d6ff9114904c4b6dca6c0474fcdee WHIRLPOOL 1d3b0914a38be7518f4f0abc6050aab82318a380bbb2b722671f5e1111aa11fa019ccbd029eaa7f8262bcef90ce159c36eb09dfb8911dd60c57637da4e00270e
+DIST rkt-pxe-1235.0.0.img 243713684 SHA256 988e4ad8e044dd8bff54cb5e0a34a1ed25cf7bc8cc241f1a90e3fe7f1412f315 SHA512 b19821c63b7b53a1aad3b6e279189f9ceed1f5db1a691d12a70eb7340cceb4c3fd4f7f61a913d9482aec5ce28740b9ee777f86a1ce54f597f50341d701372542 WHIRLPOOL f3905ce3a2a55a027197a2d11ca541323fdfd560d186b4a2c39a8f45e19811067d5de4fbd3656935b12787e1dec79d118d7a01d52a8ef7abd0dad4f38a222b1c
DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
diff --git a/app-emulation/rkt/rkt-1.20.0.ebuild b/app-emulation/rkt/rkt-1.20.0.ebuild
new file mode 100644
index 00000000..97a036e
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.20.0.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="1235.0.0"
+PXE_SYSTEMD_VERSION="v231"
+KVM_LINUX_VERSION="4.8.6"
+KVMTOOL_VERSION="1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2"
+QEMU_VERSION="v2.7.0"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
+"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm_lkvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ ${SRC_URI_KVM}
+)
+rkt_stage1_kvm_qemu? (
+ http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
+ ${SRC_URI_KVM}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
+
+DESCRIPTION="rkt is an App Container runtime for Linux"
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
+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"
+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"
+
+# Some tests fail.
+# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
+RESTRICT="test rkt_stage1_src? ( userpriv )"
+
+DEPEND=">=dev-lang/go-1.5
+ app-arch/cpio
+ app-crypt/trousers
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny
+ rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
+ rkt_stage1_kvm_qemu? (
+ sys-apps/attr[static-libs(+)]
+ sys-libs/libcap[static-libs(+)]
+ sys-libs/zlib[static-libs(+)]
+ >=x11-libs/pixman-0.28.0[static-libs(+)]
+ )"
+
+RDEPEND="!app-emulation/rocket
+ rkt_stage1_host? ( systemd? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ ) )"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+pkg_setup() {
+ enewgroup rkt-admin
+ enewgroup rkt
+}
+
+src_unpack() {
+ local x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
+src_prepare() {
+ eapply_user
+
+ # This patch breaks linux kernel cc-option checks when the
+ # compiler doesn't recognize the -no-pie option.
+ rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
+
+ # avoid sdjournal include for bug 595874
+ if ! use systemd; then
+ sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
+ -i rkt/rkt.mk || die
+ fi
+
+ sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
+
+ # disable git fetch of systemd
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable git fetch of qemu
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
+'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
+'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
+'$(QEMU_CLONE_STAMP): get_qemu_sources\n\n'\
+'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' \
+ -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
+ -i stage1/usr_from_kvm/qemu.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ local flavors hypervisors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+ )
+
+ use systemd || myeconfargs+=( --enable-sdjournal=no )
+
+ # enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
+ use rkt_stage1_src && flavors+=",src"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_src; then
+ myeconfargs+=(
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+ )
+ fi
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
+ fi
+
+ if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
+ use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
+ myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} emake V=3
+ ARCH=${arch} emake V=3 bash-completion
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/tools/actool"
+
+ dobin "${S}/${BUILDDIR}/target/bin/rkt"
+
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/target/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_src; then
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_lkvm; then
+ dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_qemu; then
+ dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
+
+ systemd_dounit "${S}"/dist/init/systemd/*.service \
+ "${S}"/dist/init/systemd/*.timer \
+ "${S}"/dist/init/systemd/*.socket
+
+ insinto /usr/lib/tmpfiles.d
+ doins "${S}"/dist/init/systemd/tmpfiles.d/*
+
+ newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
+
+ keepdir /etc/${PN}
+ fowners :rkt-admin /etc/${PN}
+ fperms 2775 /etc/${PN}
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-11-20 0:08 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-11-20 0:08 UTC (permalink / raw
To: gentoo-commits
commit: 0fc5ee626f97f8d86c616cf80d1ed9b831a6d6b2
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 00:06:17 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 00:08:35 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fc5ee62
app-emulation/rkt: version bump to 1.19.0
Package-Manager: portage-2.3.2
app-emulation/rkt/Manifest | 4 +
app-emulation/rkt/rkt-1.19.0.ebuild | 257 ++++++++++++++++++++++++++++++++++++
2 files changed, 261 insertions(+)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index cdccf3b..1a86a21 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,9 +1,13 @@
+DIST kvmtool-1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2.tar.gz 244571 SHA256 c72c0e3463a8f0cfe2cdaa8b8e7951f4eb7293c486e44f84b9e421073dbf5ab9 SHA512 13db2bf2ff794f34c2a825c9b1862c85b0f470c81e3d91177979302f921e3970b8dfaeaf54602005fba8903bba52e43b6e8d67edaa0ee8de82002db7b396c3a0 WHIRLPOOL 0904a5783ac27befb207a5fa0030baede68ae589b69abf012ec733ff2e6d9f77b7198273c22fa7404b2c78bcc9ae40abc39d002519700666ba1e54c6550525b2
DIST kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz 243930 SHA256 89f4cc94364298aa5b9c39c660ebd82a4beb5351cc838d418e7e21afefb5c1f0 SHA512 70aea2324273603b77aa64c95efd36df35c74514fa820013bfee386332289119cc148aed2983a8c6fd9ddfa5bc3db39c5aa0ee32bfc2077787338a47f2954f2f WHIRLPOOL ee47d7e38509eddf90ef0cf7d0cd3761c623e55a1003e8810e645759dc9615e33fbae22ab5576627f9f86eee8b4ca96c4bdf692b7ab073f1f222734bc378477a
DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5
+DIST linux-4.8.6.tar.xz 91969848 SHA256 74744e00420856cfc8049fa3b3a55e57a116994226a498ef56801bc9492df36b SHA512 235acc394ce347d4131e86f6ff3f3fa9d552bf227c2483c25da7de99f3dc8fd20c4a04db0c8d59cdfa4fa9d98a5b102a5734f7b7704df6648c6efa5e8a7515ea WHIRLPOOL cb27d5654f7351ff32d057501c594f9b6e15fefe78c588b9e9cfedd88fbdb807ba7cfc1e238444d94f3d46168d6edc1bbb8e3966c2ca0f46c668dd4e9d60a01f
DIST qemu-2.6.1.tar.bz2 25762855 SHA256 4942fd1b6ee31f2f55ffc2201dd7397e6b9c55a2ef332e6d660c730d268e08d1 SHA512 adb55d0774618c9cd02d376222814f2047977bfbca73248841275084ae537db583db4ac6cfa5cc65c3182941d5f4b40f2f7f4661b2cd93cbb3796e2f325bc919 WHIRLPOOL 1b9c0de78fcf874fd307ce2ee49448e96140fae0ea5739af28947bf8f241e768b47abe3edd2d798b826d99cfd4ca143cf71192d254b54ab47515ac59327fc172
+DIST qemu-2.7.0.tar.bz2 26867760 SHA256 326e739506ba690daf69fc17bd3913a6c313d9928d743bd8eddb82f403f81e53 SHA512 654acaa7b3724a288e5d7e2a26ab780d9c9ed9f647fba00a906cbaffbe9d58fd666f2d962514aa2c5b391b4c53811ac3170d2eb51727f090bd19dfe45ca9a9db WHIRLPOOL dcb3e5f7da89dd8e14d636d7ebd476e076e0043880bb9ea3fb1c03cb4bcd4e5c7d3c4719da26c3ce521e3a3db5ae671e86f198ac1bc3474e774d75504fef8b8d
DIST rkt-1.16.0.tar.gz 3028683 SHA256 8c7bb07217b68e153d54e45646072fd267ee1ee88a410887f2d8f75eb4752e89 SHA512 b270c8340ca5a22c48209f9d8fa6c55e8cd1b8e238117c4e3a9e5d4fff04bde194e53d10112dd429f5f1c36e0395ca42ae6bd12fd5ebff68a50d3546a1a8d31d WHIRLPOOL d532cfac6347d675b5cbf96e9c38d4cdbb4f4fbd493474567755ff3560c31b8edc59c2cf83f51953ac56c81f7f1af84c625cf1c7f571a48275b6df3dd8f171f3
DIST rkt-1.17.0.tar.gz 3031700 SHA256 9cebd53d14f37fdfae6f2cb4114d472399773d14f2b8cbff6ea60dcb11a57604 SHA512 ee7346391a386fb3bbd52b751d2814700d5fde5c616b0dd76c4bb0f78f9d5e9d7f9ee574a2feee121ccee7f0a900e76b77428f3f6de8c6b6cb3bd324d763b1f0 WHIRLPOOL dbf7a8ad99e3e0ae40be6ac36e6794afe7d5f9a07def1bb4f88ada9abe13e2b2af3e6ae44d7850b228d16249c5fc9b72083271bc74cc56f3c4de20e35092f903
DIST rkt-1.18.0.tar.gz 3042834 SHA256 3897afeb743f77509cf7bfb484800e5b75eadb15f42bc0258e2e5b5598ae8290 SHA512 e47da81dde38f5c63cfd2955b1219c4339b51d5bf396042d7872893c5475f796b0279218380fa43ebe3ed7bbdfaf360ed286095193a279c364623dcbd8d9da14 WHIRLPOOL 409451eb50dfdd0726641ea843e48ebcc10629b6b6e85ce7ece4b1f6cb5b8586645f3990b0d9510ba6b7b3c0f0beb58f1c740e8cb5610fea675eb0c3ea1305a6
+DIST rkt-1.19.0.tar.gz 3071413 SHA256 49b5c1cc9a376a241e8b72b9702a911c3daa9187715e70fddbf2d267140b627a SHA512 0d14716de6cdb2bf6c7d8b1ddd4ae839f98cb05290a8d85f3ed7b604dce5250556d849909c21c51889c43f0779c20f76f708a83bb6ba2b2d7c1f1761cec22a0c WHIRLPOOL 4c0d99fd77444c992be0fc4be7461c8e34b7e26dd64f17f1468d8a0b93b4878d32ded7bcac96a01cf8d6c981bd1ed8b25fae9efde5574a8fb64c7e9f9b290f96
DIST rkt-pxe-1151.0.0.img 243335216 SHA256 6f08697bea372af916a150f9846110e8855305653e5582b2c2ea04f14253e5c8 SHA512 fe7c4ec8cb4d11ba704b9f78c43557a374fda70dbfd7c3f4f9e768cf5ae365aab7a1fee8d51e19bbad6809ad4cdfe4eed60e5cdb6babd869a3a91b503b7256e8 WHIRLPOOL 92f8a65a9c50c11fa9c56acee53dd5623dd186664f44c6517bac4ee5be6a9dd2a9141ef522d978cc5b282c6638e17bf7b3559d68d6ea6c0752821799c0c88a5c
DIST rkt-pxe-1192.0.0.img 233603403 SHA256 a6233ff4b91457181c3f9eed942af9df66161f5ae84256fbe2d08b5d184c35be SHA512 8e6e5311e209453992da80722229723854b66b983b31922ba68131dbf1c009989e3181ecd6fc9876d1e1eb1956f6463bb66d6ff9114904c4b6dca6c0474fcdee WHIRLPOOL 1d3b0914a38be7518f4f0abc6050aab82318a380bbb2b722671f5e1111aa11fa019ccbd029eaa7f8262bcef90ce159c36eb09dfb8911dd60c57637da4e00270e
DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
diff --git a/app-emulation/rkt/rkt-1.19.0.ebuild b/app-emulation/rkt/rkt-1.19.0.ebuild
new file mode 100644
index 00000000..559845b
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.19.0.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="1192.0.0"
+PXE_SYSTEMD_VERSION="v231"
+KVM_LINUX_VERSION="4.8.6"
+KVMTOOL_VERSION="1cd6f516264ad2ad83fad3dc1264d6ff4bcd17b2"
+QEMU_VERSION="v2.7.0"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
+"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm_lkvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ ${SRC_URI_KVM}
+)
+rkt_stage1_kvm_qemu? (
+ http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
+ ${SRC_URI_KVM}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
+
+DESCRIPTION="rkt is an App Container runtime for Linux"
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
+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"
+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"
+
+# Some tests fail.
+# rkt_stage1_src needs to copy /bin/mount, which requires root privileges during src_compile
+RESTRICT="test rkt_stage1_src? ( userpriv )"
+
+DEPEND=">=dev-lang/go-1.5
+ app-arch/cpio
+ app-crypt/trousers
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny
+ rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
+ rkt_stage1_kvm_qemu? (
+ sys-apps/attr[static-libs(+)]
+ sys-libs/libcap[static-libs(+)]
+ sys-libs/zlib[static-libs(+)]
+ >=x11-libs/pixman-0.28.0[static-libs(+)]
+ )"
+
+RDEPEND="!app-emulation/rocket
+ rkt_stage1_host? ( systemd? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ ) )"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+pkg_setup() {
+ enewgroup rkt-admin
+ enewgroup rkt
+}
+
+src_unpack() {
+ local x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
+src_prepare() {
+ eapply_user
+
+ # This patch breaks linux kernel cc-option checks when the
+ # compiler doesn't recognize the -no-pie option.
+ rm stage1/usr_from_kvm/kernel/patches/0002-for-debian-gcc.patch || die
+
+ # avoid sdjournal include for bug 595874
+ if ! use systemd; then
+ sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
+ -i rkt/rkt.mk || die
+ fi
+
+ sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
+
+ # disable git fetch of systemd
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable git fetch of qemu
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
+'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
+'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
+'$(QEMU_CLONE_STAMP): get_qemu_sources\n\n'\
+'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' \
+ -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
+ -i stage1/usr_from_kvm/qemu.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ local flavors hypervisors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+ )
+
+ use systemd || myeconfargs+=( --enable-sdjournal=no )
+
+ # enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
+ use rkt_stage1_src && flavors+=",src"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_src; then
+ myeconfargs+=(
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+ )
+ fi
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
+ fi
+
+ if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
+ use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
+ myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} emake V=3
+ ARCH=${arch} emake V=3 bash-completion
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/tools/actool"
+
+ dobin "${S}/${BUILDDIR}/target/bin/rkt"
+
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/target/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_src; then
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_lkvm; then
+ dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_qemu; then
+ dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
+
+ systemd_dounit "${S}"/dist/init/systemd/*.service \
+ "${S}"/dist/init/systemd/*.timer \
+ "${S}"/dist/init/systemd/*.socket
+
+ insinto /usr/lib/tmpfiles.d
+ doins "${S}"/dist/init/systemd/tmpfiles.d/*
+
+ newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
+
+ keepdir /etc/${PN}
+ fowners :rkt-admin /etc/${PN}
+ fperms 2775 /etc/${PN}
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-11-19 20:47 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-11-19 20:47 UTC (permalink / raw
To: gentoo-commits
commit: 8396490fbc216f90af614cefaa332a6c2492ef3a
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 20:38:38 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 20:47:47 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8396490f
app-emulation/rkt: adjust qemu deps for bug 600042
Package-Manager: portage-2.3.2
app-emulation/rkt/rkt-1.18.0.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/app-emulation/rkt/rkt-1.18.0.ebuild b/app-emulation/rkt/rkt-1.18.0.ebuild
index 3cf4584..b3e3df4 100644
--- a/app-emulation/rkt/rkt-1.18.0.ebuild
+++ b/app-emulation/rkt/rkt-1.18.0.ebuild
@@ -48,7 +48,9 @@ DEPEND=">=dev-lang/go-1.5
dev-perl/Capture-Tiny
rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
rkt_stage1_kvm_qemu? (
+ sys-apps/attr[static-libs(+)]
sys-libs/libcap[static-libs(+)]
+ sys-libs/zlib[static-libs(+)]
>=x11-libs/pixman-0.28.0[static-libs(+)]
)"
@@ -128,7 +130,7 @@ src_prepare() {
'else\n'\
'\t\0\n'\
'endif~' \
- -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-opengl --disable-libssh2|' \
+ -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-bzip2 --disable-libssh2 --disable-opengl|' \
-i stage1/usr_from_kvm/qemu.mk || die
# disable fetch of kernel sources
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-11-19 19:01 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-11-19 19:01 UTC (permalink / raw
To: gentoo-commits
commit: 8db6b9e143ad836e2febec9618e11a19686c8c30
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 18:55:27 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 19:01:24 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8db6b9e1
app-emulation/rkt: use emake V=3
Package-Manager: portage-2.3.2
app-emulation/rkt/rkt-1.16.0.ebuild | 4 ++--
app-emulation/rkt/rkt-1.17.0.ebuild | 4 ++--
app-emulation/rkt/rkt-1.18.0.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app-emulation/rkt/rkt-1.16.0.ebuild b/app-emulation/rkt/rkt-1.16.0.ebuild
index 70e3b76..00f2ec2 100644
--- a/app-emulation/rkt/rkt-1.16.0.ebuild
+++ b/app-emulation/rkt/rkt-1.16.0.ebuild
@@ -202,8 +202,8 @@ src_compile() {
case ${arch} in
amd64) arch=x86_64;;
esac
- ARCH=${arch} emake
- ARCH=${arch} emake bash-completion
+ ARCH=${arch} emake V=3
+ ARCH=${arch} emake V=3 bash-completion
}
src_install() {
diff --git a/app-emulation/rkt/rkt-1.17.0.ebuild b/app-emulation/rkt/rkt-1.17.0.ebuild
index 8ceb643..9e0068c 100644
--- a/app-emulation/rkt/rkt-1.17.0.ebuild
+++ b/app-emulation/rkt/rkt-1.17.0.ebuild
@@ -202,8 +202,8 @@ src_compile() {
case ${arch} in
amd64) arch=x86_64;;
esac
- ARCH=${arch} emake
- ARCH=${arch} emake bash-completion
+ ARCH=${arch} emake V=3
+ ARCH=${arch} emake V=3 bash-completion
}
src_install() {
diff --git a/app-emulation/rkt/rkt-1.18.0.ebuild b/app-emulation/rkt/rkt-1.18.0.ebuild
index febbe80..3cf4584 100644
--- a/app-emulation/rkt/rkt-1.18.0.ebuild
+++ b/app-emulation/rkt/rkt-1.18.0.ebuild
@@ -202,8 +202,8 @@ src_compile() {
case ${arch} in
amd64) arch=x86_64;;
esac
- ARCH=${arch} emake
- ARCH=${arch} emake bash-completion
+ ARCH=${arch} emake V=3
+ ARCH=${arch} emake V=3 bash-completion
}
src_install() {
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-11-06 21:02 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-11-06 21:02 UTC (permalink / raw
To: gentoo-commits
commit: aa427cb851d47b9daf5b5a9c028a2311b2d5472f
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 6 21:01:20 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Nov 6 21:02:26 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa427cb8
app-emulation/rkt: version restrict USE=rkt_stage1_kvm in metadata.xml
Package-Manager: portage-2.3.2
app-emulation/rkt/metadata.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/app-emulation/rkt/metadata.xml b/app-emulation/rkt/metadata.xml
index 3483e6c..d9f7683 100644
--- a/app-emulation/rkt/metadata.xml
+++ b/app-emulation/rkt/metadata.xml
@@ -18,7 +18,9 @@
<flag name="actool">Install the actool for ACI manipulation</flag>
<flag name="rkt_stage1_coreos">Download and use a prebuilt stage1.aci from CoreOS</flag>
<flag name="rkt_stage1_fly">Build stage1-fly.aci</flag>
- <flag name="rkt_stage1_kvm">This flag has been replaced by the rkt_stage1_kvm_* flags</flag>
+ <flag name="rkt_stage1_kvm" restrict="<app-emulation/rkt-1.15.0">
+ This flag has been replaced by the rkt_stage1_kvm_* flags
+ </flag>
<flag name="rkt_stage1_kvm_lkvm">Build stage1-kvm-lkvm.aci</flag>
<flag name="rkt_stage1_kvm_qemu">Build stage1-kvm-qemu.aci</flag>
<flag name="rkt_stage1_src">Build the stage1.aci from source</flag>
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-11-04 6:04 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-11-04 6:04 UTC (permalink / raw
To: gentoo-commits
commit: efd01182dd3c4c6f79954fe4def54e8b02bf2797
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 4 06:03:21 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Nov 4 06:04:10 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efd01182
app-emulation/rkt: version bump to 1.18.0
Package-Manager: portage-2.3.2
app-emulation/rkt/Manifest | 2 +
app-emulation/rkt/rkt-1.18.0.ebuild | 247 ++++++++++++++++++++++++++++++++++++
2 files changed, 249 insertions(+)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 725ec6a..cdccf3b 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -3,5 +3,7 @@ DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9f
DIST qemu-2.6.1.tar.bz2 25762855 SHA256 4942fd1b6ee31f2f55ffc2201dd7397e6b9c55a2ef332e6d660c730d268e08d1 SHA512 adb55d0774618c9cd02d376222814f2047977bfbca73248841275084ae537db583db4ac6cfa5cc65c3182941d5f4b40f2f7f4661b2cd93cbb3796e2f325bc919 WHIRLPOOL 1b9c0de78fcf874fd307ce2ee49448e96140fae0ea5739af28947bf8f241e768b47abe3edd2d798b826d99cfd4ca143cf71192d254b54ab47515ac59327fc172
DIST rkt-1.16.0.tar.gz 3028683 SHA256 8c7bb07217b68e153d54e45646072fd267ee1ee88a410887f2d8f75eb4752e89 SHA512 b270c8340ca5a22c48209f9d8fa6c55e8cd1b8e238117c4e3a9e5d4fff04bde194e53d10112dd429f5f1c36e0395ca42ae6bd12fd5ebff68a50d3546a1a8d31d WHIRLPOOL d532cfac6347d675b5cbf96e9c38d4cdbb4f4fbd493474567755ff3560c31b8edc59c2cf83f51953ac56c81f7f1af84c625cf1c7f571a48275b6df3dd8f171f3
DIST rkt-1.17.0.tar.gz 3031700 SHA256 9cebd53d14f37fdfae6f2cb4114d472399773d14f2b8cbff6ea60dcb11a57604 SHA512 ee7346391a386fb3bbd52b751d2814700d5fde5c616b0dd76c4bb0f78f9d5e9d7f9ee574a2feee121ccee7f0a900e76b77428f3f6de8c6b6cb3bd324d763b1f0 WHIRLPOOL dbf7a8ad99e3e0ae40be6ac36e6794afe7d5f9a07def1bb4f88ada9abe13e2b2af3e6ae44d7850b228d16249c5fc9b72083271bc74cc56f3c4de20e35092f903
+DIST rkt-1.18.0.tar.gz 3042834 SHA256 3897afeb743f77509cf7bfb484800e5b75eadb15f42bc0258e2e5b5598ae8290 SHA512 e47da81dde38f5c63cfd2955b1219c4339b51d5bf396042d7872893c5475f796b0279218380fa43ebe3ed7bbdfaf360ed286095193a279c364623dcbd8d9da14 WHIRLPOOL 409451eb50dfdd0726641ea843e48ebcc10629b6b6e85ce7ece4b1f6cb5b8586645f3990b0d9510ba6b7b3c0f0beb58f1c740e8cb5610fea675eb0c3ea1305a6
DIST rkt-pxe-1151.0.0.img 243335216 SHA256 6f08697bea372af916a150f9846110e8855305653e5582b2c2ea04f14253e5c8 SHA512 fe7c4ec8cb4d11ba704b9f78c43557a374fda70dbfd7c3f4f9e768cf5ae365aab7a1fee8d51e19bbad6809ad4cdfe4eed60e5cdb6babd869a3a91b503b7256e8 WHIRLPOOL 92f8a65a9c50c11fa9c56acee53dd5623dd186664f44c6517bac4ee5be6a9dd2a9141ef522d978cc5b282c6638e17bf7b3559d68d6ea6c0752821799c0c88a5c
+DIST rkt-pxe-1192.0.0.img 233603403 SHA256 a6233ff4b91457181c3f9eed942af9df66161f5ae84256fbe2d08b5d184c35be SHA512 8e6e5311e209453992da80722229723854b66b983b31922ba68131dbf1c009989e3181ecd6fc9876d1e1eb1956f6463bb66d6ff9114904c4b6dca6c0474fcdee WHIRLPOOL 1d3b0914a38be7518f4f0abc6050aab82318a380bbb2b722671f5e1111aa11fa019ccbd029eaa7f8262bcef90ce159c36eb09dfb8911dd60c57637da4e00270e
DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
diff --git a/app-emulation/rkt/rkt-1.18.0.ebuild b/app-emulation/rkt/rkt-1.18.0.ebuild
new file mode 100644
index 00000000..febbe80
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.18.0.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="1192.0.0"
+PXE_SYSTEMD_VERSION="v231"
+KVM_LINUX_VERSION="4.3.1"
+KVMTOOL_VERSION="d62653e177597251c24494a6dda60acd6d846671"
+QEMU_VERSION="v2.6.1"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
+"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm_lkvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ ${SRC_URI_KVM}
+)
+rkt_stage1_kvm_qemu? (
+ http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
+ ${SRC_URI_KVM}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
+
+DESCRIPTION="rkt is an App Container runtime for Linux"
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
+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"
+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"
+
+DEPEND=">=dev-lang/go-1.5
+ app-arch/cpio
+ app-crypt/trousers
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny
+ rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
+ rkt_stage1_kvm_qemu? (
+ sys-libs/libcap[static-libs(+)]
+ >=x11-libs/pixman-0.28.0[static-libs(+)]
+ )"
+
+RDEPEND="!app-emulation/rocket
+ rkt_stage1_host? ( systemd? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ ) )"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+pkg_setup() {
+ enewgroup rkt-admin
+ enewgroup rkt
+}
+
+src_unpack() {
+ local x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
+src_prepare() {
+ eapply_user
+
+ # avoid sdjournal include for bug 595874
+ if ! use systemd; then
+ sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
+ -i rkt/rkt.mk || die
+ fi
+
+ sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
+
+ # disable git fetch of systemd
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable git fetch of qemu
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
+'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
+'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
+'$(QEMU_CLONE_STAMP): get_qemu_sources\n\n'\
+'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' \
+ -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-opengl --disable-libssh2|' \
+ -i stage1/usr_from_kvm/qemu.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ local flavors hypervisors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+ )
+
+ use systemd || myeconfargs+=( --enable-sdjournal=no )
+
+ # enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
+ use rkt_stage1_src && flavors+=",src"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_src; then
+ myeconfargs+=(
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+ )
+ fi
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
+ fi
+
+ if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
+ use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
+ myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} emake
+ ARCH=${arch} emake bash-completion
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/tools/actool"
+
+ dobin "${S}/${BUILDDIR}/target/bin/rkt"
+
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/target/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_src; then
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_lkvm; then
+ dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_qemu; then
+ dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
+
+ systemd_dounit "${S}"/dist/init/systemd/*.service \
+ "${S}"/dist/init/systemd/*.timer \
+ "${S}"/dist/init/systemd/*.socket
+
+ insinto /usr/lib/tmpfiles.d
+ doins "${S}"/dist/init/systemd/tmpfiles.d/*
+
+ newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
+
+ keepdir /etc/${PN}
+ fowners :rkt-admin /etc/${PN}
+ fperms 2775 /etc/${PN}
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-10-17 4:56 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-10-17 4:56 UTC (permalink / raw
To: gentoo-commits
commit: 9518a561aec5da830d3bb7a3ca3c3426e1322984
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 04:55:38 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 04:56:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9518a561
app-emulation/rkt: version bump to 1.17.0
Package-Manager: portage-2.3.2
app-emulation/rkt/Manifest | 1 +
app-emulation/rkt/rkt-1.17.0.ebuild | 247 ++++++++++++++++++++++++++++++++++++
2 files changed, 248 insertions(+)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index c92ac18..7726247 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -4,5 +4,6 @@ DIST qemu-2.6.1.tar.bz2 25762855 SHA256 4942fd1b6ee31f2f55ffc2201dd7397e6b9c55a2
DIST rkt-1.14.0.tar.gz 2947502 SHA256 2458783023c561358c59600accb58ccfe335535931a58da988d70893a1c5a5e7 SHA512 4e082f0293047d133b031b6fd95e34fc86b7b2ca133ea56709cded5cd0c454e56bb5dd7209bc7add56812142495430c457d9094a8cda1c0079085822ff6e1c94 WHIRLPOOL 09837fc509cce2609bd87ae1185ce6c1e85e13888ab8106aab1725e8e3232486330e4152db8deb77dbc2c419d176a8f1c6df6d44d9a2808aefd62e58082a0353
DIST rkt-1.15.0.tar.gz 3018468 SHA256 3efd0dc96c8783d5b378862c7239f733863a181bb3148f3b2e8e10023df06e01 SHA512 4f35eee5f689c8a36760c784d079751cfd0224c20c60f915ab1a550040739ec9290ba9e481e1679f67044400f8d3a60588b6d6d6cdfbbc1f3093c7010d35d290 WHIRLPOOL a07cbd102280c911ba79748931f841d2d5e28407225f2b1d48604b1d0e1c3d81c6488c40e2ef4ef571b628f1766f9aa1e5208138ca963c06e7b3b9226f5b6b6c
DIST rkt-1.16.0.tar.gz 3028683 SHA256 8c7bb07217b68e153d54e45646072fd267ee1ee88a410887f2d8f75eb4752e89 SHA512 b270c8340ca5a22c48209f9d8fa6c55e8cd1b8e238117c4e3a9e5d4fff04bde194e53d10112dd429f5f1c36e0395ca42ae6bd12fd5ebff68a50d3546a1a8d31d WHIRLPOOL d532cfac6347d675b5cbf96e9c38d4cdbb4f4fbd493474567755ff3560c31b8edc59c2cf83f51953ac56c81f7f1af84c625cf1c7f571a48275b6df3dd8f171f3
+DIST rkt-1.17.0.tar.gz 3031700 SHA256 9cebd53d14f37fdfae6f2cb4114d472399773d14f2b8cbff6ea60dcb11a57604 SHA512 ee7346391a386fb3bbd52b751d2814700d5fde5c616b0dd76c4bb0f78f9d5e9d7f9ee574a2feee121ccee7f0a900e76b77428f3f6de8c6b6cb3bd324d763b1f0 WHIRLPOOL dbf7a8ad99e3e0ae40be6ac36e6794afe7d5f9a07def1bb4f88ada9abe13e2b2af3e6ae44d7850b228d16249c5fc9b72083271bc74cc56f3c4de20e35092f903
DIST rkt-pxe-1151.0.0.img 243335216 SHA256 6f08697bea372af916a150f9846110e8855305653e5582b2c2ea04f14253e5c8 SHA512 fe7c4ec8cb4d11ba704b9f78c43557a374fda70dbfd7c3f4f9e768cf5ae365aab7a1fee8d51e19bbad6809ad4cdfe4eed60e5cdb6babd869a3a91b503b7256e8 WHIRLPOOL 92f8a65a9c50c11fa9c56acee53dd5623dd186664f44c6517bac4ee5be6a9dd2a9141ef522d978cc5b282c6638e17bf7b3559d68d6ea6c0752821799c0c88a5c
DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
diff --git a/app-emulation/rkt/rkt-1.17.0.ebuild b/app-emulation/rkt/rkt-1.17.0.ebuild
new file mode 100644
index 00000000..8ceb643
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.17.0.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="1151.0.0"
+PXE_SYSTEMD_VERSION="v231"
+KVM_LINUX_VERSION="4.3.1"
+KVMTOOL_VERSION="d62653e177597251c24494a6dda60acd6d846671"
+QEMU_VERSION="v2.6.1"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
+"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm_lkvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ ${SRC_URI_KVM}
+)
+rkt_stage1_kvm_qemu? (
+ http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
+ ${SRC_URI_KVM}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
+
+DESCRIPTION="rkt is an App Container runtime for Linux"
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
+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"
+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"
+
+DEPEND=">=dev-lang/go-1.5
+ app-arch/cpio
+ app-crypt/trousers
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny
+ rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
+ rkt_stage1_kvm_qemu? (
+ sys-libs/libcap[static-libs(+)]
+ >=x11-libs/pixman-0.28.0[static-libs(+)]
+ )"
+
+RDEPEND="!app-emulation/rocket
+ rkt_stage1_host? ( systemd? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ ) )"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+pkg_setup() {
+ enewgroup rkt-admin
+ enewgroup rkt
+}
+
+src_unpack() {
+ local x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
+src_prepare() {
+ eapply_user
+
+ # avoid sdjournal include for bug 595874
+ if ! use systemd; then
+ sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
+ -i rkt/rkt.mk || die
+ fi
+
+ sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
+
+ # disable git fetch of systemd
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable git fetch of qemu
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
+'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
+'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
+'$(QEMU_CLONE_STAMP): get_qemu_sources\n\n'\
+'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' \
+ -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-opengl|' \
+ -i stage1/usr_from_kvm/qemu.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ local flavors hypervisors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+ )
+
+ use systemd || myeconfargs+=( --enable-sdjournal=no )
+
+ # enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
+ use rkt_stage1_src && flavors+=",src"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_src; then
+ myeconfargs+=(
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+ )
+ fi
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
+ fi
+
+ if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
+ use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
+ myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} emake
+ ARCH=${arch} emake bash-completion
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/tools/actool"
+
+ dobin "${S}/${BUILDDIR}/target/bin/rkt"
+
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/target/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_src; then
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_lkvm; then
+ dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_qemu; then
+ dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
+
+ systemd_dounit "${S}"/dist/init/systemd/*.service \
+ "${S}"/dist/init/systemd/*.timer \
+ "${S}"/dist/init/systemd/*.socket
+
+ insinto /usr/lib/tmpfiles.d
+ doins "${S}"/dist/init/systemd/tmpfiles.d/*
+
+ newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
+
+ keepdir /etc/${PN}
+ fowners :rkt-admin /etc/${PN}
+ fperms 2775 /etc/${PN}
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-10-17 4:56 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-10-17 4:56 UTC (permalink / raw
To: gentoo-commits
commit: 6324d7563019d9e077b6084848559485a50fc185
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 04:56:17 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 04:56:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6324d756
app-emulation/rkt: remove old versions
Package-Manager: portage-2.3.2
app-emulation/rkt/Manifest | 2 -
app-emulation/rkt/rkt-1.14.0.ebuild | 201 -----------------------------
app-emulation/rkt/rkt-1.15.0.ebuild | 245 ------------------------------------
3 files changed, 448 deletions(-)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 7726247..725ec6a 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,8 +1,6 @@
DIST kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz 243930 SHA256 89f4cc94364298aa5b9c39c660ebd82a4beb5351cc838d418e7e21afefb5c1f0 SHA512 70aea2324273603b77aa64c95efd36df35c74514fa820013bfee386332289119cc148aed2983a8c6fd9ddfa5bc3db39c5aa0ee32bfc2077787338a47f2954f2f WHIRLPOOL ee47d7e38509eddf90ef0cf7d0cd3761c623e55a1003e8810e645759dc9615e33fbae22ab5576627f9f86eee8b4ca96c4bdf692b7ab073f1f222734bc378477a
DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5
DIST qemu-2.6.1.tar.bz2 25762855 SHA256 4942fd1b6ee31f2f55ffc2201dd7397e6b9c55a2ef332e6d660c730d268e08d1 SHA512 adb55d0774618c9cd02d376222814f2047977bfbca73248841275084ae537db583db4ac6cfa5cc65c3182941d5f4b40f2f7f4661b2cd93cbb3796e2f325bc919 WHIRLPOOL 1b9c0de78fcf874fd307ce2ee49448e96140fae0ea5739af28947bf8f241e768b47abe3edd2d798b826d99cfd4ca143cf71192d254b54ab47515ac59327fc172
-DIST rkt-1.14.0.tar.gz 2947502 SHA256 2458783023c561358c59600accb58ccfe335535931a58da988d70893a1c5a5e7 SHA512 4e082f0293047d133b031b6fd95e34fc86b7b2ca133ea56709cded5cd0c454e56bb5dd7209bc7add56812142495430c457d9094a8cda1c0079085822ff6e1c94 WHIRLPOOL 09837fc509cce2609bd87ae1185ce6c1e85e13888ab8106aab1725e8e3232486330e4152db8deb77dbc2c419d176a8f1c6df6d44d9a2808aefd62e58082a0353
-DIST rkt-1.15.0.tar.gz 3018468 SHA256 3efd0dc96c8783d5b378862c7239f733863a181bb3148f3b2e8e10023df06e01 SHA512 4f35eee5f689c8a36760c784d079751cfd0224c20c60f915ab1a550040739ec9290ba9e481e1679f67044400f8d3a60588b6d6d6cdfbbc1f3093c7010d35d290 WHIRLPOOL a07cbd102280c911ba79748931f841d2d5e28407225f2b1d48604b1d0e1c3d81c6488c40e2ef4ef571b628f1766f9aa1e5208138ca963c06e7b3b9226f5b6b6c
DIST rkt-1.16.0.tar.gz 3028683 SHA256 8c7bb07217b68e153d54e45646072fd267ee1ee88a410887f2d8f75eb4752e89 SHA512 b270c8340ca5a22c48209f9d8fa6c55e8cd1b8e238117c4e3a9e5d4fff04bde194e53d10112dd429f5f1c36e0395ca42ae6bd12fd5ebff68a50d3546a1a8d31d WHIRLPOOL d532cfac6347d675b5cbf96e9c38d4cdbb4f4fbd493474567755ff3560c31b8edc59c2cf83f51953ac56c81f7f1af84c625cf1c7f571a48275b6df3dd8f171f3
DIST rkt-1.17.0.tar.gz 3031700 SHA256 9cebd53d14f37fdfae6f2cb4114d472399773d14f2b8cbff6ea60dcb11a57604 SHA512 ee7346391a386fb3bbd52b751d2814700d5fde5c616b0dd76c4bb0f78f9d5e9d7f9ee574a2feee121ccee7f0a900e76b77428f3f6de8c6b6cb3bd324d763b1f0 WHIRLPOOL dbf7a8ad99e3e0ae40be6ac36e6794afe7d5f9a07def1bb4f88ada9abe13e2b2af3e6ae44d7850b228d16249c5fc9b72083271bc74cc56f3c4de20e35092f903
DIST rkt-pxe-1151.0.0.img 243335216 SHA256 6f08697bea372af916a150f9846110e8855305653e5582b2c2ea04f14253e5c8 SHA512 fe7c4ec8cb4d11ba704b9f78c43557a374fda70dbfd7c3f4f9e768cf5ae365aab7a1fee8d51e19bbad6809ad4cdfe4eed60e5cdb6babd869a3a91b503b7256e8 WHIRLPOOL 92f8a65a9c50c11fa9c56acee53dd5623dd186664f44c6517bac4ee5be6a9dd2a9141ef522d978cc5b282c6638e17bf7b3559d68d6ea6c0752821799c0c88a5c
diff --git a/app-emulation/rkt/rkt-1.14.0.ebuild b/app-emulation/rkt/rkt-1.14.0.ebuild
deleted file mode 100644
index 4647369..00000000
--- a/app-emulation/rkt/rkt-1.14.0.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit autotools flag-o-matic systemd toolchain-funcs user
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="1151.0.0"
-PXE_SYSTEMD_VERSION="v231"
-KVM_LINUX_VERSION="4.3.1"
-KVMTOOL_VERSION="d62653e177597251c24494a6dda60acd6d846671"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm_lkvm? (
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
- mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
- ${PXE_URI} -> ${PXE_FILE}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="rkt is an App Container runtime for Linux"
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_src +actool systemd"
-REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm"
-
-DEPEND=">=dev-lang/go-1.5
- app-arch/cpio
- app-crypt/trousers
- sys-fs/squashfs-tools
- dev-perl/Capture-Tiny
- rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )"
-
-RDEPEND="!app-emulation/rocket
- rkt_stage1_host? ( systemd? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- ) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-pkg_setup() {
- enewgroup rkt-admin
- enewgroup rkt
-}
-
-src_unpack() {
- local x
- for x in ${A}; do
- case ${x} in
- *.img|linux-*) continue ;;
- kvmtool-*)
- mkdir kvmtool || die
- pushd kvmtool >/dev/null || die
- unpack ${x}
- popd >/dev/null || die
- ;;
- *)
- unpack ${x}
- esac
- done
-}
-
-src_prepare() {
- eapply_user
-
- sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
-
- # disable git fetch of systemd
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
- # disable git fetch of kvmtool
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
- # disable fetch of kernel sources
- sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
- -i stage1/usr_from_kvm/kernel.mk || die
-
- if use rkt_stage1_host; then
- # Make systemdUnitsPath consistent with host
- sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
- -i stage1/init/init.go || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- local flavors myeconfargs=(
- --with-stage1-default-images-directory="/usr/share/rkt"
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
- )
-
- use systemd || myeconfargs+=( --enable-sdjournal=no )
-
- # enable flavors (first is default)
- use rkt_stage1_host && flavors+=",host"
- use rkt_stage1_src && flavors+=",src"
- use rkt_stage1_coreos && flavors+=",coreos"
- use rkt_stage1_fly && flavors+=",fly"
- use rkt_stage1_kvm_lkvm && flavors+=",kvm"
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
- if use rkt_stage1_src; then
- myeconfargs+=(
- --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
- --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
- )
- fi
-
- if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm; then
- myeconfargs+=(
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
- )
- fi
-
- # Go's 6l linker does not support PIE, disable so cgo binaries
- # which use 6l+gcc for linking can be built correctly.
- if gcc-specs-pie; then
- append-ldflags -nopie
- fi
-
- export CC=$(tc-getCC)
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export BUILDDIR
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- local arch=${ARCH}
- case ${arch} in
- amd64) arch=x86_64;;
- esac
- ARCH=${arch} emake
-}
-
-src_install() {
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
- use actool && dobin "${S}/${BUILDDIR}/tools/actool"
-
- dobin "${S}/${BUILDDIR}/target/bin/rkt"
-
- insinto /usr/share/rkt
- doins "${S}/${BUILDDIR}/target/bin/"*.aci
-
- # create symlink for default stage1 image path
- if use rkt_stage1_host; then
- dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_src; then
- dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_coreos; then
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_fly; then
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_lkvm; then
- dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
- fi
-
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
-
- keepdir /etc/${PN}
- fowners :rkt-admin /etc/${PN}
- fperms 2775 /etc/${PN}
-}
diff --git a/app-emulation/rkt/rkt-1.15.0.ebuild b/app-emulation/rkt/rkt-1.15.0.ebuild
deleted file mode 100644
index 70e3b76..00000000
--- a/app-emulation/rkt/rkt-1.15.0.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="1151.0.0"
-PXE_SYSTEMD_VERSION="v231"
-KVM_LINUX_VERSION="4.3.1"
-KVMTOOL_VERSION="d62653e177597251c24494a6dda60acd6d846671"
-QEMU_VERSION="v2.6.1"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
- ${PXE_URI} -> ${PXE_FILE}
-"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm_lkvm? (
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
- ${SRC_URI_KVM}
-)
-rkt_stage1_kvm_qemu? (
- http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
- ${SRC_URI_KVM}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="rkt is an App Container runtime for Linux"
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
-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"
-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"
-
-DEPEND=">=dev-lang/go-1.5
- app-arch/cpio
- app-crypt/trousers
- sys-fs/squashfs-tools
- dev-perl/Capture-Tiny
- rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
- rkt_stage1_kvm_qemu? (
- sys-libs/libcap[static-libs(+)]
- >=x11-libs/pixman-0.28.0[static-libs(+)]
- )"
-
-RDEPEND="!app-emulation/rocket
- rkt_stage1_host? ( systemd? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- ) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-pkg_setup() {
- enewgroup rkt-admin
- enewgroup rkt
-}
-
-src_unpack() {
- local x
- for x in ${A}; do
- case ${x} in
- *.img|linux-*) continue ;;
- kvmtool-*)
- mkdir kvmtool || die
- pushd kvmtool >/dev/null || die
- unpack ${x}
- popd >/dev/null || die
- ;;
- *)
- unpack ${x}
- esac
- done
-}
-
-src_prepare() {
- eapply_user
-
- # avoid sdjournal include for bug 595874
- if ! use systemd; then
- sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
- -i rkt/rkt.mk || die
- fi
-
- sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
-
- # disable git fetch of systemd
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
- # disable git fetch of kvmtool
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
- # disable git fetch of qemu
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
-'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
-'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
-'$(QEMU_CLONE_STAMP): get_qemu_sources\n\n'\
-'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' \
- -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-opengl|' \
- -i stage1/usr_from_kvm/qemu.mk || die
-
- # disable fetch of kernel sources
- sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
- -i stage1/usr_from_kvm/kernel.mk || die
-
- if use rkt_stage1_host; then
- # Make systemdUnitsPath consistent with host
- sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
- -i stage1/init/init.go || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- local flavors hypervisors myeconfargs=(
- --with-stage1-default-images-directory="/usr/share/rkt"
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
- )
-
- use systemd || myeconfargs+=( --enable-sdjournal=no )
-
- # enable flavors (first is default)
- use rkt_stage1_host && flavors+=",host"
- use rkt_stage1_src && flavors+=",src"
- use rkt_stage1_coreos && flavors+=",coreos"
- use rkt_stage1_fly && flavors+=",fly"
- { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
- if use rkt_stage1_src; then
- myeconfargs+=(
- --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
- --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
- )
- fi
-
- if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- myeconfargs+=(
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
- )
- fi
-
- if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
- use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
- use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
- myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
- fi
-
- # Go's 6l linker does not support PIE, disable so cgo binaries
- # which use 6l+gcc for linking can be built correctly.
- if gcc-specs-pie; then
- append-ldflags -nopie
- fi
-
- export CC=$(tc-getCC)
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export BUILDDIR
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- local arch=${ARCH}
- case ${arch} in
- amd64) arch=x86_64;;
- esac
- ARCH=${arch} emake
- ARCH=${arch} emake bash-completion
-}
-
-src_install() {
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
- use actool && dobin "${S}/${BUILDDIR}/tools/actool"
-
- dobin "${S}/${BUILDDIR}/target/bin/rkt"
-
- insinto /usr/share/rkt
- doins "${S}/${BUILDDIR}/target/bin/"*.aci
-
- # create symlink for default stage1 image path
- if use rkt_stage1_host; then
- dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_src; then
- dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_coreos; then
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_fly; then
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_lkvm; then
- dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_qemu; then
- dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
- fi
-
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
-
- newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
-
- keepdir /etc/${PN}
- fowners :rkt-admin /etc/${PN}
- fperms 2775 /etc/${PN}
-}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-10-02 9:09 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-10-02 9:09 UTC (permalink / raw
To: gentoo-commits
commit: e619ce061100a44dfd15a6cab2a3789c35ba1cc0
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 2 09:05:45 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Oct 2 09:09:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e619ce06
app-emulation/rkt: avoid sd-journal.h include for bug 595874
Package-Manager: portage-2.3.1
app-emulation/rkt/rkt-1.15.0.ebuild | 6 ++++++
app-emulation/rkt/rkt-1.16.0.ebuild | 6 ++++++
2 files changed, 12 insertions(+)
diff --git a/app-emulation/rkt/rkt-1.15.0.ebuild b/app-emulation/rkt/rkt-1.15.0.ebuild
index 62861b0..70e3b76 100644
--- a/app-emulation/rkt/rkt-1.15.0.ebuild
+++ b/app-emulation/rkt/rkt-1.15.0.ebuild
@@ -86,6 +86,12 @@ src_unpack() {
src_prepare() {
eapply_user
+ # avoid sdjournal include for bug 595874
+ if ! use systemd; then
+ sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
+ -i rkt/rkt.mk || die
+ fi
+
sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
# disable git fetch of systemd
diff --git a/app-emulation/rkt/rkt-1.16.0.ebuild b/app-emulation/rkt/rkt-1.16.0.ebuild
index 62861b0..70e3b76 100644
--- a/app-emulation/rkt/rkt-1.16.0.ebuild
+++ b/app-emulation/rkt/rkt-1.16.0.ebuild
@@ -86,6 +86,12 @@ src_unpack() {
src_prepare() {
eapply_user
+ # avoid sdjournal include for bug 595874
+ if ! use systemd; then
+ sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
+ -i rkt/rkt.mk || die
+ fi
+
sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
# disable git fetch of systemd
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-10-02 0:44 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-10-02 0:44 UTC (permalink / raw
To: gentoo-commits
commit: df997b354495a0c04ea7a5d3aefe7140825445ea
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 2 00:43:52 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Oct 2 00:43:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df997b35
app-emulation/rkt: version bump to 1.16.0
Package-Manager: portage-2.3.1
app-emulation/rkt/Manifest | 1 +
app-emulation/rkt/rkt-1.16.0.ebuild | 239 ++++++++++++++++++++++++++++++++++++
2 files changed, 240 insertions(+)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 16aa40b..c92ac18 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -3,5 +3,6 @@ DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9f
DIST qemu-2.6.1.tar.bz2 25762855 SHA256 4942fd1b6ee31f2f55ffc2201dd7397e6b9c55a2ef332e6d660c730d268e08d1 SHA512 adb55d0774618c9cd02d376222814f2047977bfbca73248841275084ae537db583db4ac6cfa5cc65c3182941d5f4b40f2f7f4661b2cd93cbb3796e2f325bc919 WHIRLPOOL 1b9c0de78fcf874fd307ce2ee49448e96140fae0ea5739af28947bf8f241e768b47abe3edd2d798b826d99cfd4ca143cf71192d254b54ab47515ac59327fc172
DIST rkt-1.14.0.tar.gz 2947502 SHA256 2458783023c561358c59600accb58ccfe335535931a58da988d70893a1c5a5e7 SHA512 4e082f0293047d133b031b6fd95e34fc86b7b2ca133ea56709cded5cd0c454e56bb5dd7209bc7add56812142495430c457d9094a8cda1c0079085822ff6e1c94 WHIRLPOOL 09837fc509cce2609bd87ae1185ce6c1e85e13888ab8106aab1725e8e3232486330e4152db8deb77dbc2c419d176a8f1c6df6d44d9a2808aefd62e58082a0353
DIST rkt-1.15.0.tar.gz 3018468 SHA256 3efd0dc96c8783d5b378862c7239f733863a181bb3148f3b2e8e10023df06e01 SHA512 4f35eee5f689c8a36760c784d079751cfd0224c20c60f915ab1a550040739ec9290ba9e481e1679f67044400f8d3a60588b6d6d6cdfbbc1f3093c7010d35d290 WHIRLPOOL a07cbd102280c911ba79748931f841d2d5e28407225f2b1d48604b1d0e1c3d81c6488c40e2ef4ef571b628f1766f9aa1e5208138ca963c06e7b3b9226f5b6b6c
+DIST rkt-1.16.0.tar.gz 3028683 SHA256 8c7bb07217b68e153d54e45646072fd267ee1ee88a410887f2d8f75eb4752e89 SHA512 b270c8340ca5a22c48209f9d8fa6c55e8cd1b8e238117c4e3a9e5d4fff04bde194e53d10112dd429f5f1c36e0395ca42ae6bd12fd5ebff68a50d3546a1a8d31d WHIRLPOOL d532cfac6347d675b5cbf96e9c38d4cdbb4f4fbd493474567755ff3560c31b8edc59c2cf83f51953ac56c81f7f1af84c625cf1c7f571a48275b6df3dd8f171f3
DIST rkt-pxe-1151.0.0.img 243335216 SHA256 6f08697bea372af916a150f9846110e8855305653e5582b2c2ea04f14253e5c8 SHA512 fe7c4ec8cb4d11ba704b9f78c43557a374fda70dbfd7c3f4f9e768cf5ae365aab7a1fee8d51e19bbad6809ad4cdfe4eed60e5cdb6babd869a3a91b503b7256e8 WHIRLPOOL 92f8a65a9c50c11fa9c56acee53dd5623dd186664f44c6517bac4ee5be6a9dd2a9141ef522d978cc5b282c6638e17bf7b3559d68d6ea6c0752821799c0c88a5c
DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
diff --git a/app-emulation/rkt/rkt-1.16.0.ebuild b/app-emulation/rkt/rkt-1.16.0.ebuild
new file mode 100644
index 00000000..62861b0
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.16.0.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="1151.0.0"
+PXE_SYSTEMD_VERSION="v231"
+KVM_LINUX_VERSION="4.3.1"
+KVMTOOL_VERSION="d62653e177597251c24494a6dda60acd6d846671"
+QEMU_VERSION="v2.6.1"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
+"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm_lkvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ ${SRC_URI_KVM}
+)
+rkt_stage1_kvm_qemu? (
+ http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
+ ${SRC_URI_KVM}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
+
+DESCRIPTION="rkt is an App Container runtime for Linux"
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
+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"
+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"
+
+DEPEND=">=dev-lang/go-1.5
+ app-arch/cpio
+ app-crypt/trousers
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny
+ rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
+ rkt_stage1_kvm_qemu? (
+ sys-libs/libcap[static-libs(+)]
+ >=x11-libs/pixman-0.28.0[static-libs(+)]
+ )"
+
+RDEPEND="!app-emulation/rocket
+ rkt_stage1_host? ( systemd? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ ) )"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+pkg_setup() {
+ enewgroup rkt-admin
+ enewgroup rkt
+}
+
+src_unpack() {
+ local x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
+src_prepare() {
+ eapply_user
+
+ sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
+
+ # disable git fetch of systemd
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable git fetch of qemu
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
+'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
+'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
+'$(QEMU_CLONE_STAMP): get_qemu_sources\n\n'\
+'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' \
+ -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-opengl|' \
+ -i stage1/usr_from_kvm/qemu.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ local flavors hypervisors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+ )
+
+ use systemd || myeconfargs+=( --enable-sdjournal=no )
+
+ # enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
+ use rkt_stage1_src && flavors+=",src"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_src; then
+ myeconfargs+=(
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+ )
+ fi
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
+ fi
+
+ if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
+ use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
+ myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} emake
+ ARCH=${arch} emake bash-completion
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/tools/actool"
+
+ dobin "${S}/${BUILDDIR}/target/bin/rkt"
+
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/target/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_src; then
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_lkvm; then
+ dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_qemu; then
+ dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
+
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
+
+ newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
+
+ keepdir /etc/${PN}
+ fowners :rkt-admin /etc/${PN}
+ fperms 2775 /etc/${PN}
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-10-01 23:56 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-10-01 23:56 UTC (permalink / raw
To: gentoo-commits
commit: 4ccaade01cd431b5f554f43799e3c1d502aaa006
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 1 23:55:56 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Oct 1 23:55:56 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ccaade0
app-emulation/rkt: remove old versions
Package-Manager: portage-2.3.1
app-emulation/rkt/Manifest | 4 -
app-emulation/rkt/rkt-1.11.0.ebuild | 190 ----------------------------------
app-emulation/rkt/rkt-1.12.0.ebuild | 201 ------------------------------------
3 files changed, 395 deletions(-)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 7fbe706..16aa40b 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,11 +1,7 @@
DIST kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz 243930 SHA256 89f4cc94364298aa5b9c39c660ebd82a4beb5351cc838d418e7e21afefb5c1f0 SHA512 70aea2324273603b77aa64c95efd36df35c74514fa820013bfee386332289119cc148aed2983a8c6fd9ddfa5bc3db39c5aa0ee32bfc2077787338a47f2954f2f WHIRLPOOL ee47d7e38509eddf90ef0cf7d0cd3761c623e55a1003e8810e645759dc9615e33fbae22ab5576627f9f86eee8b4ca96c4bdf692b7ab073f1f222734bc378477a
DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5
DIST qemu-2.6.1.tar.bz2 25762855 SHA256 4942fd1b6ee31f2f55ffc2201dd7397e6b9c55a2ef332e6d660c730d268e08d1 SHA512 adb55d0774618c9cd02d376222814f2047977bfbca73248841275084ae537db583db4ac6cfa5cc65c3182941d5f4b40f2f7f4661b2cd93cbb3796e2f325bc919 WHIRLPOOL 1b9c0de78fcf874fd307ce2ee49448e96140fae0ea5739af28947bf8f241e768b47abe3edd2d798b826d99cfd4ca143cf71192d254b54ab47515ac59327fc172
-DIST rkt-1.11.0.tar.gz 2767797 SHA256 cd75f1648ae6736da731c14a2102646ee90467efd6d2a32b518fd36b8c9806c5 SHA512 dfc604b50037a5a272e0fe0f438c35e1a010489ee19a426cbad7184a3910a214f4bf659b533f323a2ab742deffe7bba10daee52691ff32e5a35f453b2b0c4bb0 WHIRLPOOL 4caa6be6f5f8c5aeb67c762a2643ffc8579d45f49b5c5e4cb5c16ce5e38cc4db35e9dee7d5df20ef80bf75d64e3cccbcc1521c4ddab18441652d2d383a17368b
-DIST rkt-1.12.0.tar.gz 2828173 SHA256 310bbadc5128574e0ecbe83f5bd6d7680d5a7c1d43c538888b025743d2667195 SHA512 b472887f232fe386c96f91a2a4f4c0125dba0d40db1468e21bea744699ecaaf31af47e2e23f3cb7c686f05f5aabb984de04c86a7e5bbbd9284769d149259c25f WHIRLPOOL b6f143cc0c3f8fb86f35b0a728e7ebf8fc49da0d58ed1caa4179b5a496cd5c20cb20e412d3895713b0e0d79e9ac773a5e882a186047b3de904ab8232a85d9442
DIST rkt-1.14.0.tar.gz 2947502 SHA256 2458783023c561358c59600accb58ccfe335535931a58da988d70893a1c5a5e7 SHA512 4e082f0293047d133b031b6fd95e34fc86b7b2ca133ea56709cded5cd0c454e56bb5dd7209bc7add56812142495430c457d9094a8cda1c0079085822ff6e1c94 WHIRLPOOL 09837fc509cce2609bd87ae1185ce6c1e85e13888ab8106aab1725e8e3232486330e4152db8deb77dbc2c419d176a8f1c6df6d44d9a2808aefd62e58082a0353
DIST rkt-1.15.0.tar.gz 3018468 SHA256 3efd0dc96c8783d5b378862c7239f733863a181bb3148f3b2e8e10023df06e01 SHA512 4f35eee5f689c8a36760c784d079751cfd0224c20c60f915ab1a550040739ec9290ba9e481e1679f67044400f8d3a60588b6d6d6cdfbbc1f3093c7010d35d290 WHIRLPOOL a07cbd102280c911ba79748931f841d2d5e28407225f2b1d48604b1d0e1c3d81c6488c40e2ef4ef571b628f1766f9aa1e5208138ca963c06e7b3b9226f5b6b6c
-DIST rkt-pxe-1097.0.0.img 240454650 SHA256 aa205919c4c733cf4cb7220f038f272f4b3ce6a185e5195945fdc625f506f737 SHA512 7a3cc62b5ae13ed8813effdea6125472982c81fa1fb35df0ac13a233ee352e67167a38cd82a802c0e8da50b2cf4455771441ad5ada186b3e3f2cdade4b1903c7 WHIRLPOOL 067eba2c1ebc546df506a249c0c49ab2ce556869f9455b6b1706e2285111293a4beed0172036df372e7b2e02449d815fb76c361219badcebe3240686be7bcc4c
DIST rkt-pxe-1151.0.0.img 243335216 SHA256 6f08697bea372af916a150f9846110e8855305653e5582b2c2ea04f14253e5c8 SHA512 fe7c4ec8cb4d11ba704b9f78c43557a374fda70dbfd7c3f4f9e768cf5ae365aab7a1fee8d51e19bbad6809ad4cdfe4eed60e5cdb6babd869a3a91b503b7256e8 WHIRLPOOL 92f8a65a9c50c11fa9c56acee53dd5623dd186664f44c6517bac4ee5be6a9dd2a9141ef522d978cc5b282c6638e17bf7b3559d68d6ea6c0752821799c0c88a5c
-DIST systemd-229.tar.gz 4319173 SHA256 b51b0a48d1beb388d95bd6a98d62be05490335d4bb388aefecdcb576e91e0741 SHA512 d692c0c9fc82f2fce64a5ec1caa4a0f8cf9edaeb1bdaaa1c462669db8f78b3dd6b33c87ef926ff21823582d0460f7b63aa3755792f9ae2cd6fb813ba08a35c39 WHIRLPOOL aa44f7161d80cc680226f19755579ba72c52cfe7bd671aefb09c414981f3a5a5c852f07d3449ac6f96d4ca91120cfb1464225d995b1637f1e2c108baf3c4a392
DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
diff --git a/app-emulation/rkt/rkt-1.11.0.ebuild b/app-emulation/rkt/rkt-1.11.0.ebuild
deleted file mode 100644
index 9abbe39..00000000
--- a/app-emulation/rkt/rkt-1.11.0.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit autotools flag-o-matic systemd toolchain-funcs
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="1097.0.0"
-PXE_SYSTEMD_VERSION="v229"
-KVM_LINUX_VERSION="4.3.1"
-KVMTOOL_VERSION="d62653e177597251c24494a6dda60acd6d846671"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm_lkvm? (
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
- mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
- ${PXE_URI} -> ${PXE_FILE}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="rkt is an App Container runtime for Linux"
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_src +actool systemd"
-REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm"
-
-DEPEND=">=dev-lang/go-1.5
- app-arch/cpio
- app-crypt/trousers
- sys-fs/squashfs-tools
- dev-perl/Capture-Tiny
- rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )"
-
-RDEPEND="!app-emulation/rocket
- rkt_stage1_host? ( systemd? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- ) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-src_unpack() {
- local x
- for x in ${A}; do
- case ${x} in
- *.img|linux-*) continue ;;
- kvmtool-*)
- mkdir kvmtool || die
- pushd kvmtool >/dev/null || die
- unpack ${x}
- popd >/dev/null || die
- ;;
- *)
- unpack ${x}
- esac
- done
-}
-
-src_prepare() {
- eapply_user
-
- # disable git fetch of systemd
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
- # disable git fetch of kvmtool
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
- # disable fetch of kernel sources
- sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
- -i stage1/usr_from_kvm/kernel.mk || die
-
- if use rkt_stage1_host; then
- # Make systemdUnitsPath consistent with host
- sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
- -i stage1/init/init.go || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- local flavors myeconfargs=(
- --with-stage1-default-images-directory="/usr/share/rkt"
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
- )
-
- use systemd || myeconfargs+=( --enable-sdjournal=no )
-
- # enable flavors (first is default)
- use rkt_stage1_host && flavors+=",host"
- use rkt_stage1_src && flavors+=",src"
- use rkt_stage1_coreos && flavors+=",coreos"
- use rkt_stage1_fly && flavors+=",fly"
- use rkt_stage1_kvm_lkvm && flavors+=",kvm"
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
- if use rkt_stage1_src; then
- myeconfargs+=(
- --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
- --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
- )
- fi
-
- if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm; then
- myeconfargs+=(
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
- )
- fi
-
- # Go's 6l linker does not support PIE, disable so cgo binaries
- # which use 6l+gcc for linking can be built correctly.
- if gcc-specs-pie; then
- append-ldflags -nopie
- fi
-
- export CC=$(tc-getCC)
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export BUILDDIR
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- local arch=${ARCH}
- case ${arch} in
- amd64) arch=x86_64;;
- esac
- ARCH=${arch} emake
-}
-
-src_install() {
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
- use actool && dobin "${S}/${BUILDDIR}/tools/actool"
-
- dobin "${S}/${BUILDDIR}/target/bin/rkt"
-
- insinto /usr/share/rkt
- doins "${S}/${BUILDDIR}/target/bin/"*.aci
-
- # create symlink for default stage1 image path
- if use rkt_stage1_host; then
- dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_src; then
- dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_coreos; then
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_fly; then
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_lkvm; then
- dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
- fi
-
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
-}
diff --git a/app-emulation/rkt/rkt-1.12.0.ebuild b/app-emulation/rkt/rkt-1.12.0.ebuild
deleted file mode 100644
index 77c2cae..00000000
--- a/app-emulation/rkt/rkt-1.12.0.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit autotools flag-o-matic systemd toolchain-funcs user
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="1097.0.0"
-PXE_SYSTEMD_VERSION="v229"
-KVM_LINUX_VERSION="4.3.1"
-KVMTOOL_VERSION="d62653e177597251c24494a6dda60acd6d846671"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm_lkvm? (
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
- mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
- ${PXE_URI} -> ${PXE_FILE}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="rkt is an App Container runtime for Linux"
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_src +actool systemd"
-REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm"
-
-DEPEND=">=dev-lang/go-1.5
- app-arch/cpio
- app-crypt/trousers
- sys-fs/squashfs-tools
- dev-perl/Capture-Tiny
- rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )"
-
-RDEPEND="!app-emulation/rocket
- rkt_stage1_host? ( systemd? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- ) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-pkg_setup() {
- enewgroup rkt-admin
- enewgroup rkt
-}
-
-src_unpack() {
- local x
- for x in ${A}; do
- case ${x} in
- *.img|linux-*) continue ;;
- kvmtool-*)
- mkdir kvmtool || die
- pushd kvmtool >/dev/null || die
- unpack ${x}
- popd >/dev/null || die
- ;;
- *)
- unpack ${x}
- esac
- done
-}
-
-src_prepare() {
- eapply_user
-
- sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
-
- # disable git fetch of systemd
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
- # disable git fetch of kvmtool
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
- # disable fetch of kernel sources
- sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
- -i stage1/usr_from_kvm/kernel.mk || die
-
- if use rkt_stage1_host; then
- # Make systemdUnitsPath consistent with host
- sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
- -i stage1/init/init.go || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- local flavors myeconfargs=(
- --with-stage1-default-images-directory="/usr/share/rkt"
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
- )
-
- use systemd || myeconfargs+=( --enable-sdjournal=no )
-
- # enable flavors (first is default)
- use rkt_stage1_host && flavors+=",host"
- use rkt_stage1_src && flavors+=",src"
- use rkt_stage1_coreos && flavors+=",coreos"
- use rkt_stage1_fly && flavors+=",fly"
- use rkt_stage1_kvm_lkvm && flavors+=",kvm"
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
- if use rkt_stage1_src; then
- myeconfargs+=(
- --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
- --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
- )
- fi
-
- if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm; then
- myeconfargs+=(
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
- )
- fi
-
- # Go's 6l linker does not support PIE, disable so cgo binaries
- # which use 6l+gcc for linking can be built correctly.
- if gcc-specs-pie; then
- append-ldflags -nopie
- fi
-
- export CC=$(tc-getCC)
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export BUILDDIR
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- local arch=${ARCH}
- case ${arch} in
- amd64) arch=x86_64;;
- esac
- ARCH=${arch} emake
-}
-
-src_install() {
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
- use actool && dobin "${S}/${BUILDDIR}/tools/actool"
-
- dobin "${S}/${BUILDDIR}/target/bin/rkt"
-
- insinto /usr/share/rkt
- doins "${S}/${BUILDDIR}/target/bin/"*.aci
-
- # create symlink for default stage1 image path
- if use rkt_stage1_host; then
- dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_src; then
- dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_coreos; then
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_fly; then
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm_lkvm; then
- dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
- fi
-
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
-
- keepdir /etc/${PN}
- fowners :rkt-admin /etc/${PN}
- fperms 2775 /etc/${PN}
-}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-10-01 23:54 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-10-01 23:54 UTC (permalink / raw
To: gentoo-commits
commit: 85c21c5a864d61a8f9fe8b4be77eb1a32eb5e78c
Author: Kai-Chieh Ku <kjackie <AT> gmail <DOT> com>
AuthorDate: Fri Sep 30 06:13:17 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Oct 1 23:54:00 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85c21c5a
app-emulation/rkt: install bash-completion
Package-Manager: portage-2.3.0
app-emulation/rkt/rkt-1.15.0.ebuild | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/app-emulation/rkt/rkt-1.15.0.ebuild b/app-emulation/rkt/rkt-1.15.0.ebuild
index 268d8080..62861b0 100644
--- a/app-emulation/rkt/rkt-1.15.0.ebuild
+++ b/app-emulation/rkt/rkt-1.15.0.ebuild
@@ -4,7 +4,7 @@
EAPI=6
-inherit autotools flag-o-matic systemd toolchain-funcs user
+inherit bash-completion-r1 autotools flag-o-matic systemd toolchain-funcs user
KEYWORDS="~amd64"
@@ -197,6 +197,7 @@ src_compile() {
amd64) arch=x86_64;;
esac
ARCH=${arch} emake
+ ARCH=${arch} emake bash-completion
}
src_install() {
@@ -230,6 +231,8 @@ src_install() {
systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
+ newbashcomp "${S}"/dist/bash_completion/rkt.bash rkt
+
keepdir /etc/${PN}
fowners :rkt-admin /etc/${PN}
fperms 2775 /etc/${PN}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-09-29 16:20 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-09-29 16:20 UTC (permalink / raw
To: gentoo-commits
commit: 3f0f1aa36016a95915f7648c46c6b81468bc4f63
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 29 16:17:20 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 16:20:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f0f1aa3
app-emulation/rkt: rename rkt_stage1_kvm to rkt_stage1_kvm_lkvm
Package-Manager: portage-2.3.1
app-emulation/rkt/rkt-1.11.0.ebuild | 12 ++++++------
app-emulation/rkt/rkt-1.12.0.ebuild | 12 ++++++------
app-emulation/rkt/rkt-1.14.0.ebuild | 12 ++++++------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/app-emulation/rkt/rkt-1.11.0.ebuild b/app-emulation/rkt/rkt-1.11.0.ebuild
index fbf338c..9abbe39 100644
--- a/app-emulation/rkt/rkt-1.11.0.ebuild
+++ b/app-emulation/rkt/rkt-1.11.0.ebuild
@@ -17,7 +17,7 @@ PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm? (
+rkt_stage1_kvm_lkvm? (
https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
${PXE_URI} -> ${PXE_FILE}
@@ -29,8 +29,8 @@ HOMEPAGE="https://github.com/coreos/rkt"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
-REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_src +actool systemd"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm"
DEPEND=">=dev-lang/go-1.5
app-arch/cpio
@@ -117,7 +117,7 @@ src_configure() {
use rkt_stage1_src && flavors+=",src"
use rkt_stage1_coreos && flavors+=",coreos"
use rkt_stage1_fly && flavors+=",fly"
- use rkt_stage1_kvm && flavors+=",kvm"
+ use rkt_stage1_kvm_lkvm && flavors+=",kvm"
myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
if use rkt_stage1_src; then
@@ -127,7 +127,7 @@ src_configure() {
)
fi
- if use rkt_stage1_coreos || use rkt_stage1_kvm; then
+ if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm; then
myeconfargs+=(
--with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
--with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
@@ -179,7 +179,7 @@ src_install() {
dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
elif use rkt_stage1_fly; then
dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm; then
+ elif use rkt_stage1_kvm_lkvm; then
dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
fi
diff --git a/app-emulation/rkt/rkt-1.12.0.ebuild b/app-emulation/rkt/rkt-1.12.0.ebuild
index 0c604bb..77c2cae 100644
--- a/app-emulation/rkt/rkt-1.12.0.ebuild
+++ b/app-emulation/rkt/rkt-1.12.0.ebuild
@@ -17,7 +17,7 @@ PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm? (
+rkt_stage1_kvm_lkvm? (
https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
${PXE_URI} -> ${PXE_FILE}
@@ -29,8 +29,8 @@ HOMEPAGE="https://github.com/coreos/rkt"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
-REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_src +actool systemd"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm"
DEPEND=">=dev-lang/go-1.5
app-arch/cpio
@@ -124,7 +124,7 @@ src_configure() {
use rkt_stage1_src && flavors+=",src"
use rkt_stage1_coreos && flavors+=",coreos"
use rkt_stage1_fly && flavors+=",fly"
- use rkt_stage1_kvm && flavors+=",kvm"
+ use rkt_stage1_kvm_lkvm && flavors+=",kvm"
myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
if use rkt_stage1_src; then
@@ -134,7 +134,7 @@ src_configure() {
)
fi
- if use rkt_stage1_coreos || use rkt_stage1_kvm; then
+ if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm; then
myeconfargs+=(
--with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
--with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
@@ -186,7 +186,7 @@ src_install() {
dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
elif use rkt_stage1_fly; then
dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm; then
+ elif use rkt_stage1_kvm_lkvm; then
dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
fi
diff --git a/app-emulation/rkt/rkt-1.14.0.ebuild b/app-emulation/rkt/rkt-1.14.0.ebuild
index 858c15b..4647369 100644
--- a/app-emulation/rkt/rkt-1.14.0.ebuild
+++ b/app-emulation/rkt/rkt-1.14.0.ebuild
@@ -17,7 +17,7 @@ PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm? (
+rkt_stage1_kvm_lkvm? (
https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
${PXE_URI} -> ${PXE_FILE}
@@ -29,8 +29,8 @@ HOMEPAGE="https://github.com/coreos/rkt"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
-REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_src +actool systemd"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm"
DEPEND=">=dev-lang/go-1.5
app-arch/cpio
@@ -124,7 +124,7 @@ src_configure() {
use rkt_stage1_src && flavors+=",src"
use rkt_stage1_coreos && flavors+=",coreos"
use rkt_stage1_fly && flavors+=",fly"
- use rkt_stage1_kvm && flavors+=",kvm"
+ use rkt_stage1_kvm_lkvm && flavors+=",kvm"
myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
if use rkt_stage1_src; then
@@ -134,7 +134,7 @@ src_configure() {
)
fi
- if use rkt_stage1_coreos || use rkt_stage1_kvm; then
+ if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm; then
myeconfargs+=(
--with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
--with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
@@ -186,7 +186,7 @@ src_install() {
dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
elif use rkt_stage1_fly; then
dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm; then
+ elif use rkt_stage1_kvm_lkvm; then
dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
fi
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-09-29 1:23 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-09-29 1:23 UTC (permalink / raw
To: gentoo-commits
commit: 08900369fa73a92de8114607e26fbe1cc6e7acd2
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 29 01:19:52 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 01:23:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08900369
app-emulation/rkt: version bump to 1.15.0
Package-Manager: portage-2.3.1
app-emulation/rkt/Manifest | 2 +
app-emulation/rkt/metadata.xml | 4 +-
app-emulation/rkt/rkt-1.15.0.ebuild | 236 ++++++++++++++++++++++++++++++++++++
3 files changed, 241 insertions(+), 1 deletion(-)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 965fe9d..7fbe706 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,8 +1,10 @@
DIST kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz 243930 SHA256 89f4cc94364298aa5b9c39c660ebd82a4beb5351cc838d418e7e21afefb5c1f0 SHA512 70aea2324273603b77aa64c95efd36df35c74514fa820013bfee386332289119cc148aed2983a8c6fd9ddfa5bc3db39c5aa0ee32bfc2077787338a47f2954f2f WHIRLPOOL ee47d7e38509eddf90ef0cf7d0cd3761c623e55a1003e8810e645759dc9615e33fbae22ab5576627f9f86eee8b4ca96c4bdf692b7ab073f1f222734bc378477a
DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5
+DIST qemu-2.6.1.tar.bz2 25762855 SHA256 4942fd1b6ee31f2f55ffc2201dd7397e6b9c55a2ef332e6d660c730d268e08d1 SHA512 adb55d0774618c9cd02d376222814f2047977bfbca73248841275084ae537db583db4ac6cfa5cc65c3182941d5f4b40f2f7f4661b2cd93cbb3796e2f325bc919 WHIRLPOOL 1b9c0de78fcf874fd307ce2ee49448e96140fae0ea5739af28947bf8f241e768b47abe3edd2d798b826d99cfd4ca143cf71192d254b54ab47515ac59327fc172
DIST rkt-1.11.0.tar.gz 2767797 SHA256 cd75f1648ae6736da731c14a2102646ee90467efd6d2a32b518fd36b8c9806c5 SHA512 dfc604b50037a5a272e0fe0f438c35e1a010489ee19a426cbad7184a3910a214f4bf659b533f323a2ab742deffe7bba10daee52691ff32e5a35f453b2b0c4bb0 WHIRLPOOL 4caa6be6f5f8c5aeb67c762a2643ffc8579d45f49b5c5e4cb5c16ce5e38cc4db35e9dee7d5df20ef80bf75d64e3cccbcc1521c4ddab18441652d2d383a17368b
DIST rkt-1.12.0.tar.gz 2828173 SHA256 310bbadc5128574e0ecbe83f5bd6d7680d5a7c1d43c538888b025743d2667195 SHA512 b472887f232fe386c96f91a2a4f4c0125dba0d40db1468e21bea744699ecaaf31af47e2e23f3cb7c686f05f5aabb984de04c86a7e5bbbd9284769d149259c25f WHIRLPOOL b6f143cc0c3f8fb86f35b0a728e7ebf8fc49da0d58ed1caa4179b5a496cd5c20cb20e412d3895713b0e0d79e9ac773a5e882a186047b3de904ab8232a85d9442
DIST rkt-1.14.0.tar.gz 2947502 SHA256 2458783023c561358c59600accb58ccfe335535931a58da988d70893a1c5a5e7 SHA512 4e082f0293047d133b031b6fd95e34fc86b7b2ca133ea56709cded5cd0c454e56bb5dd7209bc7add56812142495430c457d9094a8cda1c0079085822ff6e1c94 WHIRLPOOL 09837fc509cce2609bd87ae1185ce6c1e85e13888ab8106aab1725e8e3232486330e4152db8deb77dbc2c419d176a8f1c6df6d44d9a2808aefd62e58082a0353
+DIST rkt-1.15.0.tar.gz 3018468 SHA256 3efd0dc96c8783d5b378862c7239f733863a181bb3148f3b2e8e10023df06e01 SHA512 4f35eee5f689c8a36760c784d079751cfd0224c20c60f915ab1a550040739ec9290ba9e481e1679f67044400f8d3a60588b6d6d6cdfbbc1f3093c7010d35d290 WHIRLPOOL a07cbd102280c911ba79748931f841d2d5e28407225f2b1d48604b1d0e1c3d81c6488c40e2ef4ef571b628f1766f9aa1e5208138ca963c06e7b3b9226f5b6b6c
DIST rkt-pxe-1097.0.0.img 240454650 SHA256 aa205919c4c733cf4cb7220f038f272f4b3ce6a185e5195945fdc625f506f737 SHA512 7a3cc62b5ae13ed8813effdea6125472982c81fa1fb35df0ac13a233ee352e67167a38cd82a802c0e8da50b2cf4455771441ad5ada186b3e3f2cdade4b1903c7 WHIRLPOOL 067eba2c1ebc546df506a249c0c49ab2ce556869f9455b6b1706e2285111293a4beed0172036df372e7b2e02449d815fb76c361219badcebe3240686be7bcc4c
DIST rkt-pxe-1151.0.0.img 243335216 SHA256 6f08697bea372af916a150f9846110e8855305653e5582b2c2ea04f14253e5c8 SHA512 fe7c4ec8cb4d11ba704b9f78c43557a374fda70dbfd7c3f4f9e768cf5ae365aab7a1fee8d51e19bbad6809ad4cdfe4eed60e5cdb6babd869a3a91b503b7256e8 WHIRLPOOL 92f8a65a9c50c11fa9c56acee53dd5623dd186664f44c6517bac4ee5be6a9dd2a9141ef522d978cc5b282c6638e17bf7b3559d68d6ea6c0752821799c0c88a5c
DIST systemd-229.tar.gz 4319173 SHA256 b51b0a48d1beb388d95bd6a98d62be05490335d4bb388aefecdcb576e91e0741 SHA512 d692c0c9fc82f2fce64a5ec1caa4a0f8cf9edaeb1bdaaa1c462669db8f78b3dd6b33c87ef926ff21823582d0460f7b63aa3755792f9ae2cd6fb813ba08a35c39 WHIRLPOOL aa44f7161d80cc680226f19755579ba72c52cfe7bd671aefb09c414981f3a5a5c852f07d3449ac6f96d4ca91120cfb1464225d995b1637f1e2c108baf3c4a392
diff --git a/app-emulation/rkt/metadata.xml b/app-emulation/rkt/metadata.xml
index 73fd769..3483e6c 100644
--- a/app-emulation/rkt/metadata.xml
+++ b/app-emulation/rkt/metadata.xml
@@ -18,7 +18,9 @@
<flag name="actool">Install the actool for ACI manipulation</flag>
<flag name="rkt_stage1_coreos">Download and use a prebuilt stage1.aci from CoreOS</flag>
<flag name="rkt_stage1_fly">Build stage1-fly.aci</flag>
- <flag name="rkt_stage1_kvm">Build stage1-kvm.aci</flag>
+ <flag name="rkt_stage1_kvm">This flag has been replaced by the rkt_stage1_kvm_* flags</flag>
+ <flag name="rkt_stage1_kvm_lkvm">Build stage1-kvm-lkvm.aci</flag>
+ <flag name="rkt_stage1_kvm_qemu">Build stage1-kvm-qemu.aci</flag>
<flag name="rkt_stage1_src">Build the stage1.aci from source</flag>
<flag name="rkt_stage1_host">Assemble stage1.aci from host binaries</flag>
</use>
diff --git a/app-emulation/rkt/rkt-1.15.0.ebuild b/app-emulation/rkt/rkt-1.15.0.ebuild
new file mode 100644
index 00000000..268d8080
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.15.0.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools flag-o-matic systemd toolchain-funcs user
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="1151.0.0"
+PXE_SYSTEMD_VERSION="v231"
+KVM_LINUX_VERSION="4.3.1"
+KVMTOOL_VERSION="d62653e177597251c24494a6dda60acd6d846671"
+QEMU_VERSION="v2.6.1"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI_KVM="mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
+"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm_lkvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ ${SRC_URI_KVM}
+)
+rkt_stage1_kvm_qemu? (
+ http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION#v}.tar.bz2
+ ${SRC_URI_KVM}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
+
+DESCRIPTION="rkt is an App Container runtime for Linux"
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# The rkt_stage1_kvm flag has been replaced by the rkt_stage1_kvm_lkvm and rkt_stage1_kvm_qemu flags
+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"
+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"
+
+DEPEND=">=dev-lang/go-1.5
+ app-arch/cpio
+ app-crypt/trousers
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny
+ rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )
+ rkt_stage1_kvm_qemu? (
+ sys-libs/libcap[static-libs(+)]
+ >=x11-libs/pixman-0.28.0[static-libs(+)]
+ )"
+
+RDEPEND="!app-emulation/rocket
+ rkt_stage1_host? ( systemd? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ ) )"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+pkg_setup() {
+ enewgroup rkt-admin
+ enewgroup rkt
+}
+
+src_unpack() {
+ local x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
+src_prepare() {
+ eapply_user
+
+ sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
+
+ # disable git fetch of systemd
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable git fetch of qemu
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'")),)\n\n'\
+'$(call forward-vars, get_qemu_sources, QEMU_SRCDIR)\n'\
+'get_qemu_sources: | $(QEMU_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/qemu-'${QEMU_VERSION#v}'" "$(QEMU_SRCDIR)"\n\n'\
+'$(QEMU_CLONE_STAMP): get_qemu_sources\n\n'\
+'else ifneq ($(wildcard $(QEMU_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' \
+ -e 's|QEMU_CONFIGURATION_OPTS :=|\0 --disable-opengl|' \
+ -i stage1/usr_from_kvm/qemu.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ local flavors hypervisors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+ )
+
+ use systemd || myeconfargs+=( --enable-sdjournal=no )
+
+ # enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
+ use rkt_stage1_src && flavors+=",src"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ { use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; } && flavors+=",kvm"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_src; then
+ myeconfargs+=(
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+ )
+ fi
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
+ fi
+
+ if use rkt_stage1_kvm_lkvm || use rkt_stage1_kvm_qemu; then
+ use rkt_stage1_kvm_lkvm && hypervisors+=",lkvm"
+ use rkt_stage1_kvm_qemu && hypervisors+=",qemu"
+ myeconfargs+=( --with-stage1-kvm-hypervisors="${hypervisors#,}" )
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} emake
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/tools/actool"
+
+ dobin "${S}/${BUILDDIR}/target/bin/rkt"
+
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/target/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_src; then
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_lkvm; then
+ dosym stage1-kvm-lkvm.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm_qemu; then
+ dosym stage1-kvm-qemu.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
+
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
+
+ keepdir /etc/${PN}
+ fowners :rkt-admin /etc/${PN}
+ fperms 2775 /etc/${PN}
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-09-07 17:04 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-09-07 17:04 UTC (permalink / raw
To: gentoo-commits
commit: 8d0192974ecc2dc4cf7b9a02956b62219de3e2ed
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 7 17:03:29 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Sep 7 17:04:04 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d019297
app-emulation/rkt: version bump to 1.14.0
Package-Manager: portage-2.3.0
app-emulation/rkt/Manifest | 3 +
app-emulation/rkt/rkt-1.14.0.ebuild | 201 ++++++++++++++++++++++++++++++++++++
2 files changed, 204 insertions(+)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 02e38e5..965fe9d 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -2,5 +2,8 @@ DIST kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz 243930 SHA256 89f4c
DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5
DIST rkt-1.11.0.tar.gz 2767797 SHA256 cd75f1648ae6736da731c14a2102646ee90467efd6d2a32b518fd36b8c9806c5 SHA512 dfc604b50037a5a272e0fe0f438c35e1a010489ee19a426cbad7184a3910a214f4bf659b533f323a2ab742deffe7bba10daee52691ff32e5a35f453b2b0c4bb0 WHIRLPOOL 4caa6be6f5f8c5aeb67c762a2643ffc8579d45f49b5c5e4cb5c16ce5e38cc4db35e9dee7d5df20ef80bf75d64e3cccbcc1521c4ddab18441652d2d383a17368b
DIST rkt-1.12.0.tar.gz 2828173 SHA256 310bbadc5128574e0ecbe83f5bd6d7680d5a7c1d43c538888b025743d2667195 SHA512 b472887f232fe386c96f91a2a4f4c0125dba0d40db1468e21bea744699ecaaf31af47e2e23f3cb7c686f05f5aabb984de04c86a7e5bbbd9284769d149259c25f WHIRLPOOL b6f143cc0c3f8fb86f35b0a728e7ebf8fc49da0d58ed1caa4179b5a496cd5c20cb20e412d3895713b0e0d79e9ac773a5e882a186047b3de904ab8232a85d9442
+DIST rkt-1.14.0.tar.gz 2947502 SHA256 2458783023c561358c59600accb58ccfe335535931a58da988d70893a1c5a5e7 SHA512 4e082f0293047d133b031b6fd95e34fc86b7b2ca133ea56709cded5cd0c454e56bb5dd7209bc7add56812142495430c457d9094a8cda1c0079085822ff6e1c94 WHIRLPOOL 09837fc509cce2609bd87ae1185ce6c1e85e13888ab8106aab1725e8e3232486330e4152db8deb77dbc2c419d176a8f1c6df6d44d9a2808aefd62e58082a0353
DIST rkt-pxe-1097.0.0.img 240454650 SHA256 aa205919c4c733cf4cb7220f038f272f4b3ce6a185e5195945fdc625f506f737 SHA512 7a3cc62b5ae13ed8813effdea6125472982c81fa1fb35df0ac13a233ee352e67167a38cd82a802c0e8da50b2cf4455771441ad5ada186b3e3f2cdade4b1903c7 WHIRLPOOL 067eba2c1ebc546df506a249c0c49ab2ce556869f9455b6b1706e2285111293a4beed0172036df372e7b2e02449d815fb76c361219badcebe3240686be7bcc4c
+DIST rkt-pxe-1151.0.0.img 243335216 SHA256 6f08697bea372af916a150f9846110e8855305653e5582b2c2ea04f14253e5c8 SHA512 fe7c4ec8cb4d11ba704b9f78c43557a374fda70dbfd7c3f4f9e768cf5ae365aab7a1fee8d51e19bbad6809ad4cdfe4eed60e5cdb6babd869a3a91b503b7256e8 WHIRLPOOL 92f8a65a9c50c11fa9c56acee53dd5623dd186664f44c6517bac4ee5be6a9dd2a9141ef522d978cc5b282c6638e17bf7b3559d68d6ea6c0752821799c0c88a5c
DIST systemd-229.tar.gz 4319173 SHA256 b51b0a48d1beb388d95bd6a98d62be05490335d4bb388aefecdcb576e91e0741 SHA512 d692c0c9fc82f2fce64a5ec1caa4a0f8cf9edaeb1bdaaa1c462669db8f78b3dd6b33c87ef926ff21823582d0460f7b63aa3755792f9ae2cd6fb813ba08a35c39 WHIRLPOOL aa44f7161d80cc680226f19755579ba72c52cfe7bd671aefb09c414981f3a5a5c852f07d3449ac6f96d4ca91120cfb1464225d995b1637f1e2c108baf3c4a392
+DIST systemd-231.tar.gz 4381464 SHA256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6 WHIRLPOOL 7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
diff --git a/app-emulation/rkt/rkt-1.14.0.ebuild b/app-emulation/rkt/rkt-1.14.0.ebuild
new file mode 100644
index 00000000..858c15b
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.14.0.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools flag-o-matic systemd toolchain-funcs user
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="1151.0.0"
+PXE_SYSTEMD_VERSION="v231"
+KVM_LINUX_VERSION="4.3.1"
+KVMTOOL_VERSION="d62653e177597251c24494a6dda60acd6d846671"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
+
+DESCRIPTION="rkt is an App Container runtime for Linux"
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
+
+DEPEND=">=dev-lang/go-1.5
+ app-arch/cpio
+ app-crypt/trousers
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny
+ rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )"
+
+RDEPEND="!app-emulation/rocket
+ rkt_stage1_host? ( systemd? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ ) )"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+pkg_setup() {
+ enewgroup rkt-admin
+ enewgroup rkt
+}
+
+src_unpack() {
+ local x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
+src_prepare() {
+ eapply_user
+
+ sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
+
+ # disable git fetch of systemd
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ local flavors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+ )
+
+ use systemd || myeconfargs+=( --enable-sdjournal=no )
+
+ # enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
+ use rkt_stage1_src && flavors+=",src"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ use rkt_stage1_kvm && flavors+=",kvm"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_src; then
+ myeconfargs+=(
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+ )
+ fi
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} emake
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/tools/actool"
+
+ dobin "${S}/${BUILDDIR}/target/bin/rkt"
+
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/target/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_src; then
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm; then
+ dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
+
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
+
+ keepdir /etc/${PN}
+ fowners :rkt-admin /etc/${PN}
+ fperms 2775 /etc/${PN}
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-08-15 19:10 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-08-15 19:10 UTC (permalink / raw
To: gentoo-commits
commit: 5452337e34ea3e610556c832b8b94196b9eac056
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 15 19:07:29 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Aug 15 19:10:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5452337e
app-emulation/rkt: fix 1.12.0 to not require git, bug 591314
Package-Manager: portage-2.3.0
app-emulation/rkt/rkt-1.12.0.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/app-emulation/rkt/rkt-1.12.0.ebuild b/app-emulation/rkt/rkt-1.12.0.ebuild
index 103e5c4..0c604bb 100644
--- a/app-emulation/rkt/rkt-1.12.0.ebuild
+++ b/app-emulation/rkt/rkt-1.12.0.ebuild
@@ -73,6 +73,8 @@ src_unpack() {
src_prepare() {
eapply_user
+ sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
+
# disable git fetch of systemd
sed -e 's~^include makelib/git.mk$~'\
'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-08-15 9:02 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-08-15 9:02 UTC (permalink / raw
To: gentoo-commits
commit: d4227a7f1cc9a8a5f7661d034622eec38ab8db61
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 15 09:02:26 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Aug 15 09:02:53 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4227a7f
app-emulation/rkt: fix Manifest for rkt-1.12.0.tar.gz
Package-Manager: portage-2.3.0
app-emulation/rkt/Manifest | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 4dbc0f1..02e38e5 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,6 +1,6 @@
DIST kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz 243930 SHA256 89f4cc94364298aa5b9c39c660ebd82a4beb5351cc838d418e7e21afefb5c1f0 SHA512 70aea2324273603b77aa64c95efd36df35c74514fa820013bfee386332289119cc148aed2983a8c6fd9ddfa5bc3db39c5aa0ee32bfc2077787338a47f2954f2f WHIRLPOOL ee47d7e38509eddf90ef0cf7d0cd3761c623e55a1003e8810e645759dc9615e33fbae22ab5576627f9f86eee8b4ca96c4bdf692b7ab073f1f222734bc378477a
DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5
DIST rkt-1.11.0.tar.gz 2767797 SHA256 cd75f1648ae6736da731c14a2102646ee90467efd6d2a32b518fd36b8c9806c5 SHA512 dfc604b50037a5a272e0fe0f438c35e1a010489ee19a426cbad7184a3910a214f4bf659b533f323a2ab742deffe7bba10daee52691ff32e5a35f453b2b0c4bb0 WHIRLPOOL 4caa6be6f5f8c5aeb67c762a2643ffc8579d45f49b5c5e4cb5c16ce5e38cc4db35e9dee7d5df20ef80bf75d64e3cccbcc1521c4ddab18441652d2d383a17368b
-DIST rkt-1.12.0.tar.gz 920 SHA256 1af13e1465e6c5beae615d6524813f74c043cc70e110705a8830445695b62b1a SHA512 ee69079dced376673350dc20a99b75960cc56cee840e4ab119c2c4ef6685db46a4e1e6ebef2949fa32a91aa8da7719a86834b71880a9d2b246ef3048445ac626 WHIRLPOOL 0265fe0601d648c3800b96830e94fb65f25571e584e5d97d44c2432d55cf81c98f0efb85628dc345c302401e0a1bcc958cada56452a1bd905792db7806efbed7
+DIST rkt-1.12.0.tar.gz 2828173 SHA256 310bbadc5128574e0ecbe83f5bd6d7680d5a7c1d43c538888b025743d2667195 SHA512 b472887f232fe386c96f91a2a4f4c0125dba0d40db1468e21bea744699ecaaf31af47e2e23f3cb7c686f05f5aabb984de04c86a7e5bbbd9284769d149259c25f WHIRLPOOL b6f143cc0c3f8fb86f35b0a728e7ebf8fc49da0d58ed1caa4179b5a496cd5c20cb20e412d3895713b0e0d79e9ac773a5e882a186047b3de904ab8232a85d9442
DIST rkt-pxe-1097.0.0.img 240454650 SHA256 aa205919c4c733cf4cb7220f038f272f4b3ce6a185e5195945fdc625f506f737 SHA512 7a3cc62b5ae13ed8813effdea6125472982c81fa1fb35df0ac13a233ee352e67167a38cd82a802c0e8da50b2cf4455771441ad5ada186b3e3f2cdade4b1903c7 WHIRLPOOL 067eba2c1ebc546df506a249c0c49ab2ce556869f9455b6b1706e2285111293a4beed0172036df372e7b2e02449d815fb76c361219badcebe3240686be7bcc4c
DIST systemd-229.tar.gz 4319173 SHA256 b51b0a48d1beb388d95bd6a98d62be05490335d4bb388aefecdcb576e91e0741 SHA512 d692c0c9fc82f2fce64a5ec1caa4a0f8cf9edaeb1bdaaa1c462669db8f78b3dd6b33c87ef926ff21823582d0460f7b63aa3755792f9ae2cd6fb813ba08a35c39 WHIRLPOOL aa44f7161d80cc680226f19755579ba72c52cfe7bd671aefb09c414981f3a5a5c852f07d3449ac6f96d4ca91120cfb1464225d995b1637f1e2c108baf3c4a392
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-08-15 8:55 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-08-15 8:55 UTC (permalink / raw
To: gentoo-commits
commit: 08f8bec932e8551e157bea6436a48c1d7535812c
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 15 08:54:32 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Aug 15 08:54:32 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08f8bec9
app-emulation/rkt: remove old version 1.10.1
Package-Manager: portage-2.3.0
app-emulation/rkt/Manifest | 3 -
app-emulation/rkt/rkt-1.10.1.ebuild | 192 ------------------------------------
2 files changed, 195 deletions(-)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 53fb743..4dbc0f1 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,9 +1,6 @@
DIST kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz 243930 SHA256 89f4cc94364298aa5b9c39c660ebd82a4beb5351cc838d418e7e21afefb5c1f0 SHA512 70aea2324273603b77aa64c95efd36df35c74514fa820013bfee386332289119cc148aed2983a8c6fd9ddfa5bc3db39c5aa0ee32bfc2077787338a47f2954f2f WHIRLPOOL ee47d7e38509eddf90ef0cf7d0cd3761c623e55a1003e8810e645759dc9615e33fbae22ab5576627f9f86eee8b4ca96c4bdf692b7ab073f1f222734bc378477a
DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5
-DIST rkt-1.10.1.tar.gz 2754338 SHA256 4a3c5db16be05292d6174d9d2c1d1f4c5c967e37686390927b8ca0d2bf570eb5 SHA512 6f6291251b31a3b4e1a4652554ded3f5c43b975aac861bbad483360347ea23f3f517b5fdd97fca2b26ab9543530df6318207e67c3d0776eff04cd4808489d2ec WHIRLPOOL 8f2946a2e5478bc2d1a0d5274fd22a7a16fbc81ed462d0cc49e7aa47e43c6c4324c317c3913199b55000d09b955aa56df0090427f99825f4cf376240cdd285c7
DIST rkt-1.11.0.tar.gz 2767797 SHA256 cd75f1648ae6736da731c14a2102646ee90467efd6d2a32b518fd36b8c9806c5 SHA512 dfc604b50037a5a272e0fe0f438c35e1a010489ee19a426cbad7184a3910a214f4bf659b533f323a2ab742deffe7bba10daee52691ff32e5a35f453b2b0c4bb0 WHIRLPOOL 4caa6be6f5f8c5aeb67c762a2643ffc8579d45f49b5c5e4cb5c16ce5e38cc4db35e9dee7d5df20ef80bf75d64e3cccbcc1521c4ddab18441652d2d383a17368b
DIST rkt-1.12.0.tar.gz 920 SHA256 1af13e1465e6c5beae615d6524813f74c043cc70e110705a8830445695b62b1a SHA512 ee69079dced376673350dc20a99b75960cc56cee840e4ab119c2c4ef6685db46a4e1e6ebef2949fa32a91aa8da7719a86834b71880a9d2b246ef3048445ac626 WHIRLPOOL 0265fe0601d648c3800b96830e94fb65f25571e584e5d97d44c2432d55cf81c98f0efb85628dc345c302401e0a1bcc958cada56452a1bd905792db7806efbed7
-DIST rkt-pxe-1068.0.0.img 261402717 SHA256 f7ae0b0c676a2aaaaf2872fd5d0d692744d6af9185a334354c3c673865e54a1a SHA512 7b4c4ac28eb59f9fa8616b205fb440e5535814b80d89a365fd695252e7f9ed5f0d5288d1e571bc71b261f4f68ca052d327eee7eabe9b562e7003c767c96e052a WHIRLPOOL 1afa35b65a4beb2d5c12a8da4db7aff6b3b3123aa83366b0a51caac911938957f992082f7af35c1592c2da44503cc5131547a7961771c2c4064e79b3074f8a6b
DIST rkt-pxe-1097.0.0.img 240454650 SHA256 aa205919c4c733cf4cb7220f038f272f4b3ce6a185e5195945fdc625f506f737 SHA512 7a3cc62b5ae13ed8813effdea6125472982c81fa1fb35df0ac13a233ee352e67167a38cd82a802c0e8da50b2cf4455771441ad5ada186b3e3f2cdade4b1903c7 WHIRLPOOL 067eba2c1ebc546df506a249c0c49ab2ce556869f9455b6b1706e2285111293a4beed0172036df372e7b2e02449d815fb76c361219badcebe3240686be7bcc4c
-DIST rkt-sdjournal-64e931a183d12a30e3e25deefbeab0753dca99bf.patch 11264 SHA256 789ac19d4edb2b8b06c0dd3f1ad9092c583fcc039b7d0c3e491d03cdcf83b4d2 SHA512 2f4e918b1be3812b781813ebbfffb258c1b3441298825cfaba768453dd55ffe39f91fc2b230b6c3ec2c8003543e61d72cf161a56dfff85ba51f2e3fcd2c8f1e3 WHIRLPOOL dde9c83be96278eb5b7fb5bab2c0db4e3a741eede3164fe9bcd27905834ea31554e3739614a34a55a8cb1d9e89804a4db9a004d1758d618211bc5b50865286de
DIST systemd-229.tar.gz 4319173 SHA256 b51b0a48d1beb388d95bd6a98d62be05490335d4bb388aefecdcb576e91e0741 SHA512 d692c0c9fc82f2fce64a5ec1caa4a0f8cf9edaeb1bdaaa1c462669db8f78b3dd6b33c87ef926ff21823582d0460f7b63aa3755792f9ae2cd6fb813ba08a35c39 WHIRLPOOL aa44f7161d80cc680226f19755579ba72c52cfe7bd671aefb09c414981f3a5a5c852f07d3449ac6f96d4ca91120cfb1464225d995b1637f1e2c108baf3c4a392
diff --git a/app-emulation/rkt/rkt-1.10.1.ebuild b/app-emulation/rkt/rkt-1.10.1.ebuild
deleted file mode 100644
index 8cde565..0000000
--- a/app-emulation/rkt/rkt-1.10.1.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit autotools flag-o-matic systemd toolchain-funcs
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="1068.0.0"
-PXE_SYSTEMD_VERSION="v229"
-KVM_LINUX_VERSION="4.3.1"
-KVMTOOL_VERSION="d62653e177597251c24494a6dda60acd6d846671"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/coreos/rkt/commit/64e931a183d12a30e3e25deefbeab0753dca99bf.patch -> rkt-sdjournal-64e931a183d12a30e3e25deefbeab0753dca99bf.patch
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm? (
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
- mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
- ${PXE_URI} -> ${PXE_FILE}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="rkt is an App Container runtime for Linux"
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
-REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
-
-DEPEND=">=dev-lang/go-1.5
- app-arch/cpio
- app-crypt/trousers
- sys-fs/squashfs-tools
- dev-perl/Capture-Tiny
- rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )"
-
-RDEPEND="!app-emulation/rocket
- rkt_stage1_host? ( systemd? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- ) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-src_unpack() {
- local x
- for x in ${A}; do
- case ${x} in
- *.img|linux-*) continue ;;
- kvmtool-*)
- mkdir kvmtool || die
- pushd kvmtool >/dev/null || die
- unpack ${x}
- popd >/dev/null || die
- ;;
- *)
- unpack ${x}
- esac
- done
-}
-
-src_prepare() {
- eapply "${DISTDIR}/rkt-sdjournal-64e931a183d12a30e3e25deefbeab0753dca99bf.patch"
- eapply_user
-
- # disable git fetch of systemd
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
- # disable git fetch of kvmtool
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
- # disable fetch of kernel sources
- sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
- -i stage1/usr_from_kvm/kernel.mk || die
-
- if use rkt_stage1_host; then
- # Make systemdUnitsPath consistent with host
- sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
- -i stage1/init/init.go || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- local flavors myeconfargs=(
- --with-stage1-default-images-directory="/usr/share/rkt"
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
- )
-
- use systemd || myeconfargs+=( --enable-sdjournal=no )
-
- # enable flavors (first is default)
- use rkt_stage1_host && flavors+=",host"
- use rkt_stage1_src && flavors+=",src"
- use rkt_stage1_coreos && flavors+=",coreos"
- use rkt_stage1_fly && flavors+=",fly"
- use rkt_stage1_kvm && flavors+=",kvm"
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
- if use rkt_stage1_src; then
- myeconfargs+=(
- --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
- --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
- )
- fi
-
- if use rkt_stage1_coreos || use rkt_stage1_kvm; then
- myeconfargs+=(
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
- )
- fi
-
- # Go's 6l linker does not support PIE, disable so cgo binaries
- # which use 6l+gcc for linking can be built correctly.
- if gcc-specs-pie; then
- append-ldflags -nopie
- fi
-
- export CC=$(tc-getCC)
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export BUILDDIR
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- local arch=${ARCH}
- case ${arch} in
- amd64) arch=x86_64;;
- esac
- ARCH=${arch} emake
-}
-
-src_install() {
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
- use actool && dobin "${S}/${BUILDDIR}/tools/actool"
-
- dobin "${S}/${BUILDDIR}/target/bin/rkt"
-
- insinto /usr/share/rkt
- doins "${S}/${BUILDDIR}/target/bin/"*.aci
-
- # create symlink for default stage1 image path
- if use rkt_stage1_host; then
- dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_src; then
- dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_coreos; then
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_fly; then
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm; then
- dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
- fi
-
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
-}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-08-15 8:53 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-08-15 8:53 UTC (permalink / raw
To: gentoo-commits
commit: ecd73933c05e65dafa92ff00856e206a1edb57b8
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 15 08:52:59 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Aug 15 08:53:37 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecd73933
app-emulation/rkt: version bump to 1.12.0
Package-Manager: portage-2.3.0
app-emulation/rkt/Manifest | 1 +
app-emulation/rkt/rkt-1.12.0.ebuild | 199 ++++++++++++++++++++++++++++++++++++
2 files changed, 200 insertions(+)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index f7d88e9..53fb743 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -2,6 +2,7 @@ DIST kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz 243930 SHA256 89f4c
DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5
DIST rkt-1.10.1.tar.gz 2754338 SHA256 4a3c5db16be05292d6174d9d2c1d1f4c5c967e37686390927b8ca0d2bf570eb5 SHA512 6f6291251b31a3b4e1a4652554ded3f5c43b975aac861bbad483360347ea23f3f517b5fdd97fca2b26ab9543530df6318207e67c3d0776eff04cd4808489d2ec WHIRLPOOL 8f2946a2e5478bc2d1a0d5274fd22a7a16fbc81ed462d0cc49e7aa47e43c6c4324c317c3913199b55000d09b955aa56df0090427f99825f4cf376240cdd285c7
DIST rkt-1.11.0.tar.gz 2767797 SHA256 cd75f1648ae6736da731c14a2102646ee90467efd6d2a32b518fd36b8c9806c5 SHA512 dfc604b50037a5a272e0fe0f438c35e1a010489ee19a426cbad7184a3910a214f4bf659b533f323a2ab742deffe7bba10daee52691ff32e5a35f453b2b0c4bb0 WHIRLPOOL 4caa6be6f5f8c5aeb67c762a2643ffc8579d45f49b5c5e4cb5c16ce5e38cc4db35e9dee7d5df20ef80bf75d64e3cccbcc1521c4ddab18441652d2d383a17368b
+DIST rkt-1.12.0.tar.gz 920 SHA256 1af13e1465e6c5beae615d6524813f74c043cc70e110705a8830445695b62b1a SHA512 ee69079dced376673350dc20a99b75960cc56cee840e4ab119c2c4ef6685db46a4e1e6ebef2949fa32a91aa8da7719a86834b71880a9d2b246ef3048445ac626 WHIRLPOOL 0265fe0601d648c3800b96830e94fb65f25571e584e5d97d44c2432d55cf81c98f0efb85628dc345c302401e0a1bcc958cada56452a1bd905792db7806efbed7
DIST rkt-pxe-1068.0.0.img 261402717 SHA256 f7ae0b0c676a2aaaaf2872fd5d0d692744d6af9185a334354c3c673865e54a1a SHA512 7b4c4ac28eb59f9fa8616b205fb440e5535814b80d89a365fd695252e7f9ed5f0d5288d1e571bc71b261f4f68ca052d327eee7eabe9b562e7003c767c96e052a WHIRLPOOL 1afa35b65a4beb2d5c12a8da4db7aff6b3b3123aa83366b0a51caac911938957f992082f7af35c1592c2da44503cc5131547a7961771c2c4064e79b3074f8a6b
DIST rkt-pxe-1097.0.0.img 240454650 SHA256 aa205919c4c733cf4cb7220f038f272f4b3ce6a185e5195945fdc625f506f737 SHA512 7a3cc62b5ae13ed8813effdea6125472982c81fa1fb35df0ac13a233ee352e67167a38cd82a802c0e8da50b2cf4455771441ad5ada186b3e3f2cdade4b1903c7 WHIRLPOOL 067eba2c1ebc546df506a249c0c49ab2ce556869f9455b6b1706e2285111293a4beed0172036df372e7b2e02449d815fb76c361219badcebe3240686be7bcc4c
DIST rkt-sdjournal-64e931a183d12a30e3e25deefbeab0753dca99bf.patch 11264 SHA256 789ac19d4edb2b8b06c0dd3f1ad9092c583fcc039b7d0c3e491d03cdcf83b4d2 SHA512 2f4e918b1be3812b781813ebbfffb258c1b3441298825cfaba768453dd55ffe39f91fc2b230b6c3ec2c8003543e61d72cf161a56dfff85ba51f2e3fcd2c8f1e3 WHIRLPOOL dde9c83be96278eb5b7fb5bab2c0db4e3a741eede3164fe9bcd27905834ea31554e3739614a34a55a8cb1d9e89804a4db9a004d1758d618211bc5b50865286de
diff --git a/app-emulation/rkt/rkt-1.12.0.ebuild b/app-emulation/rkt/rkt-1.12.0.ebuild
new file mode 100644
index 0000000..103e5c4
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.12.0.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools flag-o-matic systemd toolchain-funcs user
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="1097.0.0"
+PXE_SYSTEMD_VERSION="v229"
+KVM_LINUX_VERSION="4.3.1"
+KVMTOOL_VERSION="d62653e177597251c24494a6dda60acd6d846671"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
+
+DESCRIPTION="rkt is an App Container runtime for Linux"
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
+
+DEPEND=">=dev-lang/go-1.5
+ app-arch/cpio
+ app-crypt/trousers
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny
+ rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )"
+
+RDEPEND="!app-emulation/rocket
+ rkt_stage1_host? ( systemd? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ ) )"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+pkg_setup() {
+ enewgroup rkt-admin
+ enewgroup rkt
+}
+
+src_unpack() {
+ local x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
+src_prepare() {
+ eapply_user
+
+ # disable git fetch of systemd
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ local flavors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+ )
+
+ use systemd || myeconfargs+=( --enable-sdjournal=no )
+
+ # enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
+ use rkt_stage1_src && flavors+=",src"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ use rkt_stage1_kvm && flavors+=",kvm"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_src; then
+ myeconfargs+=(
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+ )
+ fi
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} emake
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/tools/actool"
+
+ dobin "${S}/${BUILDDIR}/target/bin/rkt"
+
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/target/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_src; then
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm; then
+ dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
+
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
+
+ keepdir /etc/${PN}
+ fowners :rkt-admin /etc/${PN}
+ fperms 2775 /etc/${PN}
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-07-30 18:52 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-07-30 18:52 UTC (permalink / raw
To: gentoo-commits
commit: 5542ebba3fb1b0781a779d5d2db4d7703b276e1a
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 30 18:51:03 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 18:51:03 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5542ebba
app-emulation/rkt: update longdescription
Package-Manager: portage-2.3.0
app-emulation/rkt/metadata.xml | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/app-emulation/rkt/metadata.xml b/app-emulation/rkt/metadata.xml
index 7b1939a..73fd769 100644
--- a/app-emulation/rkt/metadata.xml
+++ b/app-emulation/rkt/metadata.xml
@@ -6,10 +6,13 @@
<name>Zac Medico</name>
</maintainer>
<longdescription lang="en">
- rkt is a new container runtime, designed for composability, security,
- and speed. Today we are releasing a prototype version on GitHub to begin
- gathering feedback from our community and explain why we are building
- rkt.
+ rkt is the next-generation container manager for Linux clusters.
+ Designed for security, simplicity, and composability within modern
+ cluster architectures, rkt discovers, verifies, fetches, and executes
+ application containers with pluggable isolation. rkt can run the same
+ container with varying degrees of protection, from lightweight,
+ OS-level namespace and capabilities isolation to heavier, VM-level
+ hardware virtualization.
</longdescription>
<use>
<flag name="actool">Install the actool for ACI manipulation</flag>
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-07-30 18:46 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-07-30 18:46 UTC (permalink / raw
To: gentoo-commits
commit: 884ad43485814d2d02a777d3dc60ac430d2942e5
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 30 18:44:27 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 18:46:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=884ad434
app-emulation/rkt: reduce DESCRIPTION lenght
Package-Manager: portage-2.3.0
app-emulation/rkt/rkt-1.10.1.ebuild | 3 +--
app-emulation/rkt/rkt-1.11.0.ebuild | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/app-emulation/rkt/rkt-1.10.1.ebuild b/app-emulation/rkt/rkt-1.10.1.ebuild
index 8a4dfda..8cde565 100644
--- a/app-emulation/rkt/rkt-1.10.1.ebuild
+++ b/app-emulation/rkt/rkt-1.10.1.ebuild
@@ -25,8 +25,7 @@ rkt_stage1_kvm? (
)
rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-DESCRIPTION="A CLI for running app containers, and an implementation of the App
-Container Spec."
+DESCRIPTION="rkt is an App Container runtime for Linux"
HOMEPAGE="https://github.com/coreos/rkt"
LICENSE="Apache-2.0"
diff --git a/app-emulation/rkt/rkt-1.11.0.ebuild b/app-emulation/rkt/rkt-1.11.0.ebuild
index c9e4a2f..fbf338c 100644
--- a/app-emulation/rkt/rkt-1.11.0.ebuild
+++ b/app-emulation/rkt/rkt-1.11.0.ebuild
@@ -24,8 +24,7 @@ rkt_stage1_kvm? (
)
rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-DESCRIPTION="A CLI for running app containers, and an implementation of the App
-Container Spec."
+DESCRIPTION="rkt is an App Container runtime for Linux"
HOMEPAGE="https://github.com/coreos/rkt"
LICENSE="Apache-2.0"
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-07-30 7:15 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-07-30 7:15 UTC (permalink / raw
To: gentoo-commits
commit: 16d30c6b3704c0be696f3de8a798b86b547d7f1b
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 30 07:15:03 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 07:15:03 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16d30c6b
app-emulation/rkt: drop 9999 ebuild
Package-Manager: portage-2.3.0
app-emulation/rkt/Manifest | 3 -
app-emulation/rkt/rkt-9999.ebuild | 192 --------------------------------------
2 files changed, 195 deletions(-)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index fb61fbf..f7d88e9 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,11 +1,8 @@
-DIST kvmtool-3c8aec9e2b5066412390559629dabeb7816ee8f2.tar.gz 241486 SHA256 a3e65e5331e8bb20b112ac2dcc252fbcc9b9a83ef20292874ed4682bc2d87dcc SHA512 21a9ec313a9f46d6ebc4b7badfcc731350f5e58781892f33d11b907e085b84e6eebcaf2f22d101ed46a570e87d6530468be0bf6c258f195a38d594407cb2471b WHIRLPOOL f998afe674ef1bb8050d944646d35854fb75c3ef00eb0379ba3a52ea80bc9590e793fd333cb45803f683a4d0ed21c61d6d1cc7b74d01eb9503a6d960eef9e143
DIST kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz 243930 SHA256 89f4cc94364298aa5b9c39c660ebd82a4beb5351cc838d418e7e21afefb5c1f0 SHA512 70aea2324273603b77aa64c95efd36df35c74514fa820013bfee386332289119cc148aed2983a8c6fd9ddfa5bc3db39c5aa0ee32bfc2077787338a47f2954f2f WHIRLPOOL ee47d7e38509eddf90ef0cf7d0cd3761c623e55a1003e8810e645759dc9615e33fbae22ab5576627f9f86eee8b4ca96c4bdf692b7ab073f1f222734bc378477a
DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5
DIST rkt-1.10.1.tar.gz 2754338 SHA256 4a3c5db16be05292d6174d9d2c1d1f4c5c967e37686390927b8ca0d2bf570eb5 SHA512 6f6291251b31a3b4e1a4652554ded3f5c43b975aac861bbad483360347ea23f3f517b5fdd97fca2b26ab9543530df6318207e67c3d0776eff04cd4808489d2ec WHIRLPOOL 8f2946a2e5478bc2d1a0d5274fd22a7a16fbc81ed462d0cc49e7aa47e43c6c4324c317c3913199b55000d09b955aa56df0090427f99825f4cf376240cdd285c7
DIST rkt-1.11.0.tar.gz 2767797 SHA256 cd75f1648ae6736da731c14a2102646ee90467efd6d2a32b518fd36b8c9806c5 SHA512 dfc604b50037a5a272e0fe0f438c35e1a010489ee19a426cbad7184a3910a214f4bf659b533f323a2ab742deffe7bba10daee52691ff32e5a35f453b2b0c4bb0 WHIRLPOOL 4caa6be6f5f8c5aeb67c762a2643ffc8579d45f49b5c5e4cb5c16ce5e38cc4db35e9dee7d5df20ef80bf75d64e3cccbcc1521c4ddab18441652d2d383a17368b
DIST rkt-pxe-1068.0.0.img 261402717 SHA256 f7ae0b0c676a2aaaaf2872fd5d0d692744d6af9185a334354c3c673865e54a1a SHA512 7b4c4ac28eb59f9fa8616b205fb440e5535814b80d89a365fd695252e7f9ed5f0d5288d1e571bc71b261f4f68ca052d327eee7eabe9b562e7003c767c96e052a WHIRLPOOL 1afa35b65a4beb2d5c12a8da4db7aff6b3b3123aa83366b0a51caac911938957f992082f7af35c1592c2da44503cc5131547a7961771c2c4064e79b3074f8a6b
DIST rkt-pxe-1097.0.0.img 240454650 SHA256 aa205919c4c733cf4cb7220f038f272f4b3ce6a185e5195945fdc625f506f737 SHA512 7a3cc62b5ae13ed8813effdea6125472982c81fa1fb35df0ac13a233ee352e67167a38cd82a802c0e8da50b2cf4455771441ad5ada186b3e3f2cdade4b1903c7 WHIRLPOOL 067eba2c1ebc546df506a249c0c49ab2ce556869f9455b6b1706e2285111293a4beed0172036df372e7b2e02449d815fb76c361219badcebe3240686be7bcc4c
-DIST rkt-pxe-794.1.0.img 185121072 SHA256 d513e27d2412d8fdaa2456786703346f10c24a62480d2036ca5c31b3d5a0df16 SHA512 f36324e9736bb0c533706c45d4146bed2efcb3ee2cb842c3624a62399835808c0df2aef56495a12b30f67c47fd84e93e34b10c57e4aa6d0450402d5e21c6f88c WHIRLPOOL 099851022b11aa29d004bbcef316a7cceeb5efa43f8069cdf1858888e7550f938fd9f9ec53eb63c313b5c1b93b0569f578a50fc5bae28b4d30c451a2ffd2adba
DIST rkt-sdjournal-64e931a183d12a30e3e25deefbeab0753dca99bf.patch 11264 SHA256 789ac19d4edb2b8b06c0dd3f1ad9092c583fcc039b7d0c3e491d03cdcf83b4d2 SHA512 2f4e918b1be3812b781813ebbfffb258c1b3441298825cfaba768453dd55ffe39f91fc2b230b6c3ec2c8003543e61d72cf161a56dfff85ba51f2e3fcd2c8f1e3 WHIRLPOOL dde9c83be96278eb5b7fb5bab2c0db4e3a741eede3164fe9bcd27905834ea31554e3739614a34a55a8cb1d9e89804a4db9a004d1758d618211bc5b50865286de
-DIST systemd-222.tar.gz 4015599 SHA256 b49f51f9855127987adc98aad3b6d608e4e53eaa029b629f2ea2089ce0234f34 SHA512 83f0acf0ca90c89c902c268af6eef4b61380a30380013cbe89c929357959f51682cd3961a6a4f772abc09d5ca09404ae290edf2c3253fab1b20dc2b5b3ecde47 WHIRLPOOL dd0151034de374b072e70448e7a9ff47693df0190e8a2a11488593400d3d7e53e0a91d86037d027c750584089e6c68e58c437647d608a72f8826f091e3253879
DIST systemd-229.tar.gz 4319173 SHA256 b51b0a48d1beb388d95bd6a98d62be05490335d4bb388aefecdcb576e91e0741 SHA512 d692c0c9fc82f2fce64a5ec1caa4a0f8cf9edaeb1bdaaa1c462669db8f78b3dd6b33c87ef926ff21823582d0460f7b63aa3755792f9ae2cd6fb813ba08a35c39 WHIRLPOOL aa44f7161d80cc680226f19755579ba72c52cfe7bd671aefb09c414981f3a5a5c852f07d3449ac6f96d4ca91120cfb1464225d995b1637f1e2c108baf3c4a392
diff --git a/app-emulation/rkt/rkt-9999.ebuild b/app-emulation/rkt/rkt-9999.ebuild
deleted file mode 100644
index 89add2f..0000000
--- a/app-emulation/rkt/rkt-9999.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-AUTOTOOLS_IN_SOURCE_BUILD=yes
-
-inherit git-r3 autotools-utils flag-o-matic systemd toolchain-funcs
-
-KEYWORDS=""
-
-EGIT_REPO_URI="https://github.com/coreos/rkt.git"
-PXE_VERSION="794.1.0"
-PXE_SYSTEMD_VERSION="v222"
-KVM_LINUX_VERSION="4.3.1"
-KVMTOOL_VERSION="3c8aec9e2b5066412390559629dabeb7816ee8f2"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-[[ ${PV} == *9999* ]] || SRC_URI+=" https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+="
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm? (
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
- mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
- ${PXE_URI} -> ${PXE_FILE}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="A CLI for running app containers, and an implementation of the App
-Container Spec."
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
-REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
-
-DEPEND=">=dev-lang/go-1.4.1
- app-arch/cpio
- app-crypt/trousers
- sys-fs/squashfs-tools
- dev-perl/Capture-Tiny"
-
-RDEPEND="!app-emulation/rocket
- rkt_stage1_host? ( systemd? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- ) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-src_unpack() {
- [[ ${PV} == *9999* ]] && git-r3_src_unpack
- local x
- for x in ${A}; do
- case ${x} in
- *.img|linux-*) continue ;;
- kvmtool-*)
- mkdir kvmtool || die
- pushd kvmtool >/dev/null || die
- unpack ${x}
- popd >/dev/null || die
- ;;
- *)
- unpack ${x}
- esac
- done
-}
-
-src_prepare() {
- # disable git fetch of systemd
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
- # disable git fetch of kvmtool
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
- # disable fetch of kernel sources
- sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
- -i stage1/usr_from_kvm/kernel.mk || die
-
- if use rkt_stage1_host; then
- # Make systemdUnitsPath consistent with host
- sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
- -i stage1/init/init.go || die
- fi
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local flavors myeconfargs=(
- --with-stage1-default-images-directory="/usr/share/rkt"
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
- )
-
- # enable flavors (first is default)
- use rkt_stage1_host && flavors+=",host"
- use rkt_stage1_src && flavors+=",src"
- use rkt_stage1_coreos && flavors+=",coreos"
- use rkt_stage1_fly && flavors+=",fly"
- use rkt_stage1_kvm && flavors+=",kvm"
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
- if use rkt_stage1_src; then
- myeconfargs+=(
- --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
- --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
- )
- fi
-
- if use rkt_stage1_coreos || use rkt_stage1_kvm; then
- myeconfargs+=(
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
- )
- fi
-
- # Go's 6l linker does not support PIE, disable so cgo binaries
- # which use 6l+gcc for linking can be built correctly.
- if gcc-specs-pie; then
- append-ldflags -nopie
- fi
-
- export CC=$(tc-getCC)
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export BUILDDIR
-
- autotools-utils_src_configure
-}
-
-src_compile() {
- local arch=${ARCH}
- case ${arch} in
- amd64) arch=x86_64;;
- esac
- ARCH=${arch} autotools-utils_src_compile
-}
-
-src_install() {
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
- use actool && dobin "${S}/${BUILDDIR}/bin/actool"
-
- dobin "${S}/${BUILDDIR}/bin/rkt"
-
- insinto /usr/share/rkt
- doins "${S}/${BUILDDIR}/bin/"*.aci
-
- # create symlink for default stage1 image path
- if use rkt_stage1_host; then
- dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_src; then
- dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_coreos; then
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_fly; then
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm; then
- dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
- fi
-
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
-}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-07-30 7:13 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-07-30 7:13 UTC (permalink / raw
To: gentoo-commits
commit: ba40d8809e09ff169e07be496cd78b4f6349b73e
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 30 07:13:19 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 07:13:19 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba40d880
app-emulation/rkt: remove old versions
Package-Manager: portage-2.3.0
app-emulation/rkt/Manifest | 3 -
app-emulation/rkt/rkt-1.6.0.ebuild | 194 -------------------------------------
app-emulation/rkt/rkt-1.7.0.ebuild | 190 ------------------------------------
3 files changed, 387 deletions(-)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 44cb1e1..fb61fbf 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -3,9 +3,6 @@ DIST kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz 243930 SHA256 89f4c
DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5
DIST rkt-1.10.1.tar.gz 2754338 SHA256 4a3c5db16be05292d6174d9d2c1d1f4c5c967e37686390927b8ca0d2bf570eb5 SHA512 6f6291251b31a3b4e1a4652554ded3f5c43b975aac861bbad483360347ea23f3f517b5fdd97fca2b26ab9543530df6318207e67c3d0776eff04cd4808489d2ec WHIRLPOOL 8f2946a2e5478bc2d1a0d5274fd22a7a16fbc81ed462d0cc49e7aa47e43c6c4324c317c3913199b55000d09b955aa56df0090427f99825f4cf376240cdd285c7
DIST rkt-1.11.0.tar.gz 2767797 SHA256 cd75f1648ae6736da731c14a2102646ee90467efd6d2a32b518fd36b8c9806c5 SHA512 dfc604b50037a5a272e0fe0f438c35e1a010489ee19a426cbad7184a3910a214f4bf659b533f323a2ab742deffe7bba10daee52691ff32e5a35f453b2b0c4bb0 WHIRLPOOL 4caa6be6f5f8c5aeb67c762a2643ffc8579d45f49b5c5e4cb5c16ce5e38cc4db35e9dee7d5df20ef80bf75d64e3cccbcc1521c4ddab18441652d2d383a17368b
-DIST rkt-1.6.0.tar.gz 2641952 SHA256 767f2ed21d6dbf00a7a264d0dbd84a2733d56dbe97bab90b3d99af47d33c9b5c SHA512 54a0c564173047adbb5b81abb73600fee4fbdb5bf27521d4de269156e6ae9d3df23796cf57fdff551fc0846332c88fb96cca0b757beca512e1b760c5653a462b WHIRLPOOL 84fac58e268651f76ee1509ef99b3554bdc14e5cb66a75613f60fca5fe3d177305dc252a7b868e3d183222f40882e618aa964760c9025829f42b8bce7e1391b1
-DIST rkt-1.7.0.tar.gz 2835144 SHA256 80806ea63fe741cc569c991f98721289cd439c2239c3a8b1966ced2e467ed182 SHA512 677fe65921610070a8d3dfd96adda361390511e1f30f5fbd0335ddf0f743056f9dcddf089f3d42db0060f1d85830647b8b5633439ed5d8e589c64daf0490e6f6 WHIRLPOOL aeea6323a4e962c4f64f6c03b0685b85021916840d61d441da554f3091b1c68efd6bf3e4b06fb7536ae421bd9f2bc13747856e3139da5361cc1e8f35809a6231
-DIST rkt-pxe-1032.0.0.img 233166273 SHA256 2e34b18dc6d8a7f89ab6dd64ed405299171067f4d9f0bb2cf18b15be9985bed2 SHA512 e6dd5b2329894c54d1d5c6b0d700a6e5aab5001c754a043de461bf0335c946690933d7b93897f681c82c99778fdbddd75efe777535dfc7dda1f11834d0a6e8d2 WHIRLPOOL df5af345546339bb245884900cda7f246de58d6d0fc21c8f8f9dfb16bf7375263f455526d9c3d2330b4693b7c015029987edc9c5843201ca6b51482a2b3fdef7
DIST rkt-pxe-1068.0.0.img 261402717 SHA256 f7ae0b0c676a2aaaaf2872fd5d0d692744d6af9185a334354c3c673865e54a1a SHA512 7b4c4ac28eb59f9fa8616b205fb440e5535814b80d89a365fd695252e7f9ed5f0d5288d1e571bc71b261f4f68ca052d327eee7eabe9b562e7003c767c96e052a WHIRLPOOL 1afa35b65a4beb2d5c12a8da4db7aff6b3b3123aa83366b0a51caac911938957f992082f7af35c1592c2da44503cc5131547a7961771c2c4064e79b3074f8a6b
DIST rkt-pxe-1097.0.0.img 240454650 SHA256 aa205919c4c733cf4cb7220f038f272f4b3ce6a185e5195945fdc625f506f737 SHA512 7a3cc62b5ae13ed8813effdea6125472982c81fa1fb35df0ac13a233ee352e67167a38cd82a802c0e8da50b2cf4455771441ad5ada186b3e3f2cdade4b1903c7 WHIRLPOOL 067eba2c1ebc546df506a249c0c49ab2ce556869f9455b6b1706e2285111293a4beed0172036df372e7b2e02449d815fb76c361219badcebe3240686be7bcc4c
DIST rkt-pxe-794.1.0.img 185121072 SHA256 d513e27d2412d8fdaa2456786703346f10c24a62480d2036ca5c31b3d5a0df16 SHA512 f36324e9736bb0c533706c45d4146bed2efcb3ee2cb842c3624a62399835808c0df2aef56495a12b30f67c47fd84e93e34b10c57e4aa6d0450402d5e21c6f88c WHIRLPOOL 099851022b11aa29d004bbcef316a7cceeb5efa43f8069cdf1858888e7550f938fd9f9ec53eb63c313b5c1b93b0569f578a50fc5bae28b4d30c451a2ffd2adba
diff --git a/app-emulation/rkt/rkt-1.6.0.ebuild b/app-emulation/rkt/rkt-1.6.0.ebuild
deleted file mode 100644
index 2d3a5ad..0000000
--- a/app-emulation/rkt/rkt-1.6.0.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-AUTOTOOLS_IN_SOURCE_BUILD=yes
-
-inherit autotools-utils flag-o-matic systemd toolchain-funcs
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="1032.0.0"
-PXE_SYSTEMD_VERSION="v229"
-KVM_LINUX_VERSION="4.3.1"
-KVMTOOL_VERSION="d62653e177597251c24494a6dda60acd6d846671"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm? (
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
- mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
- ${PXE_URI} -> ${PXE_FILE}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="A CLI for running app containers, and an implementation of the App
-Container Spec."
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
-REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
-
-DEPEND=">=dev-lang/go-1.5
- app-arch/cpio
- app-crypt/trousers
- sys-fs/squashfs-tools
- dev-perl/Capture-Tiny
- rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )"
-
-RDEPEND="!app-emulation/rocket
- rkt_stage1_host? ( systemd? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- ) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-src_unpack() {
- local x
- for x in ${A}; do
- case ${x} in
- *.img|linux-*) continue ;;
- kvmtool-*)
- mkdir kvmtool || die
- pushd kvmtool >/dev/null || die
- unpack ${x}
- popd >/dev/null || die
- ;;
- *)
- unpack ${x}
- esac
- done
-}
-
-src_prepare() {
- # disable git fetch of systemd
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
- # disable git fetch of kvmtool
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
- # disable fetch of kernel sources
- sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
- -i stage1/usr_from_kvm/kernel.mk || die
-
- if use rkt_stage1_host; then
- # Make systemdUnitsPath consistent with host
- sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
- -i stage1/init/init.go || die
- fi
-
- # https://github.com/coreos/rkt/pull/2633
- sed -e 's:^\(func \)\(TestCalculateDataDir\):\1_\2:' \
- -i rkt/rkt_test.go || die
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local flavors myeconfargs=(
- --with-stage1-default-images-directory="/usr/share/rkt"
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
- )
-
- # enable flavors (first is default)
- use rkt_stage1_host && flavors+=",host"
- use rkt_stage1_src && flavors+=",src"
- use rkt_stage1_coreos && flavors+=",coreos"
- use rkt_stage1_fly && flavors+=",fly"
- use rkt_stage1_kvm && flavors+=",kvm"
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
- if use rkt_stage1_src; then
- myeconfargs+=(
- --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
- --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
- )
- fi
-
- if use rkt_stage1_coreos || use rkt_stage1_kvm; then
- myeconfargs+=(
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
- )
- fi
-
- # Go's 6l linker does not support PIE, disable so cgo binaries
- # which use 6l+gcc for linking can be built correctly.
- if gcc-specs-pie; then
- append-ldflags -nopie
- fi
-
- export CC=$(tc-getCC)
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export BUILDDIR
-
- autotools-utils_src_configure
-}
-
-src_compile() {
- local arch=${ARCH}
- case ${arch} in
- amd64) arch=x86_64;;
- esac
- ARCH=${arch} autotools-utils_src_compile
-}
-
-src_install() {
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
- use actool && dobin "${S}/${BUILDDIR}/bin/actool"
-
- dobin "${S}/${BUILDDIR}/bin/rkt"
-
- insinto /usr/share/rkt
- doins "${S}/${BUILDDIR}/bin/"*.aci
-
- # create symlink for default stage1 image path
- if use rkt_stage1_host; then
- dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_src; then
- dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_coreos; then
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_fly; then
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm; then
- dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
- fi
-
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
-}
diff --git a/app-emulation/rkt/rkt-1.7.0.ebuild b/app-emulation/rkt/rkt-1.7.0.ebuild
deleted file mode 100644
index cc77360..0000000
--- a/app-emulation/rkt/rkt-1.7.0.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-AUTOTOOLS_IN_SOURCE_BUILD=yes
-
-inherit autotools-utils flag-o-matic systemd toolchain-funcs
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="1032.0.0"
-PXE_SYSTEMD_VERSION="v229"
-KVM_LINUX_VERSION="4.3.1"
-KVMTOOL_VERSION="d62653e177597251c24494a6dda60acd6d846671"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm? (
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
- mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
- ${PXE_URI} -> ${PXE_FILE}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="A CLI for running app containers, and an implementation of the App
-Container Spec."
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
-REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
-
-DEPEND=">=dev-lang/go-1.5
- app-arch/cpio
- app-crypt/trousers
- sys-fs/squashfs-tools
- dev-perl/Capture-Tiny
- rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )"
-
-RDEPEND="!app-emulation/rocket
- rkt_stage1_host? ( systemd? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- ) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-src_unpack() {
- local x
- for x in ${A}; do
- case ${x} in
- *.img|linux-*) continue ;;
- kvmtool-*)
- mkdir kvmtool || die
- pushd kvmtool >/dev/null || die
- unpack ${x}
- popd >/dev/null || die
- ;;
- *)
- unpack ${x}
- esac
- done
-}
-
-src_prepare() {
- # disable git fetch of systemd
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
- # disable git fetch of kvmtool
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
- # disable fetch of kernel sources
- sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
- -i stage1/usr_from_kvm/kernel.mk || die
-
- if use rkt_stage1_host; then
- # Make systemdUnitsPath consistent with host
- sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
- -i stage1/init/init.go || die
- fi
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local flavors myeconfargs=(
- --with-stage1-default-images-directory="/usr/share/rkt"
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
- )
-
- # enable flavors (first is default)
- use rkt_stage1_host && flavors+=",host"
- use rkt_stage1_src && flavors+=",src"
- use rkt_stage1_coreos && flavors+=",coreos"
- use rkt_stage1_fly && flavors+=",fly"
- use rkt_stage1_kvm && flavors+=",kvm"
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
- if use rkt_stage1_src; then
- myeconfargs+=(
- --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
- --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
- )
- fi
-
- if use rkt_stage1_coreos || use rkt_stage1_kvm; then
- myeconfargs+=(
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
- )
- fi
-
- # Go's 6l linker does not support PIE, disable so cgo binaries
- # which use 6l+gcc for linking can be built correctly.
- if gcc-specs-pie; then
- append-ldflags -nopie
- fi
-
- export CC=$(tc-getCC)
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export BUILDDIR
-
- autotools-utils_src_configure
-}
-
-src_compile() {
- local arch=${ARCH}
- case ${arch} in
- amd64) arch=x86_64;;
- esac
- ARCH=${arch} autotools-utils_src_compile
-}
-
-src_install() {
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
- use actool && dobin "${S}/${BUILDDIR}/bin/actool"
-
- dobin "${S}/${BUILDDIR}/bin/rkt"
-
- insinto /usr/share/rkt
- doins "${S}/${BUILDDIR}/bin/"*.aci
-
- # create symlink for default stage1 image path
- if use rkt_stage1_host; then
- dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_src; then
- dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_coreos; then
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_fly; then
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm; then
- dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
- fi
-
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
-}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-07-30 7:11 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-07-30 7:11 UTC (permalink / raw
To: gentoo-commits
commit: d63472e2c7b4f0a9646e761d5d83da3b140eae4f
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 30 07:08:36 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 07:09:23 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d63472e2
app-emulation/rkt: version bump to 1.11.0
Package-Manager: portage-2.3.0
app-emulation/rkt/Manifest | 2 +
app-emulation/rkt/rkt-1.11.0.ebuild | 191 ++++++++++++++++++++++++++++++++++++
2 files changed, 193 insertions(+)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 0760bee..44cb1e1 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -2,10 +2,12 @@ DIST kvmtool-3c8aec9e2b5066412390559629dabeb7816ee8f2.tar.gz 241486 SHA256 a3e65
DIST kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz 243930 SHA256 89f4cc94364298aa5b9c39c660ebd82a4beb5351cc838d418e7e21afefb5c1f0 SHA512 70aea2324273603b77aa64c95efd36df35c74514fa820013bfee386332289119cc148aed2983a8c6fd9ddfa5bc3db39c5aa0ee32bfc2077787338a47f2954f2f WHIRLPOOL ee47d7e38509eddf90ef0cf7d0cd3761c623e55a1003e8810e645759dc9615e33fbae22ab5576627f9f86eee8b4ca96c4bdf692b7ab073f1f222734bc378477a
DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5
DIST rkt-1.10.1.tar.gz 2754338 SHA256 4a3c5db16be05292d6174d9d2c1d1f4c5c967e37686390927b8ca0d2bf570eb5 SHA512 6f6291251b31a3b4e1a4652554ded3f5c43b975aac861bbad483360347ea23f3f517b5fdd97fca2b26ab9543530df6318207e67c3d0776eff04cd4808489d2ec WHIRLPOOL 8f2946a2e5478bc2d1a0d5274fd22a7a16fbc81ed462d0cc49e7aa47e43c6c4324c317c3913199b55000d09b955aa56df0090427f99825f4cf376240cdd285c7
+DIST rkt-1.11.0.tar.gz 2767797 SHA256 cd75f1648ae6736da731c14a2102646ee90467efd6d2a32b518fd36b8c9806c5 SHA512 dfc604b50037a5a272e0fe0f438c35e1a010489ee19a426cbad7184a3910a214f4bf659b533f323a2ab742deffe7bba10daee52691ff32e5a35f453b2b0c4bb0 WHIRLPOOL 4caa6be6f5f8c5aeb67c762a2643ffc8579d45f49b5c5e4cb5c16ce5e38cc4db35e9dee7d5df20ef80bf75d64e3cccbcc1521c4ddab18441652d2d383a17368b
DIST rkt-1.6.0.tar.gz 2641952 SHA256 767f2ed21d6dbf00a7a264d0dbd84a2733d56dbe97bab90b3d99af47d33c9b5c SHA512 54a0c564173047adbb5b81abb73600fee4fbdb5bf27521d4de269156e6ae9d3df23796cf57fdff551fc0846332c88fb96cca0b757beca512e1b760c5653a462b WHIRLPOOL 84fac58e268651f76ee1509ef99b3554bdc14e5cb66a75613f60fca5fe3d177305dc252a7b868e3d183222f40882e618aa964760c9025829f42b8bce7e1391b1
DIST rkt-1.7.0.tar.gz 2835144 SHA256 80806ea63fe741cc569c991f98721289cd439c2239c3a8b1966ced2e467ed182 SHA512 677fe65921610070a8d3dfd96adda361390511e1f30f5fbd0335ddf0f743056f9dcddf089f3d42db0060f1d85830647b8b5633439ed5d8e589c64daf0490e6f6 WHIRLPOOL aeea6323a4e962c4f64f6c03b0685b85021916840d61d441da554f3091b1c68efd6bf3e4b06fb7536ae421bd9f2bc13747856e3139da5361cc1e8f35809a6231
DIST rkt-pxe-1032.0.0.img 233166273 SHA256 2e34b18dc6d8a7f89ab6dd64ed405299171067f4d9f0bb2cf18b15be9985bed2 SHA512 e6dd5b2329894c54d1d5c6b0d700a6e5aab5001c754a043de461bf0335c946690933d7b93897f681c82c99778fdbddd75efe777535dfc7dda1f11834d0a6e8d2 WHIRLPOOL df5af345546339bb245884900cda7f246de58d6d0fc21c8f8f9dfb16bf7375263f455526d9c3d2330b4693b7c015029987edc9c5843201ca6b51482a2b3fdef7
DIST rkt-pxe-1068.0.0.img 261402717 SHA256 f7ae0b0c676a2aaaaf2872fd5d0d692744d6af9185a334354c3c673865e54a1a SHA512 7b4c4ac28eb59f9fa8616b205fb440e5535814b80d89a365fd695252e7f9ed5f0d5288d1e571bc71b261f4f68ca052d327eee7eabe9b562e7003c767c96e052a WHIRLPOOL 1afa35b65a4beb2d5c12a8da4db7aff6b3b3123aa83366b0a51caac911938957f992082f7af35c1592c2da44503cc5131547a7961771c2c4064e79b3074f8a6b
+DIST rkt-pxe-1097.0.0.img 240454650 SHA256 aa205919c4c733cf4cb7220f038f272f4b3ce6a185e5195945fdc625f506f737 SHA512 7a3cc62b5ae13ed8813effdea6125472982c81fa1fb35df0ac13a233ee352e67167a38cd82a802c0e8da50b2cf4455771441ad5ada186b3e3f2cdade4b1903c7 WHIRLPOOL 067eba2c1ebc546df506a249c0c49ab2ce556869f9455b6b1706e2285111293a4beed0172036df372e7b2e02449d815fb76c361219badcebe3240686be7bcc4c
DIST rkt-pxe-794.1.0.img 185121072 SHA256 d513e27d2412d8fdaa2456786703346f10c24a62480d2036ca5c31b3d5a0df16 SHA512 f36324e9736bb0c533706c45d4146bed2efcb3ee2cb842c3624a62399835808c0df2aef56495a12b30f67c47fd84e93e34b10c57e4aa6d0450402d5e21c6f88c WHIRLPOOL 099851022b11aa29d004bbcef316a7cceeb5efa43f8069cdf1858888e7550f938fd9f9ec53eb63c313b5c1b93b0569f578a50fc5bae28b4d30c451a2ffd2adba
DIST rkt-sdjournal-64e931a183d12a30e3e25deefbeab0753dca99bf.patch 11264 SHA256 789ac19d4edb2b8b06c0dd3f1ad9092c583fcc039b7d0c3e491d03cdcf83b4d2 SHA512 2f4e918b1be3812b781813ebbfffb258c1b3441298825cfaba768453dd55ffe39f91fc2b230b6c3ec2c8003543e61d72cf161a56dfff85ba51f2e3fcd2c8f1e3 WHIRLPOOL dde9c83be96278eb5b7fb5bab2c0db4e3a741eede3164fe9bcd27905834ea31554e3739614a34a55a8cb1d9e89804a4db9a004d1758d618211bc5b50865286de
DIST systemd-222.tar.gz 4015599 SHA256 b49f51f9855127987adc98aad3b6d608e4e53eaa029b629f2ea2089ce0234f34 SHA512 83f0acf0ca90c89c902c268af6eef4b61380a30380013cbe89c929357959f51682cd3961a6a4f772abc09d5ca09404ae290edf2c3253fab1b20dc2b5b3ecde47 WHIRLPOOL dd0151034de374b072e70448e7a9ff47693df0190e8a2a11488593400d3d7e53e0a91d86037d027c750584089e6c68e58c437647d608a72f8826f091e3253879
diff --git a/app-emulation/rkt/rkt-1.11.0.ebuild b/app-emulation/rkt/rkt-1.11.0.ebuild
new file mode 100644
index 0000000..c9e4a2f
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.11.0.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools flag-o-matic systemd toolchain-funcs
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="1097.0.0"
+PXE_SYSTEMD_VERSION="v229"
+KVM_LINUX_VERSION="4.3.1"
+KVMTOOL_VERSION="d62653e177597251c24494a6dda60acd6d846671"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
+
+DESCRIPTION="A CLI for running app containers, and an implementation of the App
+Container Spec."
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
+
+DEPEND=">=dev-lang/go-1.5
+ app-arch/cpio
+ app-crypt/trousers
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny
+ rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )"
+
+RDEPEND="!app-emulation/rocket
+ rkt_stage1_host? ( systemd? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ ) )"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+src_unpack() {
+ local x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
+src_prepare() {
+ eapply_user
+
+ # disable git fetch of systemd
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ local flavors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+ )
+
+ use systemd || myeconfargs+=( --enable-sdjournal=no )
+
+ # enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
+ use rkt_stage1_src && flavors+=",src"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ use rkt_stage1_kvm && flavors+=",kvm"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_src; then
+ myeconfargs+=(
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+ )
+ fi
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} emake
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/tools/actool"
+
+ dobin "${S}/${BUILDDIR}/target/bin/rkt"
+
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/target/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_src; then
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm; then
+ dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
+
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-07-19 6:46 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-07-19 6:46 UTC (permalink / raw
To: gentoo-commits
commit: 7f42a1d1ae93a726fd78192a5fc2fc1ce5e26e8e
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 06:40:21 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 06:45:55 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f42a1d1
app-emulation/rkt: version bump to 1.10.1 (fixes bug 585208)
This includes the patch from https://github.com/coreos/rkt/pull/2868
and --enable-sdjournal=no is passed to econf when USE=systemd is
not enabled.
Package-Manager: portage-2.3.0
app-emulation/rkt/Manifest | 3 +
app-emulation/rkt/rkt-1.10.1.ebuild | 193 ++++++++++++++++++++++++++++++++++++
2 files changed, 196 insertions(+)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 7b2ca6d..0760bee 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,9 +1,12 @@
DIST kvmtool-3c8aec9e2b5066412390559629dabeb7816ee8f2.tar.gz 241486 SHA256 a3e65e5331e8bb20b112ac2dcc252fbcc9b9a83ef20292874ed4682bc2d87dcc SHA512 21a9ec313a9f46d6ebc4b7badfcc731350f5e58781892f33d11b907e085b84e6eebcaf2f22d101ed46a570e87d6530468be0bf6c258f195a38d594407cb2471b WHIRLPOOL f998afe674ef1bb8050d944646d35854fb75c3ef00eb0379ba3a52ea80bc9590e793fd333cb45803f683a4d0ed21c61d6d1cc7b74d01eb9503a6d960eef9e143
DIST kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz 243930 SHA256 89f4cc94364298aa5b9c39c660ebd82a4beb5351cc838d418e7e21afefb5c1f0 SHA512 70aea2324273603b77aa64c95efd36df35c74514fa820013bfee386332289119cc148aed2983a8c6fd9ddfa5bc3db39c5aa0ee32bfc2077787338a47f2954f2f WHIRLPOOL ee47d7e38509eddf90ef0cf7d0cd3761c623e55a1003e8810e645759dc9615e33fbae22ab5576627f9f86eee8b4ca96c4bdf692b7ab073f1f222734bc378477a
DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5
+DIST rkt-1.10.1.tar.gz 2754338 SHA256 4a3c5db16be05292d6174d9d2c1d1f4c5c967e37686390927b8ca0d2bf570eb5 SHA512 6f6291251b31a3b4e1a4652554ded3f5c43b975aac861bbad483360347ea23f3f517b5fdd97fca2b26ab9543530df6318207e67c3d0776eff04cd4808489d2ec WHIRLPOOL 8f2946a2e5478bc2d1a0d5274fd22a7a16fbc81ed462d0cc49e7aa47e43c6c4324c317c3913199b55000d09b955aa56df0090427f99825f4cf376240cdd285c7
DIST rkt-1.6.0.tar.gz 2641952 SHA256 767f2ed21d6dbf00a7a264d0dbd84a2733d56dbe97bab90b3d99af47d33c9b5c SHA512 54a0c564173047adbb5b81abb73600fee4fbdb5bf27521d4de269156e6ae9d3df23796cf57fdff551fc0846332c88fb96cca0b757beca512e1b760c5653a462b WHIRLPOOL 84fac58e268651f76ee1509ef99b3554bdc14e5cb66a75613f60fca5fe3d177305dc252a7b868e3d183222f40882e618aa964760c9025829f42b8bce7e1391b1
DIST rkt-1.7.0.tar.gz 2835144 SHA256 80806ea63fe741cc569c991f98721289cd439c2239c3a8b1966ced2e467ed182 SHA512 677fe65921610070a8d3dfd96adda361390511e1f30f5fbd0335ddf0f743056f9dcddf089f3d42db0060f1d85830647b8b5633439ed5d8e589c64daf0490e6f6 WHIRLPOOL aeea6323a4e962c4f64f6c03b0685b85021916840d61d441da554f3091b1c68efd6bf3e4b06fb7536ae421bd9f2bc13747856e3139da5361cc1e8f35809a6231
DIST rkt-pxe-1032.0.0.img 233166273 SHA256 2e34b18dc6d8a7f89ab6dd64ed405299171067f4d9f0bb2cf18b15be9985bed2 SHA512 e6dd5b2329894c54d1d5c6b0d700a6e5aab5001c754a043de461bf0335c946690933d7b93897f681c82c99778fdbddd75efe777535dfc7dda1f11834d0a6e8d2 WHIRLPOOL df5af345546339bb245884900cda7f246de58d6d0fc21c8f8f9dfb16bf7375263f455526d9c3d2330b4693b7c015029987edc9c5843201ca6b51482a2b3fdef7
+DIST rkt-pxe-1068.0.0.img 261402717 SHA256 f7ae0b0c676a2aaaaf2872fd5d0d692744d6af9185a334354c3c673865e54a1a SHA512 7b4c4ac28eb59f9fa8616b205fb440e5535814b80d89a365fd695252e7f9ed5f0d5288d1e571bc71b261f4f68ca052d327eee7eabe9b562e7003c767c96e052a WHIRLPOOL 1afa35b65a4beb2d5c12a8da4db7aff6b3b3123aa83366b0a51caac911938957f992082f7af35c1592c2da44503cc5131547a7961771c2c4064e79b3074f8a6b
DIST rkt-pxe-794.1.0.img 185121072 SHA256 d513e27d2412d8fdaa2456786703346f10c24a62480d2036ca5c31b3d5a0df16 SHA512 f36324e9736bb0c533706c45d4146bed2efcb3ee2cb842c3624a62399835808c0df2aef56495a12b30f67c47fd84e93e34b10c57e4aa6d0450402d5e21c6f88c WHIRLPOOL 099851022b11aa29d004bbcef316a7cceeb5efa43f8069cdf1858888e7550f938fd9f9ec53eb63c313b5c1b93b0569f578a50fc5bae28b4d30c451a2ffd2adba
+DIST rkt-sdjournal-64e931a183d12a30e3e25deefbeab0753dca99bf.patch 11264 SHA256 789ac19d4edb2b8b06c0dd3f1ad9092c583fcc039b7d0c3e491d03cdcf83b4d2 SHA512 2f4e918b1be3812b781813ebbfffb258c1b3441298825cfaba768453dd55ffe39f91fc2b230b6c3ec2c8003543e61d72cf161a56dfff85ba51f2e3fcd2c8f1e3 WHIRLPOOL dde9c83be96278eb5b7fb5bab2c0db4e3a741eede3164fe9bcd27905834ea31554e3739614a34a55a8cb1d9e89804a4db9a004d1758d618211bc5b50865286de
DIST systemd-222.tar.gz 4015599 SHA256 b49f51f9855127987adc98aad3b6d608e4e53eaa029b629f2ea2089ce0234f34 SHA512 83f0acf0ca90c89c902c268af6eef4b61380a30380013cbe89c929357959f51682cd3961a6a4f772abc09d5ca09404ae290edf2c3253fab1b20dc2b5b3ecde47 WHIRLPOOL dd0151034de374b072e70448e7a9ff47693df0190e8a2a11488593400d3d7e53e0a91d86037d027c750584089e6c68e58c437647d608a72f8826f091e3253879
DIST systemd-229.tar.gz 4319173 SHA256 b51b0a48d1beb388d95bd6a98d62be05490335d4bb388aefecdcb576e91e0741 SHA512 d692c0c9fc82f2fce64a5ec1caa4a0f8cf9edaeb1bdaaa1c462669db8f78b3dd6b33c87ef926ff21823582d0460f7b63aa3755792f9ae2cd6fb813ba08a35c39 WHIRLPOOL aa44f7161d80cc680226f19755579ba72c52cfe7bd671aefb09c414981f3a5a5c852f07d3449ac6f96d4ca91120cfb1464225d995b1637f1e2c108baf3c4a392
diff --git a/app-emulation/rkt/rkt-1.10.1.ebuild b/app-emulation/rkt/rkt-1.10.1.ebuild
new file mode 100644
index 0000000..8a4dfda
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.10.1.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools flag-o-matic systemd toolchain-funcs
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="1068.0.0"
+PXE_SYSTEMD_VERSION="v229"
+KVM_LINUX_VERSION="4.3.1"
+KVMTOOL_VERSION="d62653e177597251c24494a6dda60acd6d846671"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+https://github.com/coreos/rkt/commit/64e931a183d12a30e3e25deefbeab0753dca99bf.patch -> rkt-sdjournal-64e931a183d12a30e3e25deefbeab0753dca99bf.patch
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
+
+DESCRIPTION="A CLI for running app containers, and an implementation of the App
+Container Spec."
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
+
+DEPEND=">=dev-lang/go-1.5
+ app-arch/cpio
+ app-crypt/trousers
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny
+ rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )"
+
+RDEPEND="!app-emulation/rocket
+ rkt_stage1_host? ( systemd? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ ) )"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+src_unpack() {
+ local x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
+src_prepare() {
+ eapply "${DISTDIR}/rkt-sdjournal-64e931a183d12a30e3e25deefbeab0753dca99bf.patch"
+ eapply_user
+
+ # disable git fetch of systemd
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ local flavors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+ )
+
+ use systemd || myeconfargs+=( --enable-sdjournal=no )
+
+ # enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
+ use rkt_stage1_src && flavors+=",src"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ use rkt_stage1_kvm && flavors+=",kvm"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_src; then
+ myeconfargs+=(
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+ )
+ fi
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} emake
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/tools/actool"
+
+ dobin "${S}/${BUILDDIR}/target/bin/rkt"
+
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/target/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_src; then
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm; then
+ dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
+
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-06-06 8:24 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-06-06 8:24 UTC (permalink / raw
To: gentoo-commits
commit: 3e61f870c71356390b501d17c018f155cc9cccec
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 6 08:23:47 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Jun 6 08:23:47 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e61f870
app-emulation/rkt: remove old version 1.4.0
Package-Manager: portage-2.3.0_rc1
app-emulation/rkt/Manifest | 3 -
app-emulation/rkt/rkt-1.4.0.ebuild | 189 -------------------------------------
2 files changed, 192 deletions(-)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index c3f23a6..7b2ca6d 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,12 +1,9 @@
DIST kvmtool-3c8aec9e2b5066412390559629dabeb7816ee8f2.tar.gz 241486 SHA256 a3e65e5331e8bb20b112ac2dcc252fbcc9b9a83ef20292874ed4682bc2d87dcc SHA512 21a9ec313a9f46d6ebc4b7badfcc731350f5e58781892f33d11b907e085b84e6eebcaf2f22d101ed46a570e87d6530468be0bf6c258f195a38d594407cb2471b WHIRLPOOL f998afe674ef1bb8050d944646d35854fb75c3ef00eb0379ba3a52ea80bc9590e793fd333cb45803f683a4d0ed21c61d6d1cc7b74d01eb9503a6d960eef9e143
DIST kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz 243930 SHA256 89f4cc94364298aa5b9c39c660ebd82a4beb5351cc838d418e7e21afefb5c1f0 SHA512 70aea2324273603b77aa64c95efd36df35c74514fa820013bfee386332289119cc148aed2983a8c6fd9ddfa5bc3db39c5aa0ee32bfc2077787338a47f2954f2f WHIRLPOOL ee47d7e38509eddf90ef0cf7d0cd3761c623e55a1003e8810e645759dc9615e33fbae22ab5576627f9f86eee8b4ca96c4bdf692b7ab073f1f222734bc378477a
DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5
-DIST rkt-1.4.0.tar.gz 2506968 SHA256 1ce98ff74aef3dc2c43025f2b458e6dbfeb6c7f756a313f4ecc2827fc84ce031 SHA512 3e97ddf0d2c1c892d1df6a82e4db7bdf1520a474e4aa56020a4c3c8b6bb81d1a2378baff0d002436ceed4dfb8a2a0faa502b12d5924df435e7d869f2c30901f9 WHIRLPOOL 2f45f2b50de046903c37318b725e2c6ff269c968eaa08370b8d74e63d42c00dece5354ca9e7c94fdd8180841f89116d760eee92886ed34ec65d2e3383d08c86f
DIST rkt-1.6.0.tar.gz 2641952 SHA256 767f2ed21d6dbf00a7a264d0dbd84a2733d56dbe97bab90b3d99af47d33c9b5c SHA512 54a0c564173047adbb5b81abb73600fee4fbdb5bf27521d4de269156e6ae9d3df23796cf57fdff551fc0846332c88fb96cca0b757beca512e1b760c5653a462b WHIRLPOOL 84fac58e268651f76ee1509ef99b3554bdc14e5cb66a75613f60fca5fe3d177305dc252a7b868e3d183222f40882e618aa964760c9025829f42b8bce7e1391b1
DIST rkt-1.7.0.tar.gz 2835144 SHA256 80806ea63fe741cc569c991f98721289cd439c2239c3a8b1966ced2e467ed182 SHA512 677fe65921610070a8d3dfd96adda361390511e1f30f5fbd0335ddf0f743056f9dcddf089f3d42db0060f1d85830647b8b5633439ed5d8e589c64daf0490e6f6 WHIRLPOOL aeea6323a4e962c4f64f6c03b0685b85021916840d61d441da554f3091b1c68efd6bf3e4b06fb7536ae421bd9f2bc13747856e3139da5361cc1e8f35809a6231
DIST rkt-pxe-1032.0.0.img 233166273 SHA256 2e34b18dc6d8a7f89ab6dd64ed405299171067f4d9f0bb2cf18b15be9985bed2 SHA512 e6dd5b2329894c54d1d5c6b0d700a6e5aab5001c754a043de461bf0335c946690933d7b93897f681c82c99778fdbddd75efe777535dfc7dda1f11834d0a6e8d2 WHIRLPOOL df5af345546339bb245884900cda7f246de58d6d0fc21c8f8f9dfb16bf7375263f455526d9c3d2330b4693b7c015029987edc9c5843201ca6b51482a2b3fdef7
DIST rkt-pxe-794.1.0.img 185121072 SHA256 d513e27d2412d8fdaa2456786703346f10c24a62480d2036ca5c31b3d5a0df16 SHA512 f36324e9736bb0c533706c45d4146bed2efcb3ee2cb842c3624a62399835808c0df2aef56495a12b30f67c47fd84e93e34b10c57e4aa6d0450402d5e21c6f88c WHIRLPOOL 099851022b11aa29d004bbcef316a7cceeb5efa43f8069cdf1858888e7550f938fd9f9ec53eb63c313b5c1b93b0569f578a50fc5bae28b4d30c451a2ffd2adba
-DIST rkt-pxe-991.0.0.img 226115454 SHA256 33697d3d7c7458bbb160a5eb889ced34b001c35e22e10c86235042eb57ae51ed SHA512 1b785d8454381d47eb53062433bda5645650420b58821ac00119a92032ba4d669c974871eafe7e414ad349952974cfdf6812f85af69d3286b7bfe2fc2d04c52f WHIRLPOOL d9f103a0c5a78c8a4403a17e805872703cd5d4fe34e5395c381216538a15f58a7678c7d744ac8aa90ed4dd850a614ca52487cb50e5687c812488a3cdbdff2de0
DIST systemd-222.tar.gz 4015599 SHA256 b49f51f9855127987adc98aad3b6d608e4e53eaa029b629f2ea2089ce0234f34 SHA512 83f0acf0ca90c89c902c268af6eef4b61380a30380013cbe89c929357959f51682cd3961a6a4f772abc09d5ca09404ae290edf2c3253fab1b20dc2b5b3ecde47 WHIRLPOOL dd0151034de374b072e70448e7a9ff47693df0190e8a2a11488593400d3d7e53e0a91d86037d027c750584089e6c68e58c437647d608a72f8826f091e3253879
-DIST systemd-225.tar.gz 3878442 SHA256 b2f576bb3688e9315f2f49b98e141ac6f964567370e98ebd8fd7332a0a6f9701 SHA512 35b3946509c7b01660da4370d3c51ff0e6a537dadd9dbb0a039c4f7ed552fd4e02ebac6eb8a788f61f1e3ba99444238d959051dd004c174b027729a80368ac19 WHIRLPOOL 47cd3b5690dafdf3c0ef6a9767e947666b1853541f8aefd17eb5c07eee1477daf32f3b249b04327b1c56d8ec430745725383750b97755bb6cf594d354a7ffdf8
DIST systemd-229.tar.gz 4319173 SHA256 b51b0a48d1beb388d95bd6a98d62be05490335d4bb388aefecdcb576e91e0741 SHA512 d692c0c9fc82f2fce64a5ec1caa4a0f8cf9edaeb1bdaaa1c462669db8f78b3dd6b33c87ef926ff21823582d0460f7b63aa3755792f9ae2cd6fb813ba08a35c39 WHIRLPOOL aa44f7161d80cc680226f19755579ba72c52cfe7bd671aefb09c414981f3a5a5c852f07d3449ac6f96d4ca91120cfb1464225d995b1637f1e2c108baf3c4a392
diff --git a/app-emulation/rkt/rkt-1.4.0.ebuild b/app-emulation/rkt/rkt-1.4.0.ebuild
deleted file mode 100644
index 8074ce1..0000000
--- a/app-emulation/rkt/rkt-1.4.0.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-AUTOTOOLS_IN_SOURCE_BUILD=yes
-
-inherit autotools-utils flag-o-matic systemd toolchain-funcs
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="991.0.0"
-PXE_SYSTEMD_VERSION="v225"
-KVM_LINUX_VERSION="4.3.1"
-KVMTOOL_VERSION="3c8aec9e2b5066412390559629dabeb7816ee8f2"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm? (
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
- mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
- ${PXE_URI} -> ${PXE_FILE}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="A CLI for running app containers, and an implementation of the App
-Container Spec."
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
-REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
-
-DEPEND=">=dev-lang/go-1.5
- app-arch/cpio
- app-crypt/trousers
- sys-fs/squashfs-tools
- dev-perl/Capture-Tiny"
-
-RDEPEND="!app-emulation/rocket
- rkt_stage1_host? ( systemd? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- ) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-src_unpack() {
- local x
- for x in ${A}; do
- case ${x} in
- *.img|linux-*) continue ;;
- kvmtool-*)
- mkdir kvmtool || die
- pushd kvmtool >/dev/null || die
- unpack ${x}
- popd >/dev/null || die
- ;;
- *)
- unpack ${x}
- esac
- done
-}
-
-src_prepare() {
- # disable git fetch of systemd
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
- # disable git fetch of kvmtool
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
- # disable fetch of kernel sources
- sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
- -i stage1/usr_from_kvm/kernel.mk || die
-
- if use rkt_stage1_host; then
- # Make systemdUnitsPath consistent with host
- sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
- -i stage1/init/init.go || die
- fi
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local flavors myeconfargs=(
- --with-stage1-default-images-directory="/usr/share/rkt"
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
- )
-
- # enable flavors (first is default)
- use rkt_stage1_host && flavors+=",host"
- use rkt_stage1_src && flavors+=",src"
- use rkt_stage1_coreos && flavors+=",coreos"
- use rkt_stage1_fly && flavors+=",fly"
- use rkt_stage1_kvm && flavors+=",kvm"
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
- if use rkt_stage1_src; then
- myeconfargs+=(
- --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
- --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
- )
- fi
-
- if use rkt_stage1_coreos || use rkt_stage1_kvm; then
- myeconfargs+=(
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
- )
- fi
-
- # Go's 6l linker does not support PIE, disable so cgo binaries
- # which use 6l+gcc for linking can be built correctly.
- if gcc-specs-pie; then
- append-ldflags -nopie
- fi
-
- export CC=$(tc-getCC)
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export BUILDDIR
-
- autotools-utils_src_configure
-}
-
-src_compile() {
- local arch=${ARCH}
- case ${arch} in
- amd64) arch=x86_64;;
- esac
- ARCH=${arch} autotools-utils_src_compile
-}
-
-src_install() {
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
- use actool && dobin "${S}/${BUILDDIR}/bin/actool"
-
- dobin "${S}/${BUILDDIR}/bin/rkt"
-
- insinto /usr/share/rkt
- doins "${S}/${BUILDDIR}/bin/"*.aci
-
- # create symlink for default stage1 image path
- if use rkt_stage1_host; then
- dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_src; then
- dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_coreos; then
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_fly; then
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm; then
- dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
- fi
-
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
-}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-06-06 8:22 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-06-06 8:22 UTC (permalink / raw
To: gentoo-commits
commit: 0a302a7aaa2b4ad9ac05164576b79fd15ea57b20
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 6 08:21:58 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Jun 6 08:22:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a302a7a
app-emulation/rkt: version bump to 1.7.0
Package-Manager: portage-2.3.0_rc1
app-emulation/rkt/Manifest | 1 +
app-emulation/rkt/rkt-1.7.0.ebuild | 190 +++++++++++++++++++++++++++++++++++++
2 files changed, 191 insertions(+)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 156ba1e..c3f23a6 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -3,6 +3,7 @@ DIST kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz 243930 SHA256 89f4c
DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5
DIST rkt-1.4.0.tar.gz 2506968 SHA256 1ce98ff74aef3dc2c43025f2b458e6dbfeb6c7f756a313f4ecc2827fc84ce031 SHA512 3e97ddf0d2c1c892d1df6a82e4db7bdf1520a474e4aa56020a4c3c8b6bb81d1a2378baff0d002436ceed4dfb8a2a0faa502b12d5924df435e7d869f2c30901f9 WHIRLPOOL 2f45f2b50de046903c37318b725e2c6ff269c968eaa08370b8d74e63d42c00dece5354ca9e7c94fdd8180841f89116d760eee92886ed34ec65d2e3383d08c86f
DIST rkt-1.6.0.tar.gz 2641952 SHA256 767f2ed21d6dbf00a7a264d0dbd84a2733d56dbe97bab90b3d99af47d33c9b5c SHA512 54a0c564173047adbb5b81abb73600fee4fbdb5bf27521d4de269156e6ae9d3df23796cf57fdff551fc0846332c88fb96cca0b757beca512e1b760c5653a462b WHIRLPOOL 84fac58e268651f76ee1509ef99b3554bdc14e5cb66a75613f60fca5fe3d177305dc252a7b868e3d183222f40882e618aa964760c9025829f42b8bce7e1391b1
+DIST rkt-1.7.0.tar.gz 2835144 SHA256 80806ea63fe741cc569c991f98721289cd439c2239c3a8b1966ced2e467ed182 SHA512 677fe65921610070a8d3dfd96adda361390511e1f30f5fbd0335ddf0f743056f9dcddf089f3d42db0060f1d85830647b8b5633439ed5d8e589c64daf0490e6f6 WHIRLPOOL aeea6323a4e962c4f64f6c03b0685b85021916840d61d441da554f3091b1c68efd6bf3e4b06fb7536ae421bd9f2bc13747856e3139da5361cc1e8f35809a6231
DIST rkt-pxe-1032.0.0.img 233166273 SHA256 2e34b18dc6d8a7f89ab6dd64ed405299171067f4d9f0bb2cf18b15be9985bed2 SHA512 e6dd5b2329894c54d1d5c6b0d700a6e5aab5001c754a043de461bf0335c946690933d7b93897f681c82c99778fdbddd75efe777535dfc7dda1f11834d0a6e8d2 WHIRLPOOL df5af345546339bb245884900cda7f246de58d6d0fc21c8f8f9dfb16bf7375263f455526d9c3d2330b4693b7c015029987edc9c5843201ca6b51482a2b3fdef7
DIST rkt-pxe-794.1.0.img 185121072 SHA256 d513e27d2412d8fdaa2456786703346f10c24a62480d2036ca5c31b3d5a0df16 SHA512 f36324e9736bb0c533706c45d4146bed2efcb3ee2cb842c3624a62399835808c0df2aef56495a12b30f67c47fd84e93e34b10c57e4aa6d0450402d5e21c6f88c WHIRLPOOL 099851022b11aa29d004bbcef316a7cceeb5efa43f8069cdf1858888e7550f938fd9f9ec53eb63c313b5c1b93b0569f578a50fc5bae28b4d30c451a2ffd2adba
DIST rkt-pxe-991.0.0.img 226115454 SHA256 33697d3d7c7458bbb160a5eb889ced34b001c35e22e10c86235042eb57ae51ed SHA512 1b785d8454381d47eb53062433bda5645650420b58821ac00119a92032ba4d669c974871eafe7e414ad349952974cfdf6812f85af69d3286b7bfe2fc2d04c52f WHIRLPOOL d9f103a0c5a78c8a4403a17e805872703cd5d4fe34e5395c381216538a15f58a7678c7d744ac8aa90ed4dd850a614ca52487cb50e5687c812488a3cdbdff2de0
diff --git a/app-emulation/rkt/rkt-1.7.0.ebuild b/app-emulation/rkt/rkt-1.7.0.ebuild
new file mode 100644
index 0000000..cc77360
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.7.0.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+AUTOTOOLS_IN_SOURCE_BUILD=yes
+
+inherit autotools-utils flag-o-matic systemd toolchain-funcs
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="1032.0.0"
+PXE_SYSTEMD_VERSION="v229"
+KVM_LINUX_VERSION="4.3.1"
+KVMTOOL_VERSION="d62653e177597251c24494a6dda60acd6d846671"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
+
+DESCRIPTION="A CLI for running app containers, and an implementation of the App
+Container Spec."
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
+
+DEPEND=">=dev-lang/go-1.5
+ app-arch/cpio
+ app-crypt/trousers
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny
+ rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )"
+
+RDEPEND="!app-emulation/rocket
+ rkt_stage1_host? ( systemd? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ ) )"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+src_unpack() {
+ local x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
+src_prepare() {
+ # disable git fetch of systemd
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local flavors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+ )
+
+ # enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
+ use rkt_stage1_src && flavors+=",src"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ use rkt_stage1_kvm && flavors+=",kvm"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_src; then
+ myeconfargs+=(
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+ )
+ fi
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ autotools-utils_src_configure
+}
+
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} autotools-utils_src_compile
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/bin/actool"
+
+ dobin "${S}/${BUILDDIR}/bin/rkt"
+
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_src; then
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm; then
+ dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
+
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-05-22 20:18 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-05-22 20:18 UTC (permalink / raw
To: gentoo-commits
commit: f85d376292549e94392e51edff61433f0ec43ccd
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun May 22 20:16:13 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun May 22 20:18:05 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f85d3762
app-emulation/rkt: remove old versions
Package-Manager: portage-2.3.0_rc1
app-emulation/rkt/Manifest | 2 -
app-emulation/rkt/rkt-1.1.0.ebuild | 189 -------------------------------------
app-emulation/rkt/rkt-1.3.0.ebuild | 189 -------------------------------------
3 files changed, 380 deletions(-)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 252d48f..156ba1e 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,8 +1,6 @@
DIST kvmtool-3c8aec9e2b5066412390559629dabeb7816ee8f2.tar.gz 241486 SHA256 a3e65e5331e8bb20b112ac2dcc252fbcc9b9a83ef20292874ed4682bc2d87dcc SHA512 21a9ec313a9f46d6ebc4b7badfcc731350f5e58781892f33d11b907e085b84e6eebcaf2f22d101ed46a570e87d6530468be0bf6c258f195a38d594407cb2471b WHIRLPOOL f998afe674ef1bb8050d944646d35854fb75c3ef00eb0379ba3a52ea80bc9590e793fd333cb45803f683a4d0ed21c61d6d1cc7b74d01eb9503a6d960eef9e143
DIST kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz 243930 SHA256 89f4cc94364298aa5b9c39c660ebd82a4beb5351cc838d418e7e21afefb5c1f0 SHA512 70aea2324273603b77aa64c95efd36df35c74514fa820013bfee386332289119cc148aed2983a8c6fd9ddfa5bc3db39c5aa0ee32bfc2077787338a47f2954f2f WHIRLPOOL ee47d7e38509eddf90ef0cf7d0cd3761c623e55a1003e8810e645759dc9615e33fbae22ab5576627f9f86eee8b4ca96c4bdf692b7ab073f1f222734bc378477a
DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5
-DIST rkt-1.1.0.tar.gz 2426666 SHA256 df93dffc1deff470a5bebaa2610a07df8f48e69f660c81de0a31de13d7f7bfa5 SHA512 ef444843f411cd2d1fcd02f606bf5d0971eb314d708d1d54d07af9e3d69e1d74a7812456fd7cc46372ca6e42cfd5ac6af6b7b67e22890396f58d8982c0af1373 WHIRLPOOL 0579f5efd28d473ab4a0874d7218268a2a1143118b9f3e39670a683f05c7fb3b1b952aee75f0c923d76bc457c4d933c3c9b329f99960fa0a95cde2573225288b
-DIST rkt-1.3.0.tar.gz 2450145 SHA256 0468c5b1079da8df65db9ebd0b712f64509acf6c8d6b34b780b6e787271d9b30 SHA512 f00500ddc1af85bc5ebe23b1a28e517e5f321f8c4c2434b71931b326cca5d4a10af4d54648a22634dc5039c7ca305539736b88a63b16fed1be897af0e22b64aa WHIRLPOOL 3f6c7ee950637ee16373ea43a23b1189c097d771748624be8a5794c734b0cb44b1b249cd424bcddf0ef5ec1761e08b8d53de71b5375ae35a9aa2ca7c3d4b91d6
DIST rkt-1.4.0.tar.gz 2506968 SHA256 1ce98ff74aef3dc2c43025f2b458e6dbfeb6c7f756a313f4ecc2827fc84ce031 SHA512 3e97ddf0d2c1c892d1df6a82e4db7bdf1520a474e4aa56020a4c3c8b6bb81d1a2378baff0d002436ceed4dfb8a2a0faa502b12d5924df435e7d869f2c30901f9 WHIRLPOOL 2f45f2b50de046903c37318b725e2c6ff269c968eaa08370b8d74e63d42c00dece5354ca9e7c94fdd8180841f89116d760eee92886ed34ec65d2e3383d08c86f
DIST rkt-1.6.0.tar.gz 2641952 SHA256 767f2ed21d6dbf00a7a264d0dbd84a2733d56dbe97bab90b3d99af47d33c9b5c SHA512 54a0c564173047adbb5b81abb73600fee4fbdb5bf27521d4de269156e6ae9d3df23796cf57fdff551fc0846332c88fb96cca0b757beca512e1b760c5653a462b WHIRLPOOL 84fac58e268651f76ee1509ef99b3554bdc14e5cb66a75613f60fca5fe3d177305dc252a7b868e3d183222f40882e618aa964760c9025829f42b8bce7e1391b1
DIST rkt-pxe-1032.0.0.img 233166273 SHA256 2e34b18dc6d8a7f89ab6dd64ed405299171067f4d9f0bb2cf18b15be9985bed2 SHA512 e6dd5b2329894c54d1d5c6b0d700a6e5aab5001c754a043de461bf0335c946690933d7b93897f681c82c99778fdbddd75efe777535dfc7dda1f11834d0a6e8d2 WHIRLPOOL df5af345546339bb245884900cda7f246de58d6d0fc21c8f8f9dfb16bf7375263f455526d9c3d2330b4693b7c015029987edc9c5843201ca6b51482a2b3fdef7
diff --git a/app-emulation/rkt/rkt-1.1.0.ebuild b/app-emulation/rkt/rkt-1.1.0.ebuild
deleted file mode 100644
index 5e3a55d..0000000
--- a/app-emulation/rkt/rkt-1.1.0.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-AUTOTOOLS_IN_SOURCE_BUILD=yes
-
-inherit autotools-utils flag-o-matic systemd toolchain-funcs
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="794.1.0"
-PXE_SYSTEMD_VERSION="v222"
-KVM_LINUX_VERSION="4.3.1"
-KVMTOOL_VERSION="3c8aec9e2b5066412390559629dabeb7816ee8f2"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm? (
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
- mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
- ${PXE_URI} -> ${PXE_FILE}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="A CLI for running app containers, and an implementation of the App
-Container Spec."
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
-REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
-
-DEPEND=">=dev-lang/go-1.4.1
- app-arch/cpio
- app-crypt/trousers
- sys-fs/squashfs-tools
- dev-perl/Capture-Tiny"
-
-RDEPEND="!app-emulation/rocket
- rkt_stage1_host? ( systemd? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- ) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-src_unpack() {
- local x
- for x in ${A}; do
- case ${x} in
- *.img|linux-*) continue ;;
- kvmtool-*)
- mkdir kvmtool || die
- pushd kvmtool >/dev/null || die
- unpack ${x}
- popd >/dev/null || die
- ;;
- *)
- unpack ${x}
- esac
- done
-}
-
-src_prepare() {
- # disable git fetch of systemd
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
- # disable git fetch of kvmtool
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
- # disable fetch of kernel sources
- sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
- -i stage1/usr_from_kvm/kernel.mk || die
-
- if use rkt_stage1_host; then
- # Make systemdUnitsPath consistent with host
- sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
- -i stage1/init/init.go || die
- fi
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local flavors myeconfargs=(
- --with-stage1-default-images-directory="/usr/share/rkt"
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
- )
-
- # enable flavors (first is default)
- use rkt_stage1_host && flavors+=",host"
- use rkt_stage1_src && flavors+=",src"
- use rkt_stage1_coreos && flavors+=",coreos"
- use rkt_stage1_fly && flavors+=",fly"
- use rkt_stage1_kvm && flavors+=",kvm"
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
- if use rkt_stage1_src; then
- myeconfargs+=(
- --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
- --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
- )
- fi
-
- if use rkt_stage1_coreos || use rkt_stage1_kvm; then
- myeconfargs+=(
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
- )
- fi
-
- # Go's 6l linker does not support PIE, disable so cgo binaries
- # which use 6l+gcc for linking can be built correctly.
- if gcc-specs-pie; then
- append-ldflags -nopie
- fi
-
- export CC=$(tc-getCC)
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export BUILDDIR
-
- autotools-utils_src_configure
-}
-
-src_compile() {
- local arch=${ARCH}
- case ${arch} in
- amd64) arch=x86_64;;
- esac
- ARCH=${arch} autotools-utils_src_compile
-}
-
-src_install() {
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
- use actool && dobin "${S}/${BUILDDIR}/bin/actool"
-
- dobin "${S}/${BUILDDIR}/bin/rkt"
-
- insinto /usr/share/rkt
- doins "${S}/${BUILDDIR}/bin/"*.aci
-
- # create symlink for default stage1 image path
- if use rkt_stage1_host; then
- dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_src; then
- dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_coreos; then
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_fly; then
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm; then
- dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
- fi
-
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
-}
diff --git a/app-emulation/rkt/rkt-1.3.0.ebuild b/app-emulation/rkt/rkt-1.3.0.ebuild
deleted file mode 100644
index 8074ce1..0000000
--- a/app-emulation/rkt/rkt-1.3.0.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-AUTOTOOLS_IN_SOURCE_BUILD=yes
-
-inherit autotools-utils flag-o-matic systemd toolchain-funcs
-
-KEYWORDS="~amd64"
-
-PXE_VERSION="991.0.0"
-PXE_SYSTEMD_VERSION="v225"
-KVM_LINUX_VERSION="4.3.1"
-KVMTOOL_VERSION="3c8aec9e2b5066412390559629dabeb7816ee8f2"
-PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
-PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm? (
- https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
- mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
- ${PXE_URI} -> ${PXE_FILE}
-)
-rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
-
-DESCRIPTION="A CLI for running app containers, and an implementation of the App
-Container Spec."
-HOMEPAGE="https://github.com/coreos/rkt"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
-REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
-
-DEPEND=">=dev-lang/go-1.5
- app-arch/cpio
- app-crypt/trousers
- sys-fs/squashfs-tools
- dev-perl/Capture-Tiny"
-
-RDEPEND="!app-emulation/rocket
- rkt_stage1_host? ( systemd? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- ) )"
-
-BUILDDIR="build-${P}"
-STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
-
-src_unpack() {
- local x
- for x in ${A}; do
- case ${x} in
- *.img|linux-*) continue ;;
- kvmtool-*)
- mkdir kvmtool || die
- pushd kvmtool >/dev/null || die
- unpack ${x}
- popd >/dev/null || die
- ;;
- *)
- unpack ${x}
- esac
- done
-}
-
-src_prepare() {
- # disable git fetch of systemd
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
-'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
-'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
-'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
-
- # disable git fetch of kvmtool
- sed -e 's~^include makelib/git.mk$~'\
-'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
-'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
-'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
-'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
-'else\n'\
-'\t\0\n'\
-'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
-
- # disable fetch of kernel sources
- sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
- -i stage1/usr_from_kvm/kernel.mk || die
-
- if use rkt_stage1_host; then
- # Make systemdUnitsPath consistent with host
- sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
- -i stage1/init/init.go || die
- fi
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local flavors myeconfargs=(
- --with-stage1-default-images-directory="/usr/share/rkt"
- --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
- )
-
- # enable flavors (first is default)
- use rkt_stage1_host && flavors+=",host"
- use rkt_stage1_src && flavors+=",src"
- use rkt_stage1_coreos && flavors+=",coreos"
- use rkt_stage1_fly && flavors+=",fly"
- use rkt_stage1_kvm && flavors+=",kvm"
- myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
-
- if use rkt_stage1_src; then
- myeconfargs+=(
- --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
- --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
- )
- fi
-
- if use rkt_stage1_coreos || use rkt_stage1_kvm; then
- myeconfargs+=(
- --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
- --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
- )
- fi
-
- # Go's 6l linker does not support PIE, disable so cgo binaries
- # which use 6l+gcc for linking can be built correctly.
- if gcc-specs-pie; then
- append-ldflags -nopie
- fi
-
- export CC=$(tc-getCC)
- export CGO_ENABLED=1
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export BUILDDIR
-
- autotools-utils_src_configure
-}
-
-src_compile() {
- local arch=${ARCH}
- case ${arch} in
- amd64) arch=x86_64;;
- esac
- ARCH=${arch} autotools-utils_src_compile
-}
-
-src_install() {
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
- use actool && dobin "${S}/${BUILDDIR}/bin/actool"
-
- dobin "${S}/${BUILDDIR}/bin/rkt"
-
- insinto /usr/share/rkt
- doins "${S}/${BUILDDIR}/bin/"*.aci
-
- # create symlink for default stage1 image path
- if use rkt_stage1_host; then
- dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_src; then
- dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_coreos; then
- dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_fly; then
- dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
- elif use rkt_stage1_kvm; then
- dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
- fi
-
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
- systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
-}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-05-16 2:51 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-05-16 2:51 UTC (permalink / raw
To: gentoo-commits
commit: a7cdca7be9a0ef6d6f3ee9dcf255a952fdb9b60d
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 02:50:40 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon May 16 02:50:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7cdca7b
app-emulation/rkt: version bump to 1.6.0
Package-Manager: portage-2.3.0_rc1
app-emulation/rkt/Manifest | 4 +
app-emulation/rkt/rkt-1.6.0.ebuild | 194 +++++++++++++++++++++++++++++++++++++
2 files changed, 198 insertions(+)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index c9d72b5..252d48f 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,9 +1,13 @@
DIST kvmtool-3c8aec9e2b5066412390559629dabeb7816ee8f2.tar.gz 241486 SHA256 a3e65e5331e8bb20b112ac2dcc252fbcc9b9a83ef20292874ed4682bc2d87dcc SHA512 21a9ec313a9f46d6ebc4b7badfcc731350f5e58781892f33d11b907e085b84e6eebcaf2f22d101ed46a570e87d6530468be0bf6c258f195a38d594407cb2471b WHIRLPOOL f998afe674ef1bb8050d944646d35854fb75c3ef00eb0379ba3a52ea80bc9590e793fd333cb45803f683a4d0ed21c61d6d1cc7b74d01eb9503a6d960eef9e143
+DIST kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz 243930 SHA256 89f4cc94364298aa5b9c39c660ebd82a4beb5351cc838d418e7e21afefb5c1f0 SHA512 70aea2324273603b77aa64c95efd36df35c74514fa820013bfee386332289119cc148aed2983a8c6fd9ddfa5bc3db39c5aa0ee32bfc2077787338a47f2954f2f WHIRLPOOL ee47d7e38509eddf90ef0cf7d0cd3761c623e55a1003e8810e645759dc9615e33fbae22ab5576627f9f86eee8b4ca96c4bdf692b7ab073f1f222734bc378477a
DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5
DIST rkt-1.1.0.tar.gz 2426666 SHA256 df93dffc1deff470a5bebaa2610a07df8f48e69f660c81de0a31de13d7f7bfa5 SHA512 ef444843f411cd2d1fcd02f606bf5d0971eb314d708d1d54d07af9e3d69e1d74a7812456fd7cc46372ca6e42cfd5ac6af6b7b67e22890396f58d8982c0af1373 WHIRLPOOL 0579f5efd28d473ab4a0874d7218268a2a1143118b9f3e39670a683f05c7fb3b1b952aee75f0c923d76bc457c4d933c3c9b329f99960fa0a95cde2573225288b
DIST rkt-1.3.0.tar.gz 2450145 SHA256 0468c5b1079da8df65db9ebd0b712f64509acf6c8d6b34b780b6e787271d9b30 SHA512 f00500ddc1af85bc5ebe23b1a28e517e5f321f8c4c2434b71931b326cca5d4a10af4d54648a22634dc5039c7ca305539736b88a63b16fed1be897af0e22b64aa WHIRLPOOL 3f6c7ee950637ee16373ea43a23b1189c097d771748624be8a5794c734b0cb44b1b249cd424bcddf0ef5ec1761e08b8d53de71b5375ae35a9aa2ca7c3d4b91d6
DIST rkt-1.4.0.tar.gz 2506968 SHA256 1ce98ff74aef3dc2c43025f2b458e6dbfeb6c7f756a313f4ecc2827fc84ce031 SHA512 3e97ddf0d2c1c892d1df6a82e4db7bdf1520a474e4aa56020a4c3c8b6bb81d1a2378baff0d002436ceed4dfb8a2a0faa502b12d5924df435e7d869f2c30901f9 WHIRLPOOL 2f45f2b50de046903c37318b725e2c6ff269c968eaa08370b8d74e63d42c00dece5354ca9e7c94fdd8180841f89116d760eee92886ed34ec65d2e3383d08c86f
+DIST rkt-1.6.0.tar.gz 2641952 SHA256 767f2ed21d6dbf00a7a264d0dbd84a2733d56dbe97bab90b3d99af47d33c9b5c SHA512 54a0c564173047adbb5b81abb73600fee4fbdb5bf27521d4de269156e6ae9d3df23796cf57fdff551fc0846332c88fb96cca0b757beca512e1b760c5653a462b WHIRLPOOL 84fac58e268651f76ee1509ef99b3554bdc14e5cb66a75613f60fca5fe3d177305dc252a7b868e3d183222f40882e618aa964760c9025829f42b8bce7e1391b1
+DIST rkt-pxe-1032.0.0.img 233166273 SHA256 2e34b18dc6d8a7f89ab6dd64ed405299171067f4d9f0bb2cf18b15be9985bed2 SHA512 e6dd5b2329894c54d1d5c6b0d700a6e5aab5001c754a043de461bf0335c946690933d7b93897f681c82c99778fdbddd75efe777535dfc7dda1f11834d0a6e8d2 WHIRLPOOL df5af345546339bb245884900cda7f246de58d6d0fc21c8f8f9dfb16bf7375263f455526d9c3d2330b4693b7c015029987edc9c5843201ca6b51482a2b3fdef7
DIST rkt-pxe-794.1.0.img 185121072 SHA256 d513e27d2412d8fdaa2456786703346f10c24a62480d2036ca5c31b3d5a0df16 SHA512 f36324e9736bb0c533706c45d4146bed2efcb3ee2cb842c3624a62399835808c0df2aef56495a12b30f67c47fd84e93e34b10c57e4aa6d0450402d5e21c6f88c WHIRLPOOL 099851022b11aa29d004bbcef316a7cceeb5efa43f8069cdf1858888e7550f938fd9f9ec53eb63c313b5c1b93b0569f578a50fc5bae28b4d30c451a2ffd2adba
DIST rkt-pxe-991.0.0.img 226115454 SHA256 33697d3d7c7458bbb160a5eb889ced34b001c35e22e10c86235042eb57ae51ed SHA512 1b785d8454381d47eb53062433bda5645650420b58821ac00119a92032ba4d669c974871eafe7e414ad349952974cfdf6812f85af69d3286b7bfe2fc2d04c52f WHIRLPOOL d9f103a0c5a78c8a4403a17e805872703cd5d4fe34e5395c381216538a15f58a7678c7d744ac8aa90ed4dd850a614ca52487cb50e5687c812488a3cdbdff2de0
DIST systemd-222.tar.gz 4015599 SHA256 b49f51f9855127987adc98aad3b6d608e4e53eaa029b629f2ea2089ce0234f34 SHA512 83f0acf0ca90c89c902c268af6eef4b61380a30380013cbe89c929357959f51682cd3961a6a4f772abc09d5ca09404ae290edf2c3253fab1b20dc2b5b3ecde47 WHIRLPOOL dd0151034de374b072e70448e7a9ff47693df0190e8a2a11488593400d3d7e53e0a91d86037d027c750584089e6c68e58c437647d608a72f8826f091e3253879
DIST systemd-225.tar.gz 3878442 SHA256 b2f576bb3688e9315f2f49b98e141ac6f964567370e98ebd8fd7332a0a6f9701 SHA512 35b3946509c7b01660da4370d3c51ff0e6a537dadd9dbb0a039c4f7ed552fd4e02ebac6eb8a788f61f1e3ba99444238d959051dd004c174b027729a80368ac19 WHIRLPOOL 47cd3b5690dafdf3c0ef6a9767e947666b1853541f8aefd17eb5c07eee1477daf32f3b249b04327b1c56d8ec430745725383750b97755bb6cf594d354a7ffdf8
+DIST systemd-229.tar.gz 4319173 SHA256 b51b0a48d1beb388d95bd6a98d62be05490335d4bb388aefecdcb576e91e0741 SHA512 d692c0c9fc82f2fce64a5ec1caa4a0f8cf9edaeb1bdaaa1c462669db8f78b3dd6b33c87ef926ff21823582d0460f7b63aa3755792f9ae2cd6fb813ba08a35c39 WHIRLPOOL aa44f7161d80cc680226f19755579ba72c52cfe7bd671aefb09c414981f3a5a5c852f07d3449ac6f96d4ca91120cfb1464225d995b1637f1e2c108baf3c4a392
diff --git a/app-emulation/rkt/rkt-1.6.0.ebuild b/app-emulation/rkt/rkt-1.6.0.ebuild
new file mode 100644
index 0000000..2d3a5ad
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.6.0.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+AUTOTOOLS_IN_SOURCE_BUILD=yes
+
+inherit autotools-utils flag-o-matic systemd toolchain-funcs
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="1032.0.0"
+PXE_SYSTEMD_VERSION="v229"
+KVM_LINUX_VERSION="4.3.1"
+KVMTOOL_VERSION="d62653e177597251c24494a6dda60acd6d846671"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
+
+DESCRIPTION="A CLI for running app containers, and an implementation of the App
+Container Spec."
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
+
+DEPEND=">=dev-lang/go-1.5
+ app-arch/cpio
+ app-crypt/trousers
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny
+ rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )"
+
+RDEPEND="!app-emulation/rocket
+ rkt_stage1_host? ( systemd? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ ) )"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+src_unpack() {
+ local x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
+src_prepare() {
+ # disable git fetch of systemd
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
+ # https://github.com/coreos/rkt/pull/2633
+ sed -e 's:^\(func \)\(TestCalculateDataDir\):\1_\2:' \
+ -i rkt/rkt_test.go || die
+
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local flavors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+ )
+
+ # enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
+ use rkt_stage1_src && flavors+=",src"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ use rkt_stage1_kvm && flavors+=",kvm"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_src; then
+ myeconfargs+=(
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+ )
+ fi
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ autotools-utils_src_configure
+}
+
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} autotools-utils_src_compile
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/bin/actool"
+
+ dobin "${S}/${BUILDDIR}/bin/rkt"
+
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_src; then
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm; then
+ dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
+
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-04-17 6:08 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-04-17 6:08 UTC (permalink / raw
To: gentoo-commits
commit: 362d0f1dc895c2d7103757248688a7398cd6a5e0
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 06:07:32 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 06:08:47 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=362d0f1d
app-emulation/rkt: version bump to 1.4.0
Package-Manager: portage-2.2.28
app-emulation/rkt/Manifest | 1 +
app-emulation/rkt/rkt-1.4.0.ebuild | 189 +++++++++++++++++++++++++++++++++++++
2 files changed, 190 insertions(+)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index ff6fa23..c9d72b5 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -2,6 +2,7 @@ DIST kvmtool-3c8aec9e2b5066412390559629dabeb7816ee8f2.tar.gz 241486 SHA256 a3e65
DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5
DIST rkt-1.1.0.tar.gz 2426666 SHA256 df93dffc1deff470a5bebaa2610a07df8f48e69f660c81de0a31de13d7f7bfa5 SHA512 ef444843f411cd2d1fcd02f606bf5d0971eb314d708d1d54d07af9e3d69e1d74a7812456fd7cc46372ca6e42cfd5ac6af6b7b67e22890396f58d8982c0af1373 WHIRLPOOL 0579f5efd28d473ab4a0874d7218268a2a1143118b9f3e39670a683f05c7fb3b1b952aee75f0c923d76bc457c4d933c3c9b329f99960fa0a95cde2573225288b
DIST rkt-1.3.0.tar.gz 2450145 SHA256 0468c5b1079da8df65db9ebd0b712f64509acf6c8d6b34b780b6e787271d9b30 SHA512 f00500ddc1af85bc5ebe23b1a28e517e5f321f8c4c2434b71931b326cca5d4a10af4d54648a22634dc5039c7ca305539736b88a63b16fed1be897af0e22b64aa WHIRLPOOL 3f6c7ee950637ee16373ea43a23b1189c097d771748624be8a5794c734b0cb44b1b249cd424bcddf0ef5ec1761e08b8d53de71b5375ae35a9aa2ca7c3d4b91d6
+DIST rkt-1.4.0.tar.gz 2506968 SHA256 1ce98ff74aef3dc2c43025f2b458e6dbfeb6c7f756a313f4ecc2827fc84ce031 SHA512 3e97ddf0d2c1c892d1df6a82e4db7bdf1520a474e4aa56020a4c3c8b6bb81d1a2378baff0d002436ceed4dfb8a2a0faa502b12d5924df435e7d869f2c30901f9 WHIRLPOOL 2f45f2b50de046903c37318b725e2c6ff269c968eaa08370b8d74e63d42c00dece5354ca9e7c94fdd8180841f89116d760eee92886ed34ec65d2e3383d08c86f
DIST rkt-pxe-794.1.0.img 185121072 SHA256 d513e27d2412d8fdaa2456786703346f10c24a62480d2036ca5c31b3d5a0df16 SHA512 f36324e9736bb0c533706c45d4146bed2efcb3ee2cb842c3624a62399835808c0df2aef56495a12b30f67c47fd84e93e34b10c57e4aa6d0450402d5e21c6f88c WHIRLPOOL 099851022b11aa29d004bbcef316a7cceeb5efa43f8069cdf1858888e7550f938fd9f9ec53eb63c313b5c1b93b0569f578a50fc5bae28b4d30c451a2ffd2adba
DIST rkt-pxe-991.0.0.img 226115454 SHA256 33697d3d7c7458bbb160a5eb889ced34b001c35e22e10c86235042eb57ae51ed SHA512 1b785d8454381d47eb53062433bda5645650420b58821ac00119a92032ba4d669c974871eafe7e414ad349952974cfdf6812f85af69d3286b7bfe2fc2d04c52f WHIRLPOOL d9f103a0c5a78c8a4403a17e805872703cd5d4fe34e5395c381216538a15f58a7678c7d744ac8aa90ed4dd850a614ca52487cb50e5687c812488a3cdbdff2de0
DIST systemd-222.tar.gz 4015599 SHA256 b49f51f9855127987adc98aad3b6d608e4e53eaa029b629f2ea2089ce0234f34 SHA512 83f0acf0ca90c89c902c268af6eef4b61380a30380013cbe89c929357959f51682cd3961a6a4f772abc09d5ca09404ae290edf2c3253fab1b20dc2b5b3ecde47 WHIRLPOOL dd0151034de374b072e70448e7a9ff47693df0190e8a2a11488593400d3d7e53e0a91d86037d027c750584089e6c68e58c437647d608a72f8826f091e3253879
diff --git a/app-emulation/rkt/rkt-1.4.0.ebuild b/app-emulation/rkt/rkt-1.4.0.ebuild
new file mode 100644
index 0000000..8074ce1
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.4.0.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+AUTOTOOLS_IN_SOURCE_BUILD=yes
+
+inherit autotools-utils flag-o-matic systemd toolchain-funcs
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="991.0.0"
+PXE_SYSTEMD_VERSION="v225"
+KVM_LINUX_VERSION="4.3.1"
+KVMTOOL_VERSION="3c8aec9e2b5066412390559629dabeb7816ee8f2"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
+
+DESCRIPTION="A CLI for running app containers, and an implementation of the App
+Container Spec."
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
+
+DEPEND=">=dev-lang/go-1.5
+ app-arch/cpio
+ app-crypt/trousers
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny"
+
+RDEPEND="!app-emulation/rocket
+ rkt_stage1_host? ( systemd? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ ) )"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+src_unpack() {
+ local x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
+src_prepare() {
+ # disable git fetch of systemd
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local flavors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+ )
+
+ # enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
+ use rkt_stage1_src && flavors+=",src"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ use rkt_stage1_kvm && flavors+=",kvm"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_src; then
+ myeconfargs+=(
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+ )
+ fi
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ autotools-utils_src_configure
+}
+
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} autotools-utils_src_compile
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/bin/actool"
+
+ dobin "${S}/${BUILDDIR}/bin/rkt"
+
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_src; then
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm; then
+ dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
+
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-04-06 20:19 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-04-06 20:19 UTC (permalink / raw
To: gentoo-commits
commit: 02a06b06b633725ef2baaf595d49d1158f6afbbe
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 6 20:17:33 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Apr 6 20:19:14 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02a06b06
app-emulation/rkt: version bump to 1.3.0
Package-Manager: portage-2.2.28
app-emulation/rkt/Manifest | 3 +
app-emulation/rkt/rkt-1.3.0.ebuild | 189 +++++++++++++++++++++++++++++++++++++
2 files changed, 192 insertions(+)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 7703448..e1072f1 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -3,6 +3,9 @@ DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9f
DIST rkt-0.8.0.tar.gz 1749853 SHA256 c9eb0126b8ff2f059d7cedaab17ca73dce256f342092c9bf4a7ae20661f2a5aa SHA512 4e2c27fb40cd3d27de062631105db3ea04ed902f48abb647a8e4de249478dd8a145ac0b77fd5b261cc680df1bcaa4067accb8a597def9b3963108e2c1f3d9d5a WHIRLPOOL f65ddd8908ec30cfefa06e60cd4d8cdb2099ab279b6350790eb3e436b88c792efe28cea53569f48d42f6eec682635a4212f16fea9d184e6baa97877a643e1106
DIST rkt-1.0.0.tar.gz 2414183 SHA256 7e30b03fa51a34db095484c4b111c526e49bead4e33232e1b239090503d7ac97 SHA512 f176532486b68ebc15aae17cfcf31e0f97ce3afc96bfed1c4f918da41350ef21c170712cb071a8720f39ee757b7b9ba1e66730d6e12acb9753446b929801c4ff WHIRLPOOL b2fc3082693b474584292a6ec943a685826364632dc346b18233bf9b9d2feaf14981f4a7fcbd9e79b98c2466b2f24be9b57f6345c89aeea5d075cdbeee26aba5
DIST rkt-1.1.0.tar.gz 2426666 SHA256 df93dffc1deff470a5bebaa2610a07df8f48e69f660c81de0a31de13d7f7bfa5 SHA512 ef444843f411cd2d1fcd02f606bf5d0971eb314d708d1d54d07af9e3d69e1d74a7812456fd7cc46372ca6e42cfd5ac6af6b7b67e22890396f58d8982c0af1373 WHIRLPOOL 0579f5efd28d473ab4a0874d7218268a2a1143118b9f3e39670a683f05c7fb3b1b952aee75f0c923d76bc457c4d933c3c9b329f99960fa0a95cde2573225288b
+DIST rkt-1.3.0.tar.gz 2450145 SHA256 0468c5b1079da8df65db9ebd0b712f64509acf6c8d6b34b780b6e787271d9b30 SHA512 f00500ddc1af85bc5ebe23b1a28e517e5f321f8c4c2434b71931b326cca5d4a10af4d54648a22634dc5039c7ca305539736b88a63b16fed1be897af0e22b64aa WHIRLPOOL 3f6c7ee950637ee16373ea43a23b1189c097d771748624be8a5794c734b0cb44b1b249cd424bcddf0ef5ec1761e08b8d53de71b5375ae35a9aa2ca7c3d4b91d6
DIST rkt-pxe-738.1.0.img 151780780 SHA256 805a4c491281553c8927f3dd1a7bec50cca29209d0a7264870e7155d794ecbe6 SHA512 7774cc64dfa874f08f48cba0c15103e9eca86ffd87dcb24f765a9b56074e72f6862a663a4007a0a7dd296740ae91bf4edf7290fa35659b0b1572fe2f5dad3256 WHIRLPOOL 5973a6036d650c576bb0bd365c8c9ea35776501c1fd2baf1d7c00d06496fab35e9c796096ef89b095e7a922e2062dce6c0d1c85cd3101022e0aca84277d18cb9
DIST rkt-pxe-794.1.0.img 185121072 SHA256 d513e27d2412d8fdaa2456786703346f10c24a62480d2036ca5c31b3d5a0df16 SHA512 f36324e9736bb0c533706c45d4146bed2efcb3ee2cb842c3624a62399835808c0df2aef56495a12b30f67c47fd84e93e34b10c57e4aa6d0450402d5e21c6f88c WHIRLPOOL 099851022b11aa29d004bbcef316a7cceeb5efa43f8069cdf1858888e7550f938fd9f9ec53eb63c313b5c1b93b0569f578a50fc5bae28b4d30c451a2ffd2adba
+DIST rkt-pxe-991.0.0.img 226115454 SHA256 33697d3d7c7458bbb160a5eb889ced34b001c35e22e10c86235042eb57ae51ed SHA512 1b785d8454381d47eb53062433bda5645650420b58821ac00119a92032ba4d669c974871eafe7e414ad349952974cfdf6812f85af69d3286b7bfe2fc2d04c52f WHIRLPOOL d9f103a0c5a78c8a4403a17e805872703cd5d4fe34e5395c381216538a15f58a7678c7d744ac8aa90ed4dd850a614ca52487cb50e5687c812488a3cdbdff2de0
DIST systemd-222.tar.gz 4015599 SHA256 b49f51f9855127987adc98aad3b6d608e4e53eaa029b629f2ea2089ce0234f34 SHA512 83f0acf0ca90c89c902c268af6eef4b61380a30380013cbe89c929357959f51682cd3961a6a4f772abc09d5ca09404ae290edf2c3253fab1b20dc2b5b3ecde47 WHIRLPOOL dd0151034de374b072e70448e7a9ff47693df0190e8a2a11488593400d3d7e53e0a91d86037d027c750584089e6c68e58c437647d608a72f8826f091e3253879
+DIST systemd-225.tar.gz 3878442 SHA256 b2f576bb3688e9315f2f49b98e141ac6f964567370e98ebd8fd7332a0a6f9701 SHA512 35b3946509c7b01660da4370d3c51ff0e6a537dadd9dbb0a039c4f7ed552fd4e02ebac6eb8a788f61f1e3ba99444238d959051dd004c174b027729a80368ac19 WHIRLPOOL 47cd3b5690dafdf3c0ef6a9767e947666b1853541f8aefd17eb5c07eee1477daf32f3b249b04327b1c56d8ec430745725383750b97755bb6cf594d354a7ffdf8
diff --git a/app-emulation/rkt/rkt-1.3.0.ebuild b/app-emulation/rkt/rkt-1.3.0.ebuild
new file mode 100644
index 0000000..8074ce1
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.3.0.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+AUTOTOOLS_IN_SOURCE_BUILD=yes
+
+inherit autotools-utils flag-o-matic systemd toolchain-funcs
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="991.0.0"
+PXE_SYSTEMD_VERSION="v225"
+KVM_LINUX_VERSION="4.3.1"
+KVMTOOL_VERSION="3c8aec9e2b5066412390559629dabeb7816ee8f2"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
+
+DESCRIPTION="A CLI for running app containers, and an implementation of the App
+Container Spec."
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
+
+DEPEND=">=dev-lang/go-1.5
+ app-arch/cpio
+ app-crypt/trousers
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny"
+
+RDEPEND="!app-emulation/rocket
+ rkt_stage1_host? ( systemd? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ ) )"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+src_unpack() {
+ local x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
+src_prepare() {
+ # disable git fetch of systemd
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local flavors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+ )
+
+ # enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
+ use rkt_stage1_src && flavors+=",src"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ use rkt_stage1_kvm && flavors+=",kvm"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_src; then
+ myeconfargs+=(
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+ )
+ fi
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ autotools-utils_src_configure
+}
+
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} autotools-utils_src_compile
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/bin/actool"
+
+ dobin "${S}/${BUILDDIR}/bin/rkt"
+
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_src; then
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm; then
+ dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
+
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-03-06 7:01 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-03-06 7:01 UTC (permalink / raw
To: gentoo-commits
commit: ec70b783f02d4c9ca7f21d87c0c400137ac9d3b2
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 6 07:00:33 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Mar 6 07:00:33 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec70b783
app-emulation/rkt: update 9999 ebuild
Package-Manager: portage-2.2.27
app-emulation/rkt/rkt-9999.ebuild | 153 ++++++++++++++++++++++++++++++--------
1 file changed, 124 insertions(+), 29 deletions(-)
diff --git a/app-emulation/rkt/rkt-9999.ebuild b/app-emulation/rkt/rkt-9999.ebuild
index 72c10a9..89add2f 100644
--- a/app-emulation/rkt/rkt-9999.ebuild
+++ b/app-emulation/rkt/rkt-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -7,19 +7,27 @@ EAPI=5
AUTOTOOLS_AUTORECONF=yes
AUTOTOOLS_IN_SOURCE_BUILD=yes
-inherit autotools-utils flag-o-matic systemd toolchain-funcs
-inherit git-r3
-
-EGIT_REPO_URI="https://github.com/coreos/rkt.git"
+inherit git-r3 autotools-utils flag-o-matic systemd toolchain-funcs
KEYWORDS=""
-PXE_VERSION="738.1.0"
-EGIT_BRANCH="master"
+EGIT_REPO_URI="https://github.com/coreos/rkt.git"
+PXE_VERSION="794.1.0"
+PXE_SYSTEMD_VERSION="v222"
+KVM_LINUX_VERSION="4.3.1"
+KVMTOOL_VERSION="3c8aec9e2b5066412390559629dabeb7816ee8f2"
PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-SRC_URI="rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )"
+[[ ${PV} == *9999* ]] || SRC_URI+=" https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+="
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
DESCRIPTION="A CLI for running app containers, and an implementation of the App
Container Spec."
@@ -27,39 +35,105 @@ HOMEPAGE="https://github.com/coreos/rkt"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="doc examples +rkt_stage1_coreos rkt_stage1_host rkt_stage1_src +actool systemd"
-REQUIRED_USE="^^ ( rkt_stage1_coreos rkt_stage1_host rkt_stage1_src )"
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
DEPEND=">=dev-lang/go-1.4.1
app-arch/cpio
app-crypt/trousers
sys-fs/squashfs-tools
- dev-perl/Capture-Tiny
- rkt_stage1_src? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- )"
+ dev-perl/Capture-Tiny"
+
RDEPEND="!app-emulation/rocket
- rkt_stage1_host? (
+ rkt_stage1_host? ( systemd? (
>=sys-apps/systemd-222
app-shells/bash:0
- )"
+ ) )"
BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+src_unpack() {
+ [[ ${PV} == *9999* ]] && git-r3_src_unpack
+ local x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
+src_prepare() {
+ # disable git fetch of systemd
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
+ autotools-utils_src_prepare
+}
src_configure() {
- local myeconfargs=(
- --with-stage1-image-path="/usr/share/rkt/stage1.aci"
+ local flavors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
)
- if use rkt_stage1_host; then
- myeconfargs+=( --with-stage1="host" )
- elif use rkt_stage1_src; then
- myeconfargs+=( --with-stage1="src" )
- elif use rkt_stage1_coreos; then
- myeconfargs+=( --with-stage1="coreos" )
- mkdir -p "${BUILDDIR}/tmp/usr_from_coreos/" || die
- cp "${DISTDIR}/${PXE_FILE}" "${BUILDDIR}/tmp/usr_from_coreos/pxe.img" || die
+ # enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
+ use rkt_stage1_src && flavors+=",src"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ use rkt_stage1_kvm && flavors+=",kvm"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_src; then
+ myeconfargs+=(
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+ )
+ fi
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
fi
# Go's 6l linker does not support PIE, disable so cgo binaries
@@ -79,6 +153,14 @@ src_configure() {
autotools-utils_src_configure
}
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} autotools-utils_src_compile
+}
+
src_install() {
dodoc README.md
use doc && dodoc -r Documentation
@@ -87,8 +169,21 @@ src_install() {
dobin "${S}/${BUILDDIR}/bin/rkt"
- insinto /usr/share/rkt/
- doins "${S}/${BUILDDIR}/bin/stage1.aci"
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_src; then
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm; then
+ dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-03-06 6:42 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-03-06 6:42 UTC (permalink / raw
To: gentoo-commits
commit: 0399633683f4db02a4522660438577570735514f
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 6 06:41:16 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Mar 6 06:41:16 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03996336
app-emulation/rkt: fix makefile dependencies to work in src_test
Package-Manager: portage-2.2.27
app-emulation/rkt/rkt-1.1.0.ebuild | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/app-emulation/rkt/rkt-1.1.0.ebuild b/app-emulation/rkt/rkt-1.1.0.ebuild
index 309c760..5e3a55d 100644
--- a/app-emulation/rkt/rkt-1.1.0.ebuild
+++ b/app-emulation/rkt/rkt-1.1.0.ebuild
@@ -70,25 +70,27 @@ src_unpack() {
src_prepare() {
# disable git fetch of systemd
- sed -e 's|^include makelib/git.mk$|'\
+ sed -e 's~^include makelib/git.mk$~'\
'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: $(UFS_SYSTEMDDIR)\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
'else\n'\
'\t\0\n'\
-'endif|' -i stage1/usr_from_src/usr_from_src.mk || die
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
# disable git fetch of kvmtool
- sed -e 's|^include makelib/git.mk$|'\
+ sed -e 's~^include makelib/git.mk$~'\
'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: $(LKVM_TMPDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
'else\n'\
'\t\0\n'\
-'endif|' -i stage1/usr_from_kvm/lkvm.mk || die
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
# disable fetch of kernel sources
sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-03-03 17:02 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-03-03 17:02 UTC (permalink / raw
To: gentoo-commits
commit: bf791ec60b23dd8b450fe24c5ec8f50f08a85a19
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 3 17:00:55 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Mar 3 17:00:55 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf791ec6
app-emulation/rkt: use forward-vars for get_lkvm_sources makefile target
Package-Manager: portage-2.2.27
app-emulation/rkt/rkt-1.1.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-emulation/rkt/rkt-1.1.0.ebuild b/app-emulation/rkt/rkt-1.1.0.ebuild
index 76a3b61..309c760 100644
--- a/app-emulation/rkt/rkt-1.1.0.ebuild
+++ b/app-emulation/rkt/rkt-1.1.0.ebuild
@@ -82,9 +82,9 @@ src_prepare() {
# disable git fetch of kvmtool
sed -e 's|^include makelib/git.mk$|'\
'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
'get_lkvm_sources: $(LKVM_TMPDIR)\n'\
-'\tmv "$${WORKDIR}/kvmtool" "$(_LKVM_SRCDIR)"\n\n'\
-'_LKVM_SRCDIR := $(LKVM_SRCDIR)\n\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
'else\n'\
'\t\0\n'\
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-03-03 10:16 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-03-03 10:16 UTC (permalink / raw
To: gentoo-commits
commit: 235f999766082dd4525ae39bd20f3faeaa418f3d
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 3 10:11:48 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Mar 3 10:16:16 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=235f9997
app-emulation/rkt: fix kvm when coreos stage1 is disabled, + makefile tweaks
Package-Manager: portage-2.2.27
app-emulation/rkt/rkt-1.1.0.ebuild | 39 +++++++++++++++++++++++++-------------
1 file changed, 26 insertions(+), 13 deletions(-)
diff --git a/app-emulation/rkt/rkt-1.1.0.ebuild b/app-emulation/rkt/rkt-1.1.0.ebuild
index 371c160..76a3b61 100644
--- a/app-emulation/rkt/rkt-1.1.0.ebuild
+++ b/app-emulation/rkt/rkt-1.1.0.ebuild
@@ -23,6 +23,7 @@ rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
rkt_stage1_kvm? (
https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
)
rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
@@ -69,20 +70,25 @@ src_unpack() {
src_prepare() {
# disable git fetch of systemd
- sed -e 's|^include makelib/git.mk$|_ := '\
-'$(shell set -ex; [ -d "$(UFS_SYSTEMD_SRCDIR)" ] \&\& exit 0; '\
-'[ ! -d "$${WORKDIR}/systemd-'${PXE_SYSTEMD_VERSION#v}'" ] \&\& exit 0; '\
-'mkdir -p "$$( dirname "$(UFS_SYSTEMD_SRCDIR)")"; '\
-'mv "$${WORKDIR}/systemd-'${PXE_SYSTEMD_VERSION#v}'" "$(UFS_SYSTEMD_SRCDIR)";)|' \
- -i stage1/usr_from_src/usr_from_src.mk || die
+ sed -e 's|^include makelib/git.mk$|'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif|' -i stage1/usr_from_src/usr_from_src.mk || die
# disable git fetch of kvmtool
- sed -e 's|^include makelib/git.mk$|_ := '\
-'$(shell set -ex; [ -d "$(LKVM_SRCDIR)" ] \&\& exit 0; '\
-'[ ! -d "$${WORKDIR}/kvmtool" ] \&\& exit 0; '\
-'mkdir -p "$$( dirname "$(LKVM_SRCDIR)")"; '\
-'mv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)";)|' \
- -i stage1/usr_from_kvm/lkvm.mk || die
+ sed -e 's|^include makelib/git.mk$|'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'get_lkvm_sources: $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(_LKVM_SRCDIR)"\n\n'\
+'_LKVM_SRCDIR := $(LKVM_SRCDIR)\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif|' -i stage1/usr_from_kvm/lkvm.mk || die
# disable fetch of kernel sources
sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
@@ -111,7 +117,14 @@ src_configure() {
use rkt_stage1_kvm && flavors+=",kvm"
myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
- if use rkt_stage1_coreos; then
+ if use rkt_stage1_src; then
+ myeconfargs+=(
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+ )
+ fi
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm; then
myeconfargs+=(
--with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
--with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-03-01 4:27 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-03-01 4:27 UTC (permalink / raw
To: gentoo-commits
commit: c56f3a735a1a5c6330d7987a06abd9dc69f415ab
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 1 04:26:28 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Mar 1 04:26:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c56f3a73
app-emulation/rkt: fix rkt_stage1_host RDEPEND conditional
Package-Manager: portage-2.2.27
app-emulation/rkt/rkt-1.1.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-emulation/rkt/rkt-1.1.0.ebuild b/app-emulation/rkt/rkt-1.1.0.ebuild
index 3628d9e..371c160 100644
--- a/app-emulation/rkt/rkt-1.1.0.ebuild
+++ b/app-emulation/rkt/rkt-1.1.0.ebuild
@@ -42,10 +42,10 @@ DEPEND=">=dev-lang/go-1.4.1
dev-perl/Capture-Tiny"
RDEPEND="!app-emulation/rocket
- systemd? (
+ rkt_stage1_host? ( systemd? (
>=sys-apps/systemd-222
app-shells/bash:0
- )"
+ ) )"
BUILDDIR="build-${P}"
STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-02-29 18:24 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-02-29 18:24 UTC (permalink / raw
To: gentoo-commits
commit: 1b6b6de34f19dceb3a64c66cd5d2bbb4ada29355
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 29 18:21:40 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 18:24:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b6b6de3
app-emulation/rkt: support rkt_stage1_host
Package-Manager: portage-2.2.27
app-emulation/rkt/rkt-1.1.0.ebuild | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/app-emulation/rkt/rkt-1.1.0.ebuild b/app-emulation/rkt/rkt-1.1.0.ebuild
index 4ae5909..3628d9e 100644
--- a/app-emulation/rkt/rkt-1.1.0.ebuild
+++ b/app-emulation/rkt/rkt-1.1.0.ebuild
@@ -32,8 +32,8 @@ HOMEPAGE="https://github.com/coreos/rkt"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_kvm rkt_stage1_src +actool"
-REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_kvm rkt_stage1_src )"
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
DEPEND=">=dev-lang/go-1.4.1
app-arch/cpio
@@ -41,7 +41,11 @@ DEPEND=">=dev-lang/go-1.4.1
sys-fs/squashfs-tools
dev-perl/Capture-Tiny"
-RDEPEND="!app-emulation/rocket"
+RDEPEND="!app-emulation/rocket
+ systemd? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ )"
BUILDDIR="build-${P}"
STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
@@ -84,6 +88,12 @@ src_prepare() {
sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
-i stage1/usr_from_kvm/kernel.mk || die
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
autotools-utils_src_prepare
}
@@ -93,11 +103,8 @@ src_configure() {
--with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
)
- # TODO:
- # - fix rkt_stage1_kvm to not download kernel sources with wget
- # - fix rkt_stage1_host to not fail during launch
-
# enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
use rkt_stage1_src && flavors+=",src"
use rkt_stage1_coreos && flavors+=",coreos"
use rkt_stage1_fly && flavors+=",fly"
@@ -148,7 +155,9 @@ src_install() {
doins "${S}/${BUILDDIR}/bin/"*.aci
# create symlink for default stage1 image path
- if use rkt_stage1_src; then
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_src; then
dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
elif use rkt_stage1_coreos; then
dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-02-29 18:11 Patrick Lauer
0 siblings, 0 replies; 66+ messages in thread
From: Patrick Lauer @ 2016-02-29 18:11 UTC (permalink / raw
To: gentoo-commits
commit: b1756af352a58beb43358e22492b7badc673c514
Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 29 18:10:32 2016 +0000
Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 18:10:32 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1756af3
app-emulation/rkt: Whitespace
Package-Manager: portage-2.2.27
app-emulation/rkt/rkt-1.1.0.ebuild | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/app-emulation/rkt/rkt-1.1.0.ebuild b/app-emulation/rkt/rkt-1.1.0.ebuild
index ce9a5eb..4ae5909 100644
--- a/app-emulation/rkt/rkt-1.1.0.ebuild
+++ b/app-emulation/rkt/rkt-1.1.0.ebuild
@@ -47,9 +47,9 @@ BUILDDIR="build-${P}"
STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
src_unpack() {
- local x
- for x in ${A}; do
- case ${x} in
+ local x
+ for x in ${A}; do
+ case ${x} in
*.img|linux-*) continue ;;
kvmtool-*)
mkdir kvmtool || die
@@ -59,8 +59,8 @@ src_unpack() {
;;
*)
unpack ${x}
- esac
- done
+ esac
+ done
}
src_prepare() {
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-02-29 12:04 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-02-29 12:04 UTC (permalink / raw
To: gentoo-commits
commit: 3520f64ce8b60c260685ff0b993d6e0c6a562fb7
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 29 12:01:10 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 12:02:41 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3520f64c
app-emulation/rkt: add rkt_stage1_kvm support
Package-Manager: portage-2.2.27
app-emulation/rkt/Manifest | 2 ++
app-emulation/rkt/metadata.xml | 1 +
app-emulation/rkt/rkt-1.1.0.ebuild | 51 ++++++++++++++++++++++++++++++++++++--
3 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index c025c72..7703448 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,3 +1,5 @@
+DIST kvmtool-3c8aec9e2b5066412390559629dabeb7816ee8f2.tar.gz 241486 SHA256 a3e65e5331e8bb20b112ac2dcc252fbcc9b9a83ef20292874ed4682bc2d87dcc SHA512 21a9ec313a9f46d6ebc4b7badfcc731350f5e58781892f33d11b907e085b84e6eebcaf2f22d101ed46a570e87d6530468be0bf6c258f195a38d594407cb2471b WHIRLPOOL f998afe674ef1bb8050d944646d35854fb75c3ef00eb0379ba3a52ea80bc9590e793fd333cb45803f683a4d0ed21c61d6d1cc7b74d01eb9503a6d960eef9e143
+DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5
DIST rkt-0.8.0.tar.gz 1749853 SHA256 c9eb0126b8ff2f059d7cedaab17ca73dce256f342092c9bf4a7ae20661f2a5aa SHA512 4e2c27fb40cd3d27de062631105db3ea04ed902f48abb647a8e4de249478dd8a145ac0b77fd5b261cc680df1bcaa4067accb8a597def9b3963108e2c1f3d9d5a WHIRLPOOL f65ddd8908ec30cfefa06e60cd4d8cdb2099ab279b6350790eb3e436b88c792efe28cea53569f48d42f6eec682635a4212f16fea9d184e6baa97877a643e1106
DIST rkt-1.0.0.tar.gz 2414183 SHA256 7e30b03fa51a34db095484c4b111c526e49bead4e33232e1b239090503d7ac97 SHA512 f176532486b68ebc15aae17cfcf31e0f97ce3afc96bfed1c4f918da41350ef21c170712cb071a8720f39ee757b7b9ba1e66730d6e12acb9753446b929801c4ff WHIRLPOOL b2fc3082693b474584292a6ec943a685826364632dc346b18233bf9b9d2feaf14981f4a7fcbd9e79b98c2466b2f24be9b57f6345c89aeea5d075cdbeee26aba5
DIST rkt-1.1.0.tar.gz 2426666 SHA256 df93dffc1deff470a5bebaa2610a07df8f48e69f660c81de0a31de13d7f7bfa5 SHA512 ef444843f411cd2d1fcd02f606bf5d0971eb314d708d1d54d07af9e3d69e1d74a7812456fd7cc46372ca6e42cfd5ac6af6b7b67e22890396f58d8982c0af1373 WHIRLPOOL 0579f5efd28d473ab4a0874d7218268a2a1143118b9f3e39670a683f05c7fb3b1b952aee75f0c923d76bc457c4d933c3c9b329f99960fa0a95cde2573225288b
diff --git a/app-emulation/rkt/metadata.xml b/app-emulation/rkt/metadata.xml
index 33d4777..7b1939a 100644
--- a/app-emulation/rkt/metadata.xml
+++ b/app-emulation/rkt/metadata.xml
@@ -15,6 +15,7 @@
<flag name="actool">Install the actool for ACI manipulation</flag>
<flag name="rkt_stage1_coreos">Download and use a prebuilt stage1.aci from CoreOS</flag>
<flag name="rkt_stage1_fly">Build stage1-fly.aci</flag>
+ <flag name="rkt_stage1_kvm">Build stage1-kvm.aci</flag>
<flag name="rkt_stage1_src">Build the stage1.aci from source</flag>
<flag name="rkt_stage1_host">Assemble stage1.aci from host binaries</flag>
</use>
diff --git a/app-emulation/rkt/rkt-1.1.0.ebuild b/app-emulation/rkt/rkt-1.1.0.ebuild
index aab5531..ce9a5eb 100644
--- a/app-emulation/rkt/rkt-1.1.0.ebuild
+++ b/app-emulation/rkt/rkt-1.1.0.ebuild
@@ -13,11 +13,17 @@ KEYWORDS="~amd64"
PXE_VERSION="794.1.0"
PXE_SYSTEMD_VERSION="v222"
+KVM_LINUX_VERSION="4.3.1"
+KVMTOOL_VERSION="3c8aec9e2b5066412390559629dabeb7816ee8f2"
PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+)
rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
DESCRIPTION="A CLI for running app containers, and an implementation of the App
@@ -26,8 +32,8 @@ HOMEPAGE="https://github.com/coreos/rkt"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_src +actool"
-REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_src )"
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_kvm rkt_stage1_src +actool"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_kvm rkt_stage1_src )"
DEPEND=">=dev-lang/go-1.4.1
app-arch/cpio
@@ -40,6 +46,23 @@ RDEPEND="!app-emulation/rocket"
BUILDDIR="build-${P}"
STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+src_unpack() {
+ local x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
src_prepare() {
# disable git fetch of systemd
sed -e 's|^include makelib/git.mk$|_ := '\
@@ -48,6 +71,19 @@ src_prepare() {
'mkdir -p "$$( dirname "$(UFS_SYSTEMD_SRCDIR)")"; '\
'mv "$${WORKDIR}/systemd-'${PXE_SYSTEMD_VERSION#v}'" "$(UFS_SYSTEMD_SRCDIR)";)|' \
-i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's|^include makelib/git.mk$|_ := '\
+'$(shell set -ex; [ -d "$(LKVM_SRCDIR)" ] \&\& exit 0; '\
+'[ ! -d "$${WORKDIR}/kvmtool" ] \&\& exit 0; '\
+'mkdir -p "$$( dirname "$(LKVM_SRCDIR)")"; '\
+'mv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)";)|' \
+ -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
autotools-utils_src_prepare
}
@@ -65,6 +101,7 @@ src_configure() {
use rkt_stage1_src && flavors+=",src"
use rkt_stage1_coreos && flavors+=",coreos"
use rkt_stage1_fly && flavors+=",fly"
+ use rkt_stage1_kvm && flavors+=",kvm"
myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
if use rkt_stage1_coreos; then
@@ -91,6 +128,14 @@ src_configure() {
autotools-utils_src_configure
}
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} autotools-utils_src_compile
+}
+
src_install() {
dodoc README.md
use doc && dodoc -r Documentation
@@ -109,6 +154,8 @@ src_install() {
dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
elif use rkt_stage1_fly; then
dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm; then
+ dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
fi
systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-02-29 9:35 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-02-29 9:35 UTC (permalink / raw
To: gentoo-commits
commit: 0838afb3eea111683ee35bf2684959892f23f558
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 29 09:34:38 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 09:34:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0838afb3
app-emulation/rkt: use ${PXE_SYSTEMD_VERSION} more
Package-Manager: portage-2.2.27
app-emulation/rkt/rkt-1.1.0.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-emulation/rkt/rkt-1.1.0.ebuild b/app-emulation/rkt/rkt-1.1.0.ebuild
index ff84098..aab5531 100644
--- a/app-emulation/rkt/rkt-1.1.0.ebuild
+++ b/app-emulation/rkt/rkt-1.1.0.ebuild
@@ -44,10 +44,10 @@ src_prepare() {
# disable git fetch of systemd
sed -e 's|^include makelib/git.mk$|_ := '\
'$(shell set -ex; [ -d "$(UFS_SYSTEMD_SRCDIR)" ] \&\& exit 0; '\
-'[ ! -d "$${WORKDIR}/systemd-222" ] \&\& exit 0; '\
+'[ ! -d "$${WORKDIR}/systemd-'${PXE_SYSTEMD_VERSION#v}'" ] \&\& exit 0; '\
'mkdir -p "$$( dirname "$(UFS_SYSTEMD_SRCDIR)")"; '\
-'mv "$${WORKDIR}/systemd-222" "$(UFS_SYSTEMD_SRCDIR)";)|' \
- i stage1/usr_from_src/usr_from_src.mk || die
+'mv "$${WORKDIR}/systemd-'${PXE_SYSTEMD_VERSION#v}'" "$(UFS_SYSTEMD_SRCDIR)";)|' \
+ -i stage1/usr_from_src/usr_from_src.mk || die
autotools-utils_src_prepare
}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-02-29 9:20 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-02-29 9:20 UTC (permalink / raw
To: gentoo-commits
commit: 127cb329540200ba43a973dd7d7b395596e1e0bb
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 29 09:18:26 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 09:20:06 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=127cb329
app-emulation/rkt: version bump to 1.1.0
Package-Manager: portage-2.2.27
app-emulation/rkt/Manifest | 2 +
app-emulation/rkt/rkt-1.1.0.ebuild | 118 +++++++++++++++++++++++++++++++++++++
2 files changed, 120 insertions(+)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index 3da236a..c025c72 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,4 +1,6 @@
DIST rkt-0.8.0.tar.gz 1749853 SHA256 c9eb0126b8ff2f059d7cedaab17ca73dce256f342092c9bf4a7ae20661f2a5aa SHA512 4e2c27fb40cd3d27de062631105db3ea04ed902f48abb647a8e4de249478dd8a145ac0b77fd5b261cc680df1bcaa4067accb8a597def9b3963108e2c1f3d9d5a WHIRLPOOL f65ddd8908ec30cfefa06e60cd4d8cdb2099ab279b6350790eb3e436b88c792efe28cea53569f48d42f6eec682635a4212f16fea9d184e6baa97877a643e1106
DIST rkt-1.0.0.tar.gz 2414183 SHA256 7e30b03fa51a34db095484c4b111c526e49bead4e33232e1b239090503d7ac97 SHA512 f176532486b68ebc15aae17cfcf31e0f97ce3afc96bfed1c4f918da41350ef21c170712cb071a8720f39ee757b7b9ba1e66730d6e12acb9753446b929801c4ff WHIRLPOOL b2fc3082693b474584292a6ec943a685826364632dc346b18233bf9b9d2feaf14981f4a7fcbd9e79b98c2466b2f24be9b57f6345c89aeea5d075cdbeee26aba5
+DIST rkt-1.1.0.tar.gz 2426666 SHA256 df93dffc1deff470a5bebaa2610a07df8f48e69f660c81de0a31de13d7f7bfa5 SHA512 ef444843f411cd2d1fcd02f606bf5d0971eb314d708d1d54d07af9e3d69e1d74a7812456fd7cc46372ca6e42cfd5ac6af6b7b67e22890396f58d8982c0af1373 WHIRLPOOL 0579f5efd28d473ab4a0874d7218268a2a1143118b9f3e39670a683f05c7fb3b1b952aee75f0c923d76bc457c4d933c3c9b329f99960fa0a95cde2573225288b
DIST rkt-pxe-738.1.0.img 151780780 SHA256 805a4c491281553c8927f3dd1a7bec50cca29209d0a7264870e7155d794ecbe6 SHA512 7774cc64dfa874f08f48cba0c15103e9eca86ffd87dcb24f765a9b56074e72f6862a663a4007a0a7dd296740ae91bf4edf7290fa35659b0b1572fe2f5dad3256 WHIRLPOOL 5973a6036d650c576bb0bd365c8c9ea35776501c1fd2baf1d7c00d06496fab35e9c796096ef89b095e7a922e2062dce6c0d1c85cd3101022e0aca84277d18cb9
DIST rkt-pxe-794.1.0.img 185121072 SHA256 d513e27d2412d8fdaa2456786703346f10c24a62480d2036ca5c31b3d5a0df16 SHA512 f36324e9736bb0c533706c45d4146bed2efcb3ee2cb842c3624a62399835808c0df2aef56495a12b30f67c47fd84e93e34b10c57e4aa6d0450402d5e21c6f88c WHIRLPOOL 099851022b11aa29d004bbcef316a7cceeb5efa43f8069cdf1858888e7550f938fd9f9ec53eb63c313b5c1b93b0569f578a50fc5bae28b4d30c451a2ffd2adba
+DIST systemd-222.tar.gz 4015599 SHA256 b49f51f9855127987adc98aad3b6d608e4e53eaa029b629f2ea2089ce0234f34 SHA512 83f0acf0ca90c89c902c268af6eef4b61380a30380013cbe89c929357959f51682cd3961a6a4f772abc09d5ca09404ae290edf2c3253fab1b20dc2b5b3ecde47 WHIRLPOOL dd0151034de374b072e70448e7a9ff47693df0190e8a2a11488593400d3d7e53e0a91d86037d027c750584089e6c68e58c437647d608a72f8826f091e3253879
diff --git a/app-emulation/rkt/rkt-1.1.0.ebuild b/app-emulation/rkt/rkt-1.1.0.ebuild
new file mode 100644
index 0000000..ff84098
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.1.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+AUTOTOOLS_IN_SOURCE_BUILD=yes
+
+inherit autotools-utils flag-o-matic systemd toolchain-funcs
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="794.1.0"
+PXE_SYSTEMD_VERSION="v222"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
+
+DESCRIPTION="A CLI for running app containers, and an implementation of the App
+Container Spec."
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_src +actool"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_src )"
+
+DEPEND=">=dev-lang/go-1.4.1
+ app-arch/cpio
+ app-crypt/trousers
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny"
+
+RDEPEND="!app-emulation/rocket"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+src_prepare() {
+ # disable git fetch of systemd
+ sed -e 's|^include makelib/git.mk$|_ := '\
+'$(shell set -ex; [ -d "$(UFS_SYSTEMD_SRCDIR)" ] \&\& exit 0; '\
+'[ ! -d "$${WORKDIR}/systemd-222" ] \&\& exit 0; '\
+'mkdir -p "$$( dirname "$(UFS_SYSTEMD_SRCDIR)")"; '\
+'mv "$${WORKDIR}/systemd-222" "$(UFS_SYSTEMD_SRCDIR)";)|' \
+ i stage1/usr_from_src/usr_from_src.mk || die
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local flavors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+ )
+
+ # TODO:
+ # - fix rkt_stage1_kvm to not download kernel sources with wget
+ # - fix rkt_stage1_host to not fail during launch
+
+ # enable flavors (first is default)
+ use rkt_stage1_src && flavors+=",src"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_coreos; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ autotools-utils_src_configure
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/bin/actool"
+
+ dobin "${S}/${BUILDDIR}/bin/rkt"
+
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_src; then
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
+
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-02-28 5:00 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-02-28 5:00 UTC (permalink / raw
To: gentoo-commits
commit: d0a765dd4bf0c29d771ba310bad72b22d1fd82b0
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 04:59:17 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 05:00:01 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0a765dd
app-emulation/rkt: add app-crypt/trousers dependency for bug 575472
Package-Manager: portage-2.2.27
app-emulation/rkt/rkt-1.0.0.ebuild | 1 +
app-emulation/rkt/rkt-9999.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/app-emulation/rkt/rkt-1.0.0.ebuild b/app-emulation/rkt/rkt-1.0.0.ebuild
index 858b0c3..0220e1b 100644
--- a/app-emulation/rkt/rkt-1.0.0.ebuild
+++ b/app-emulation/rkt/rkt-1.0.0.ebuild
@@ -30,6 +30,7 @@ REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly )"
DEPEND=">=dev-lang/go-1.4.1
app-arch/cpio
+ app-crypt/trousers
sys-fs/squashfs-tools
dev-perl/Capture-Tiny"
diff --git a/app-emulation/rkt/rkt-9999.ebuild b/app-emulation/rkt/rkt-9999.ebuild
index fcb665c..72c10a9 100644
--- a/app-emulation/rkt/rkt-9999.ebuild
+++ b/app-emulation/rkt/rkt-9999.ebuild
@@ -32,6 +32,7 @@ REQUIRED_USE="^^ ( rkt_stage1_coreos rkt_stage1_host rkt_stage1_src )"
DEPEND=">=dev-lang/go-1.4.1
app-arch/cpio
+ app-crypt/trousers
sys-fs/squashfs-tools
dev-perl/Capture-Tiny
rkt_stage1_src? (
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-02-22 5:55 Zac Medico
0 siblings, 0 replies; 66+ messages in thread
From: Zac Medico @ 2016-02-22 5:55 UTC (permalink / raw
To: gentoo-commits
commit: bf26f36f5a139d74f3588e8867280ec947c7fb93
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 05:52:06 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 05:55:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf26f36f
app-emulation/rkt: version bump to 1.0.0
Package-Manager: portage-2.2.27
app-emulation/rkt/Manifest | 2 +
app-emulation/rkt/metadata.xml | 5 ++
app-emulation/rkt/rkt-1.0.0.ebuild | 103 +++++++++++++++++++++++++++++++++++++
3 files changed, 110 insertions(+)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index d74b026..3da236a 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,2 +1,4 @@
DIST rkt-0.8.0.tar.gz 1749853 SHA256 c9eb0126b8ff2f059d7cedaab17ca73dce256f342092c9bf4a7ae20661f2a5aa SHA512 4e2c27fb40cd3d27de062631105db3ea04ed902f48abb647a8e4de249478dd8a145ac0b77fd5b261cc680df1bcaa4067accb8a597def9b3963108e2c1f3d9d5a WHIRLPOOL f65ddd8908ec30cfefa06e60cd4d8cdb2099ab279b6350790eb3e436b88c792efe28cea53569f48d42f6eec682635a4212f16fea9d184e6baa97877a643e1106
+DIST rkt-1.0.0.tar.gz 2414183 SHA256 7e30b03fa51a34db095484c4b111c526e49bead4e33232e1b239090503d7ac97 SHA512 f176532486b68ebc15aae17cfcf31e0f97ce3afc96bfed1c4f918da41350ef21c170712cb071a8720f39ee757b7b9ba1e66730d6e12acb9753446b929801c4ff WHIRLPOOL b2fc3082693b474584292a6ec943a685826364632dc346b18233bf9b9d2feaf14981f4a7fcbd9e79b98c2466b2f24be9b57f6345c89aeea5d075cdbeee26aba5
DIST rkt-pxe-738.1.0.img 151780780 SHA256 805a4c491281553c8927f3dd1a7bec50cca29209d0a7264870e7155d794ecbe6 SHA512 7774cc64dfa874f08f48cba0c15103e9eca86ffd87dcb24f765a9b56074e72f6862a663a4007a0a7dd296740ae91bf4edf7290fa35659b0b1572fe2f5dad3256 WHIRLPOOL 5973a6036d650c576bb0bd365c8c9ea35776501c1fd2baf1d7c00d06496fab35e9c796096ef89b095e7a922e2062dce6c0d1c85cd3101022e0aca84277d18cb9
+DIST rkt-pxe-794.1.0.img 185121072 SHA256 d513e27d2412d8fdaa2456786703346f10c24a62480d2036ca5c31b3d5a0df16 SHA512 f36324e9736bb0c533706c45d4146bed2efcb3ee2cb842c3624a62399835808c0df2aef56495a12b30f67c47fd84e93e34b10c57e4aa6d0450402d5e21c6f88c WHIRLPOOL 099851022b11aa29d004bbcef316a7cceeb5efa43f8069cdf1858888e7550f938fd9f9ec53eb63c313b5c1b93b0569f578a50fc5bae28b4d30c451a2ffd2adba
diff --git a/app-emulation/rkt/metadata.xml b/app-emulation/rkt/metadata.xml
index 5616198..33d4777 100644
--- a/app-emulation/rkt/metadata.xml
+++ b/app-emulation/rkt/metadata.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="person">
+ <email>zmedico@gentoo.org</email>
+ <name>Zac Medico</name>
+ </maintainer>
<longdescription lang="en">
rkt is a new container runtime, designed for composability, security,
and speed. Today we are releasing a prototype version on GitHub to begin
@@ -10,6 +14,7 @@
<use>
<flag name="actool">Install the actool for ACI manipulation</flag>
<flag name="rkt_stage1_coreos">Download and use a prebuilt stage1.aci from CoreOS</flag>
+ <flag name="rkt_stage1_fly">Build stage1-fly.aci</flag>
<flag name="rkt_stage1_src">Build the stage1.aci from source</flag>
<flag name="rkt_stage1_host">Assemble stage1.aci from host binaries</flag>
</use>
diff --git a/app-emulation/rkt/rkt-1.0.0.ebuild b/app-emulation/rkt/rkt-1.0.0.ebuild
new file mode 100644
index 0000000..858b0c3
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.0.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+AUTOTOOLS_IN_SOURCE_BUILD=yes
+
+inherit autotools-utils flag-o-matic systemd toolchain-funcs
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="794.1.0"
+PXE_SYSTEMD_VERSION="v222"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )"
+
+DESCRIPTION="A CLI for running app containers, and an implementation of the App
+Container Spec."
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly +actool"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly )"
+
+DEPEND=">=dev-lang/go-1.4.1
+ app-arch/cpio
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny"
+
+RDEPEND="!app-emulation/rocket"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+src_configure() {
+ local flavors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+ )
+
+ # TODO:
+ # - fix rkt_stage1_kvm to not download kernel sources with wget
+ # - fix rkt_stage1_src to not download systemd sources with git clone
+ # - fix rkt_stage1_host to not fail during launch
+
+ # enable flavors (first is default)
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_coreos; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ autotools-utils_src_configure
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/bin/actool"
+
+ dobin "${S}/${BUILDDIR}/bin/rkt"
+
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
+
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2016-02-21 15:14 Alex Brandt
0 siblings, 0 replies; 66+ messages in thread
From: Alex Brandt @ 2016-02-21 15:14 UTC (permalink / raw
To: gentoo-commits
commit: a4d7d93577f6bb8fb75d1e1799e01660e82cca65
Author: Alex Brandt <alunduil <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 15:13:16 2016 +0000
Commit: Alex Brandt <alunduil <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 15:13:54 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4d7d935
app-emulation/rkt: removing maintainers
Stefan and I no longer maintain this package. After two weeks of allowing
anyone to grab it I'm removing us from the maintainer list.
Package-Manager: portage-2.2.27
app-emulation/rkt/metadata.xml | 8 --------
1 file changed, 8 deletions(-)
diff --git a/app-emulation/rkt/metadata.xml b/app-emulation/rkt/metadata.xml
index 790b77b..5616198 100644
--- a/app-emulation/rkt/metadata.xml
+++ b/app-emulation/rkt/metadata.xml
@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>mail@stefanjunker.de</email>
- <name>Stefan Junker</name>
- </maintainer>
- <maintainer type="person">
- <email>alunduil@gentoo.org</email>
- <name>Alex Brandt</name>
- </maintainer>
<longdescription lang="en">
rkt is a new container runtime, designed for composability, security,
and speed. Today we are releasing a prototype version on GitHub to begin
^ permalink raw reply related [flat|nested] 66+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
@ 2015-09-06 20:27 Alex Brandt
0 siblings, 0 replies; 66+ messages in thread
From: Alex Brandt @ 2015-09-06 20:27 UTC (permalink / raw
To: gentoo-commits
commit: b952b4776ef9b2253cb91e43c77b51e624992827
Author: Alex Brandt <alunduil <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 6 20:20:37 2015 +0000
Commit: Alex Brandt <alunduil <AT> gentoo <DOT> org>
CommitDate: Sun Sep 6 20:26:45 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b952b477
app-emulation/rkt: add version 0.8.0 and 9999
Provided by Stefan Junker (listed as maintainer)
This commit does add a USE flag, rkt_stage1_src, to the selinux
package.use.mask. This is required due to the systemd integration with selinux
and rkt's dependence on systemd with this USE flag enabled.
Package-Manager: portage-2.2.20.1
app-emulation/rkt/Manifest | 2 +
app-emulation/rkt/metadata.xml | 24 ++++++++++
app-emulation/rkt/rkt-0.8.0.ebuild | 87 ++++++++++++++++++++++++++++++++++
app-emulation/rkt/rkt-9999.ebuild | 96 ++++++++++++++++++++++++++++++++++++++
4 files changed, 209 insertions(+)
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
new file mode 100644
index 0000000..d74b026
--- /dev/null
+++ b/app-emulation/rkt/Manifest
@@ -0,0 +1,2 @@
+DIST rkt-0.8.0.tar.gz 1749853 SHA256 c9eb0126b8ff2f059d7cedaab17ca73dce256f342092c9bf4a7ae20661f2a5aa SHA512 4e2c27fb40cd3d27de062631105db3ea04ed902f48abb647a8e4de249478dd8a145ac0b77fd5b261cc680df1bcaa4067accb8a597def9b3963108e2c1f3d9d5a WHIRLPOOL f65ddd8908ec30cfefa06e60cd4d8cdb2099ab279b6350790eb3e436b88c792efe28cea53569f48d42f6eec682635a4212f16fea9d184e6baa97877a643e1106
+DIST rkt-pxe-738.1.0.img 151780780 SHA256 805a4c491281553c8927f3dd1a7bec50cca29209d0a7264870e7155d794ecbe6 SHA512 7774cc64dfa874f08f48cba0c15103e9eca86ffd87dcb24f765a9b56074e72f6862a663a4007a0a7dd296740ae91bf4edf7290fa35659b0b1572fe2f5dad3256 WHIRLPOOL 5973a6036d650c576bb0bd365c8c9ea35776501c1fd2baf1d7c00d06496fab35e9c796096ef89b095e7a922e2062dce6c0d1c85cd3101022e0aca84277d18cb9
diff --git a/app-emulation/rkt/metadata.xml b/app-emulation/rkt/metadata.xml
new file mode 100644
index 0000000..d01e2b4
--- /dev/null
+++ b/app-emulation/rkt/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>mail@stefanjunker.de</email>
+ <name>Stefan Junker</name>
+ </maintainer>
+ <maintainer>
+ <email>alunduil@gentoo.org</email>
+ <name>Alex Brandt</name>
+ </maintainer>
+ <longdescription lang="en">
+ rkt is a new container runtime, designed for composability, security,
+ and speed. Today we are releasing a prototype version on GitHub to begin
+ gathering feedback from our community and explain why we are building
+ rkt.
+ </longdescription>
+ <use>
+ <flag name="actool">Install the actool for ACI manipulation</flag>
+ <flag name="rkt_stage1_coreos">Download and use a prebuilt stage1.aci from CoreOS</flag>
+ <flag name="rkt_stage1_src">Build the stage1.aci from source</flag>
+ <flag name="rkt_stage1_host">Assemble stage1.aci from host binaries</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-emulation/rkt/rkt-0.8.0.ebuild b/app-emulation/rkt/rkt-0.8.0.ebuild
new file mode 100644
index 0000000..e1354ed
--- /dev/null
+++ b/app-emulation/rkt/rkt-0.8.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+AUTOTOOLS_IN_SOURCE_BUILD=yes
+
+inherit autotools-utils flag-o-matic systemd toolchain-funcs
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="738.1.0"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )"
+
+DESCRIPTION="A CLI for running app containers, and an implementation of the App
+Container Spec."
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc examples +rkt_stage1_coreos rkt_stage1_src +actool systemd"
+REQUIRED_USE="^^ ( rkt_stage1_coreos rkt_stage1_src )"
+
+DEPEND=">=dev-lang/go-1.4.1
+ app-arch/cpio
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny
+ rkt_stage1_src? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ )"
+RDEPEND="!app-emulation/rocket"
+
+BUILDDIR="build-${P}"
+
+src_configure() {
+ local myeconfargs=(
+ --with-stage1-image-path="/usr/share/rkt/stage1.aci"
+ )
+
+ if use rkt_stage1_src; then
+ myeconfargs+=( --with-stage1="src" )
+ elif use rkt_stage1_coreos; then
+ myeconfargs+=( --with-stage1="coreos" )
+ mkdir -p "${BUILDDIR}/tmp/usr_from_coreos/" || die
+ cp "${DISTDIR}/${PXE_FILE}" "${BUILDDIR}/tmp/usr_from_coreos/pxe.img" || die
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ autotools-utils_src_configure
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/bin/actool"
+
+ dobin "${S}/${BUILDDIR}/bin/rkt"
+
+ insinto /usr/share/rkt/
+ doins "${S}/${BUILDDIR}/bin/stage1.aci"
+
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
+}
diff --git a/app-emulation/rkt/rkt-9999.ebuild b/app-emulation/rkt/rkt-9999.ebuild
new file mode 100644
index 0000000..fcb665c
--- /dev/null
+++ b/app-emulation/rkt/rkt-9999.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+AUTOTOOLS_IN_SOURCE_BUILD=yes
+
+inherit autotools-utils flag-o-matic systemd toolchain-funcs
+inherit git-r3
+
+EGIT_REPO_URI="https://github.com/coreos/rkt.git"
+
+KEYWORDS=""
+PXE_VERSION="738.1.0"
+EGIT_BRANCH="master"
+
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI="rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )"
+
+DESCRIPTION="A CLI for running app containers, and an implementation of the App
+Container Spec."
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc examples +rkt_stage1_coreos rkt_stage1_host rkt_stage1_src +actool systemd"
+REQUIRED_USE="^^ ( rkt_stage1_coreos rkt_stage1_host rkt_stage1_src )"
+
+DEPEND=">=dev-lang/go-1.4.1
+ app-arch/cpio
+ sys-fs/squashfs-tools
+ dev-perl/Capture-Tiny
+ rkt_stage1_src? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ )"
+RDEPEND="!app-emulation/rocket
+ rkt_stage1_host? (
+ >=sys-apps/systemd-222
+ app-shells/bash:0
+ )"
+
+BUILDDIR="build-${P}"
+
+src_configure() {
+ local myeconfargs=(
+ --with-stage1-image-path="/usr/share/rkt/stage1.aci"
+ )
+
+ if use rkt_stage1_host; then
+ myeconfargs+=( --with-stage1="host" )
+ elif use rkt_stage1_src; then
+ myeconfargs+=( --with-stage1="src" )
+ elif use rkt_stage1_coreos; then
+ myeconfargs+=( --with-stage1="coreos" )
+ mkdir -p "${BUILDDIR}/tmp/usr_from_coreos/" || die
+ cp "${DISTDIR}/${PXE_FILE}" "${BUILDDIR}/tmp/usr_from_coreos/pxe.img" || die
+ fi
+
+ # Go's 6l linker does not support PIE, disable so cgo binaries
+ # which use 6l+gcc for linking can be built correctly.
+ if gcc-specs-pie; then
+ append-ldflags -nopie
+ fi
+
+ export CC=$(tc-getCC)
+ export CGO_ENABLED=1
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export BUILDDIR
+
+ autotools-utils_src_configure
+}
+
+src_install() {
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+ use actool && dobin "${S}/${BUILDDIR}/bin/actool"
+
+ dobin "${S}/${BUILDDIR}/bin/rkt"
+
+ insinto /usr/share/rkt/
+ doins "${S}/${BUILDDIR}/bin/stage1.aci"
+
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
+ systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
+}
^ permalink raw reply related [flat|nested] 66+ messages in thread
end of thread, other threads:[~2018-11-17 15:27 UTC | newest]
Thread overview: 66+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-06 20:35 [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/ Zac Medico
-- strict thread matches above, loose matches on Subject: below --
2018-11-17 15:27 Zac Medico
2018-07-03 19:32 Zac Medico
2017-10-29 22:43 Zac Medico
2017-10-20 23:38 Zac Medico
2017-10-20 23:04 Zac Medico
2017-10-20 21:48 Zac Medico
2017-08-11 3:21 Zac Medico
2017-08-11 2:38 Zac Medico
2017-07-18 22:30 Zac Medico
2017-06-29 5:26 Zac Medico
2017-05-26 5:56 Zac Medico
2017-05-26 5:56 Zac Medico
2017-02-26 23:21 Zac Medico
2017-02-09 7:12 Zac Medico
2017-02-09 5:22 Zac Medico
2017-01-31 21:58 Zac Medico
2017-01-08 22:29 Zac Medico
2017-01-08 21:13 Zac Medico
2016-12-13 7:22 Zac Medico
2016-11-28 1:54 Zac Medico
2016-11-28 1:52 Zac Medico
2016-11-20 0:08 Zac Medico
2016-11-19 20:47 Zac Medico
2016-11-19 19:01 Zac Medico
2016-11-06 21:02 Zac Medico
2016-11-04 6:04 Zac Medico
2016-10-17 4:56 Zac Medico
2016-10-17 4:56 Zac Medico
2016-10-02 9:09 Zac Medico
2016-10-02 0:44 Zac Medico
2016-10-01 23:56 Zac Medico
2016-10-01 23:54 Zac Medico
2016-09-29 16:20 Zac Medico
2016-09-29 1:23 Zac Medico
2016-09-07 17:04 Zac Medico
2016-08-15 19:10 Zac Medico
2016-08-15 9:02 Zac Medico
2016-08-15 8:55 Zac Medico
2016-08-15 8:53 Zac Medico
2016-07-30 18:52 Zac Medico
2016-07-30 18:46 Zac Medico
2016-07-30 7:15 Zac Medico
2016-07-30 7:13 Zac Medico
2016-07-30 7:11 Zac Medico
2016-07-19 6:46 Zac Medico
2016-06-06 8:24 Zac Medico
2016-06-06 8:22 Zac Medico
2016-05-22 20:18 Zac Medico
2016-05-16 2:51 Zac Medico
2016-04-17 6:08 Zac Medico
2016-04-06 20:19 Zac Medico
2016-03-06 7:01 Zac Medico
2016-03-06 6:42 Zac Medico
2016-03-03 17:02 Zac Medico
2016-03-03 10:16 Zac Medico
2016-03-01 4:27 Zac Medico
2016-02-29 18:24 Zac Medico
2016-02-29 18:11 Patrick Lauer
2016-02-29 12:04 Zac Medico
2016-02-29 9:35 Zac Medico
2016-02-29 9:20 Zac Medico
2016-02-28 5:00 Zac Medico
2016-02-22 5:55 Zac Medico
2016-02-21 15:14 Alex Brandt
2015-09-06 20:27 Alex Brandt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox