From f1d08c473db876a6e192a42ee11fb3eb74a6fd3d Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Mon, 11 Jul 2016 14:19:18 -0700 Subject: [PATCH 1/9] app-emulation/rkt: Fix error message Signed-off-by: Geoff Levand --- .../coreos-overlay/app-emulation/rkt/rkt-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild index 7b0e9c5b0d..84564aecf2 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild @@ -77,7 +77,7 @@ src_prepare() { rkt_coreos_version=$(awk '/^CCN_IMG_RELEASE/ { print $3 }' stage1/usr_from_coreos/coreos-common.mk) if [ "${rkt_coreos_version}" != "${PXE_VERSION}" ]; then - die "CoreOS versions in ebuild and rkt build scripts are mismatched expecting ${rkt_stage1_coreos}!" + die "CoreOS versions in ebuild and rkt build scripts are mismatched, expecting ${rkt_coreos_version}!" fi autotools-utils_src_prepare From 854d6aa45fb67ea287de8117bbfd26ac48931466 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Mon, 11 Jul 2016 14:19:18 -0700 Subject: [PATCH 2/9] app-emulation/rkt: Fix PXE_SYSTEMD_VERSION Remove duplicate 'v'. PXE_SYSTEMD_VERSION has a 'v', and src_configure() was adding a 'v', so we were getting a version as 'vvXXX' Signed-off-by: Geoff Levand --- .../coreos-overlay/app-emulation/rkt/rkt-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild index 84564aecf2..6039c0af97 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild @@ -89,7 +89,7 @@ src_configure() { if use rkt_stage1_coreos; then add_stage1 "coreos" myeconfargs+=( --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}" ) - myeconfargs+=( --with-coreos-local-pxe-image-systemd-version=v"${PXE_SYSTEMD_VERSION}" ) + myeconfargs+=( --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}" ) fi if use rkt_stage1_fly; then add_stage1 "fly" From 987f544f51f82c72c2b0f4463243aeadde1402b0 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Mon, 11 Jul 2016 14:19:18 -0700 Subject: [PATCH 3/9] app-emulation/rkt: Increase build verbosity To aid in debugging build problems build rkt with V=1. Signed-off-by: Geoff Levand --- .../third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild index 6039c0af97..b3b8269e73 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild @@ -119,6 +119,7 @@ src_configure() { export CGO_CXXFLAGS="${CXXFLAGS}" export CGO_LDFLAGS="${LDFLAGS}" export BUILDDIR + export V=1 autotools-utils_src_configure } From f44eab7801c8b11e658dcad1c42267ce3086664f Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Mon, 11 Jul 2016 14:19:18 -0700 Subject: [PATCH 4/9] app-emulation/rkt: Remove go environment settings rkt now uses configure to set the go build environment, so remove the setting of those variables from the ebuild. Signed-off-by: Geoff Levand --- .../coreos-overlay/app-emulation/rkt/rkt-9999.ebuild | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild index b3b8269e73..ee6a585c2c 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild @@ -112,12 +112,6 @@ src_configure() { 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 export V=1 From dd9c371ffc7503d2d87595057a91218d086362fe Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Mon, 11 Jul 2016 14:19:18 -0700 Subject: [PATCH 5/9] app-emulation/rkt: Remove actool install rkt builds actool for its own use on the host, so remove the install from this ebuild (it won't work on arm64). actool for use on the target should be build by app-emulation/actool. Signed-off-by: Geoff Levand --- .../coreos-overlay/app-emulation/rkt/rkt-9999.ebuild | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild index ee6a585c2c..fbc9855a3b 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild @@ -34,7 +34,7 @@ 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_src +actool tpm" +IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_src tpm" REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_src )" COMMON_DEPEND="sys-apps/acl @@ -49,7 +49,6 @@ DEPEND="|| ( ~dev-lang/go-1.4.3:= >=dev-lang/go-1.5.3:= ) ) ${COMMON_DEPEND}" RDEPEND="!app-emulation/rocket - actool? ( !app-emulation/actool ) rkt_stage1_host? ( ~sys-apps/systemd-222 app-shells/bash @@ -122,7 +121,6 @@ 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" From dd2560af235e9a5ff91628532f7e155aa440d96d Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Mon, 11 Jul 2016 14:19:18 -0700 Subject: [PATCH 6/9] coreos-base: Fixups for rkt, actool actool and rkt are now split, also enable for arm64. Signed-off-by: Geoff Levand --- .../coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild index 70070d9c7d..48d7a9acb8 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild @@ -95,7 +95,6 @@ RDEPEND="${RDEPEND} amd64? ( app-admin/kubelet-wrapper app-crypt/go-tspi - app-emulation/rkt[actool] app-emulation/xenserver-pv-version app-emulation/xenstore sys-auth/realmd @@ -117,6 +116,8 @@ RDEPEND="${RDEPEND} app-crypt/tpmpolicy app-editors/vim app-emulation/docker + app-emulation/rkt + app-emulation/actool app-misc/ca-certificates app-misc/jq app-shells/bash From 8932e486074411d4e1c268b33f01eeb28833de4a Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Mon, 11 Jul 2016 14:19:18 -0700 Subject: [PATCH 7/9] app-emulation/rkt: Bump to rkt-1.10.0 Signed-off-by: Geoff Levand --- .../rkt/{rkt-1.9.1.ebuild => rkt-1.10.0.ebuild} | 0 .../coreos-overlay/app-emulation/rkt/rkt-9999.ebuild | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/{rkt-1.9.1.ebuild => rkt-1.10.0.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.9.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.10.0.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.9.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.10.0.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild index fbc9855a3b..1f37e3a736 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild @@ -18,7 +18,7 @@ if [[ "${PV}" == "9999" ]]; then KEYWORDS="~amd64" else KEYWORDS="amd64" - CROS_WORKON_COMMIT="886c62d84158b1164a91bef9b4ca68de4c4e0322" # v1.9.1 + CROS_WORKON_COMMIT="cb11bdfa3fa85239d321b937cdb1d0d9b834fbd6" # v1.10.0 fi PXE_VERSION="1068.0.0" @@ -122,11 +122,11 @@ src_install() { use doc && dodoc -r Documentation use examples && dodoc -r examples - dobin "${S}/${BUILDDIR}/bin/rkt" + dobin "${S}/${BUILDDIR}/target/bin"/rkt einfo The following stage1 ACIs have been installed to ${STAGE1INSTALLDIR}: insinto ${STAGE1INSTALLDIR} - for stage1aci in "${S}/${BUILDDIR}"/bin/stage1-*.aci; do + for stage1aci in "${S}/${BUILDDIR}/target/bin"/stage1-*.aci; do doins "${stage1aci}" einfo $(basename "${stage1aci}") done From 30cd8be421fe5db19a0b3c2efa63426f569b08ba Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Mon, 11 Jul 2016 14:19:18 -0700 Subject: [PATCH 8/9] app-emulation/rkt: Add arm64 arch support Signed-off-by: Geoff Levand --- .../coreos-overlay/app-emulation/rkt/Manifest | 3 ++- .../app-emulation/rkt/rkt-9999.ebuild | 14 +++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/Manifest index e1cddfaad6..33c9d13b1b 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/Manifest @@ -1 +1,2 @@ -DIST rkt-pxe-1068.0.0.img 261402717 SHA256 f7ae0b0c676a2aaaaf2872fd5d0d692744d6af9185a334354c3c673865e54a1a SHA512 7b4c4ac28eb59f9fa8616b205fb440e5535814b80d89a365fd695252e7f9ed5f0d5288d1e571bc71b261f4f68ca052d327eee7eabe9b562e7003c767c96e052a WHIRLPOOL 1afa35b65a4beb2d5c12a8da4db7aff6b3b3123aa83366b0a51caac911938957f992082f7af35c1592c2da44503cc5131547a7961771c2c4064e79b3074f8a6b +DIST rkt-pxe-amd64-usr-1068.0.0.img 261402717 SHA256 f7ae0b0c676a2aaaaf2872fd5d0d692744d6af9185a334354c3c673865e54a1a SHA512 7b4c4ac28eb59f9fa8616b205fb440e5535814b80d89a365fd695252e7f9ed5f0d5288d1e571bc71b261f4f68ca052d327eee7eabe9b562e7003c767c96e052a WHIRLPOOL 1afa35b65a4beb2d5c12a8da4db7aff6b3b3123aa83366b0a51caac911938957f992082f7af35c1592c2da44503cc5131547a7961771c2c4064e79b3074f8a6b +DIST rkt-pxe-arm64-usr-1068.0.0.img 111736974 SHA256 2ea600940648db69295bb34a6808f596dcce07278a80840a11ef30470ba70e70 SHA512 16c63f9eb2e66ee0fccdfac94d87e945d88bac1a2473204a0832ef37c1477deafc282c381621e1e6cc15e5b7717d4abedc9c92c5dd9c715972039b20058fca3f WHIRLPOOL 6249645c3a92b4c1d21c6d146894790a2c665448514862d8bc1cc2f24d6b3196bf9dd3298536822e74ffd7b5d332045c6bea05f864a4c68f7d8af72b712f0782 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild index 1f37e3a736..5ba65f17d1 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild @@ -23,10 +23,18 @@ fi PXE_VERSION="1068.0.0" PXE_SYSTEMD_VERSION="v229" -PXE_URI="https://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz" -PXE_FILE="${PN}-pxe-${PXE_VERSION}.img" +PXE_FILE="${PN}-pxe-${ARCH}-usr-${PXE_VERSION}.img" -SRC_URI="rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )" +PXE_URI_AMD64="https://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz" +PXE_URI_ARM64="https://alpha.release.core-os.net/arm64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz" + +PXE_FILE_AMD64="${PN}-pxe-amd64-usr-${PXE_VERSION}.img" +PXE_FILE_ARM64="${PN}-pxe-arm64-usr-${PXE_VERSION}.img" + +SRC_URI="rkt_stage1_coreos? ( + amd64? ( ${PXE_URI_AMD64} -> ${PXE_FILE_AMD64} ) + arm64? ( ${PXE_URI_ARM64} -> ${PXE_FILE_ARM64} ) +)" DESCRIPTION="A CLI for running app containers, and an implementation of the App Container Spec." From ea183131de00300c4c7c5cc164916fbe9e3cd3ab Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Mon, 11 Jul 2016 14:19:18 -0700 Subject: [PATCH 9/9] app-emulation/rkt: Add arm64 keywords Signed-off-by: Geoff Levand --- .../coreos-overlay/app-emulation/rkt/rkt-9999.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild index 5ba65f17d1..74b8303f19 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild @@ -15,9 +15,9 @@ CROS_WORKON_LOCALNAME="rkt" CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == "9999" ]]; then - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm64" else - KEYWORDS="amd64" + KEYWORDS="amd64 arm64" CROS_WORKON_COMMIT="cb11bdfa3fa85239d321b937cdb1d0d9b834fbd6" # v1.10.0 fi