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-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 7b0e9c5b0d..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,18 +15,26 @@ CROS_WORKON_LOCALNAME="rkt" CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == "9999" ]]; then - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm64" else - KEYWORDS="amd64" - CROS_WORKON_COMMIT="886c62d84158b1164a91bef9b4ca68de4c4e0322" # v1.9.1 + KEYWORDS="amd64 arm64" + CROS_WORKON_COMMIT="cb11bdfa3fa85239d321b937cdb1d0d9b834fbd6" # v1.10.0 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." @@ -34,7 +42,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 +57,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 @@ -77,7 +84,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 @@ -89,7 +96,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" @@ -112,13 +119,8 @@ 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 autotools-utils_src_configure } @@ -127,13 +129,12 @@ 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" + 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 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