Merge pull request #1258 from marineam/updates

Update update_engine and cgpt

sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild

@@ -105,7 +105,6 @@ RDEPEND="${RDEPEND}
 	app-arch/unzip
 	app-arch/zip
 	app-shells/bash
-	coreos-base/vboot_reference
 	coreos-base/update_engine
 	coreos-base/coreos-init
 	coreos-base/coreos-cloudinit
@@ -131,6 +130,7 @@ RDEPEND="${RDEPEND}
 	sys-apps/pciutils
 	sys-apps/rootdev
 	sys-apps/sed
+	sys-apps/seismograph
 	sys-apps/shadow
 	sys-apps/systemd
 	sys-apps/usbutils

sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r171.ebuild

@@ -1 +0,0 @@
-hard-host-depends-0.0.1.ebuild

sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild

@@ -38,7 +38,6 @@ RDEPEND="${RDEPEND}
 	app-text/texi2html
 	coreos-base/cros-devutils[cros_host]
 	coreos-base/cros-testutils
-	coreos-base/vboot_reference
 	=dev-lang/python-2*
 	dev-python/setuptools
 	dev-lang/nasm

sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild

@@ -5,13 +5,11 @@ EAPI=5
 CROS_WORKON_PROJECT="coreos/update_engine"
 CROS_WORKON_REPO="git://github.com"
 AUTOTOOLS_AUTORECONF=1
-# TODO: this can be disabled once -I.. is no longer used
-AUTOTOOLS_IN_SOURCE_BUILD=1
 
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 else
-	CROS_WORKON_COMMIT="c88492c39ec0ad81bb26ae6efde7b4fc46a9804a"
+	CROS_WORKON_COMMIT="f79c8f95dd8bd2a0c532d1922869e2e602be8037"
 	KEYWORDS="amd64 arm arm64 x86"
 fi
 

sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0-r887.ebuild

@@ -1 +0,0 @@
-vboot_reference-9999.ebuild

sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-9999.ebuild

@@ -1,57 +0,0 @@
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-CROS_WORKON_PROJECT="coreos/vboot_reference"
-CROS_WORKON_REPO="git://github.com"
-CROS_WORKON_LOCALDIR="src/platform"
-
-if [[ "${PV}" == 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-else
-	CROS_WORKON_COMMIT="7359eb09a7419bf025d9ab1f5234be1466bbb636"
-	KEYWORDS="amd64 arm x86"
-fi
-
-inherit cros-debug cros-workon cros-au
-
-DESCRIPTION="Chrome OS verified boot tools"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="cros_host"
-
-RDEPEND="dev-libs/libyaml
-	dev-libs/openssl
-	sys-apps/util-linux"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	mkdir "${S}"/build-main
-	tc-export CC AR CXX PKG_CONFIG
-	cros-debug-add-NDEBUG
-	# Vboot reference knows the flags to use
-	unset CFLAGS
-	emake BUILD="${S}"/build-main \
-	      ARCH=$(tc-arch) all
-	unset CC AR CXX PKG_CONFIG
-}
-
-src_test() {
-	emake BUILD="${S}"/build-main \
-	      ARCH=$(tc-arch) runtests
-}
-
-src_install() {
-	einfo "Installing programs"
-	# Installing on the host
-	emake BUILD="${S}"/build-main DESTDIR="${D}/usr/bin" install
-
-	# Install public headers to /build/${BOARD}/usr/include/vboot
-	einfo "Installing header files"
-	insinto /usr/include/vboot
-	doins firmware/include/* host/include/*
-
-	einfo "Installing host library"
-	dolib.a build-main/libvboot_host.a
-}

sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild

@@ -30,6 +30,7 @@ DEPEND="
 	net-misc/curl
 	sys-apps/debianutils
 	sys-apps/iproute2
+	sys-apps/seismograph
 	sys-boot/grub
 	sys-boot/shim
 	sys-devel/crossdev

sdk_container/src/third_party/coreos-overlay/profiles/updates/2Q-2015

@@ -1 +1,2 @@
 move app-emulation/rocket app-emulation/rkt
+move coreos-base/vboot_reference sys-apps/seismograph

sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-2.0.0.ebuild

@@ -0,0 +1 @@
+seismograph-9999.ebuild

sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild

@@ -0,0 +1,25 @@
+# Copyright (c) 2015 The CoreOS OS Authors. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CROS_WORKON_PROJECT="coreos/seismograph"
+CROS_WORKON_REPO="git://github.com"
+AUTOTOOLS_AUTORECONF=1
+
+if [[ "${PV}" == 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+else
+	CROS_WORKON_COMMIT="8881575d1372b860744afe57b52a153a03c80c6a"
+	KEYWORDS="amd64 arm x86"
+fi
+
+inherit autotools-utils cros-workon
+
+DESCRIPTION="CoreOS Disk Utilities (e.g. cgpt)"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="!coreos-base/vboot_reference
+	sys-apps/util-linux"
+DEPEND="${RDEPEND}"