From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
Date: Mon, 29 Feb 2016 18:24:45 +0000 (UTC) [thread overview]
Message-ID: <1456770279.1b6b6de34f19dceb3a64c66cd5d2bbb4ada29355.zmedico@gentoo> (raw)
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}"
next reply other threads:[~2016-02-29 18:24 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-29 18:24 Zac Medico [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-11-17 15:27 [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/ 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:35 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: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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456770279.1b6b6de34f19dceb3a64c66cd5d2bbb4ada29355.zmedico@gentoo \
--to=zmedico@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox