From 3de0a9c721d84a8f2ec2f097c4bed8cc0857dbbd Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 14 May 2015 15:42:46 -0700 Subject: [PATCH 1/3] update_engine: lots of updates - remove call to crossystem - support for payloads that include kernels - lots of refactoring/cleanups --- ...e_engine-0.1.0-r3.ebuild => update_engine-0.1.0-r4.ebuild} | 0 .../coreos-base/update_engine/update_engine-9999.ebuild | 4 +--- 2 files changed, 1 insertion(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.1.0-r3.ebuild => update_engine-0.1.0-r4.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.1.0-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.1.0-r4.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.1.0-r3.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.1.0-r4.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild index 9650fd7980..cf1723410e 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild +++ b/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 From 8a835ed970eb0edfd251837402f2de5aef5a21b0 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 14 May 2015 15:53:01 -0700 Subject: [PATCH 2/3] vboot_reference: update to minimal cgpt-only version --- ...ebuild => vboot_reference-1.0-r888.ebuild} | 0 .../vboot_reference-9999.ebuild | 44 +++---------------- 2 files changed, 6 insertions(+), 38 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/{vboot_reference-1.0-r887.ebuild => vboot_reference-1.0-r888.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0-r887.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0-r888.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0-r887.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0-r888.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-9999.ebuild index 5a0e8082ee..b22a509591 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-9999.ebuild @@ -5,53 +5,21 @@ EAPI="4" CROS_WORKON_PROJECT="coreos/vboot_reference" CROS_WORKON_REPO="git://github.com" CROS_WORKON_LOCALDIR="src/platform" +AUTOTOOLS_AUTORECONF=1 if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~x86" else - CROS_WORKON_COMMIT="7359eb09a7419bf025d9ab1f5234be1466bbb636" + CROS_WORKON_COMMIT="8881575d1372b860744afe57b52a153a03c80c6a" KEYWORDS="amd64 arm x86" fi -inherit cros-debug cros-workon cros-au - -DESCRIPTION="Chrome OS verified boot tools" +inherit autotools-utils cros-workon +DESCRIPTION="CoreOS Disk Utilities (e.g. cgpt)" LICENSE="BSD" SLOT="0" -IUSE="cros_host" +IUSE="" -RDEPEND="dev-libs/libyaml - dev-libs/openssl - sys-apps/util-linux" +RDEPEND="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 -} From 8facbed5429732b2be5985070ed103e041491600 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 15 May 2015 12:19:37 -0700 Subject: [PATCH 3/3] rename vboot_reference to sys-apps/seismograph --- ...reos-0.0.1-r253.ebuild => coreos-0.0.1-r254.ebuild} | 0 .../coreos-base/coreos/coreos-0.0.1.ebuild | 2 +- .../hard-host-depends-0.0.1-r171.ebuild | 1 - ...r170.ebuild => hard-host-depends-0.0.1-r172.ebuild} | 0 .../hard-host-depends/hard-host-depends-0.0.1.ebuild | 1 - .../vboot_reference/vboot_reference-1.0-r888.ebuild | 1 - ...s-0.0.1-r16.ebuild => sdk-depends-0.0.1-r17.ebuild} | 0 .../coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild | 1 + .../coreos-overlay/profiles/updates/2Q-2015 | 1 + .../sys-apps/seismograph/seismograph-2.0.0.ebuild | 1 + .../seismograph/seismograph-9999.ebuild} | 10 +++++----- 11 files changed, 9 insertions(+), 9 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r253.ebuild => coreos-0.0.1-r254.ebuild} (100%) delete mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r171.ebuild rename sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/{hard-host-depends-0.0.1-r170.ebuild => hard-host-depends-0.0.1-r172.ebuild} (100%) delete mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0-r888.ebuild rename sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/{sdk-depends-0.0.1-r16.ebuild => sdk-depends-0.0.1-r17.ebuild} (100%) create mode 120000 sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-2.0.0.ebuild rename sdk_container/src/third_party/coreos-overlay/{coreos-base/vboot_reference/vboot_reference-9999.ebuild => sys-apps/seismograph/seismograph-9999.ebuild} (69%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r253.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r254.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r253.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r254.ebuild 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 429c175e7c..65c043e440 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 @@ -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 diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r171.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r171.ebuild deleted file mode 120000 index fdabb0fbff..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r171.ebuild +++ /dev/null @@ -1 +0,0 @@ -hard-host-depends-0.0.1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r170.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r172.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r170.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r172.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild index ba9f811ff2..28c9871b72 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild +++ b/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 diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0-r888.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0-r888.ebuild deleted file mode 120000 index c57c8bd9e5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-1.0-r888.ebuild +++ /dev/null @@ -1 +0,0 @@ -vboot_reference-9999.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r16.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r17.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r16.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r17.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild index 7610ee497e..1177501b09 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild +++ b/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 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/updates/2Q-2015 b/sdk_container/src/third_party/coreos-overlay/profiles/updates/2Q-2015 index 2adcf28aa0..2ebcf0a55a 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/updates/2Q-2015 +++ b/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 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-2.0.0.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-2.0.0.ebuild new file mode 120000 index 0000000000..651fd9ad47 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-2.0.0.ebuild @@ -0,0 +1 @@ +seismograph-9999.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild similarity index 69% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-9999.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild index b22a509591..75f306fe30 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/vboot_reference/vboot_reference-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild @@ -1,10 +1,9 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +# Copyright (c) 2015 The CoreOS OS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI="4" -CROS_WORKON_PROJECT="coreos/vboot_reference" +EAPI=5 +CROS_WORKON_PROJECT="coreos/seismograph" CROS_WORKON_REPO="git://github.com" -CROS_WORKON_LOCALDIR="src/platform" AUTOTOOLS_AUTORECONF=1 if [[ "${PV}" == 9999 ]]; then @@ -21,5 +20,6 @@ LICENSE="BSD" SLOT="0" IUSE="" -RDEPEND="sys-apps/util-linux" +RDEPEND="!coreos-base/vboot_reference + sys-apps/util-linux" DEPEND="${RDEPEND}"