From 6a5552d0f052f67ab09dcc4a13f02f11a7571d33 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 29 Sep 2016 15:33:02 -0700 Subject: [PATCH] sys-apps/seismograph: update to 2.2, now includes rootdev --- ...1-r273.ebuild => coreos-0.0.1-r274.ebuild} | 0 .../coreos-base/coreos/coreos-0.0.1.ebuild | 1 - ...0.ebuild => update_engine-0.4.0-r1.ebuild} | 0 .../update_engine/update_engine-9999.ebuild | 2 +- .../sys-apps/rootdev/metadata.xml | 4 --- .../sys-apps/rootdev/rootdev-0.0.1-r11.ebuild | 35 ------------------- .../sys-apps/rootdev/rootdev-9999.ebuild | 33 ----------------- ...1.1-r1.ebuild => seismograph-2.2.0.ebuild} | 0 .../seismograph/seismograph-9999.ebuild | 3 +- 9 files changed, 3 insertions(+), 75 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r273.ebuild => coreos-0.0.1-r274.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.4.0.ebuild => update_engine-0.4.0-r1.ebuild} (100%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/rootdev/metadata.xml delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/rootdev/rootdev-0.0.1-r11.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/rootdev/rootdev-9999.ebuild rename sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/{seismograph-2.1.1-r1.ebuild => seismograph-2.2.0.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r273.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r274.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r273.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r274.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 771b7ba00c..ecde96a394 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 @@ -154,7 +154,6 @@ RDEPEND="${RDEPEND} sys-apps/net-tools sys-apps/pciutils sys-apps/rng-tools - sys-apps/rootdev sys-apps/sed sys-apps/seismograph sys-apps/shadow diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.0-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.0-r1.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 44b3e76e28..4033d8fe2c 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 @@ -35,7 +35,7 @@ RDEPEND="!coreos-base/coreos-installer dev-libs/protobuf:= dev-util/bsdiff net-misc/curl - sys-apps/rootdev + >=sys-apps/seismograph-2.2.0 sys-fs/e2fsprogs" DEPEND="dev-cpp/gmock dev-cpp/gtest diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/rootdev/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-apps/rootdev/metadata.xml deleted file mode 100644 index 097975e3ad..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/rootdev/metadata.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/rootdev/rootdev-0.0.1-r11.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/rootdev/rootdev-0.0.1-r11.ebuild deleted file mode 100644 index fcce68f861..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/rootdev/rootdev-0.0.1-r11.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 -CROS_WORKON_COMMIT="c9880282b115a0127c948d16f4ab3c6cadcbfcd2" -CROS_WORKON_TREE="8ec533cfbe40ad80859408561a3623f8b24b909b" -CROS_WORKON_PROJECT="chromiumos/third_party/rootdev" - -inherit toolchain-funcs cros-workon - -DESCRIPTION="Chrome OS root block device tool/library" -HOMEPAGE="http://www.chromium.org/" -SRC_URI="" -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86 arm arm64" -IUSE="" - -src_compile() { - tc-getCC - emake || die -} - -src_install() { - dodir /usr/bin - exeinto /usr/bin - doexe ${S}/rootdev - - dodir /usr/lib - dolib.so librootdev.so* - - dodir /usr/include/rootdev - insinto /usr/include/rootdev - doins rootdev.h -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/rootdev/rootdev-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/rootdev/rootdev-9999.ebuild deleted file mode 100644 index a340e1ba39..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/rootdev/rootdev-9999.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 -CROS_WORKON_PROJECT="chromiumos/third_party/rootdev" - -inherit toolchain-funcs cros-workon - -DESCRIPTION="Chrome OS root block device tool/library" -HOMEPAGE="http://www.chromium.org/" -SRC_URI="" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~arm ~arm64" -IUSE="" - -src_compile() { - tc-getCC - emake || die -} - -src_install() { - dodir /usr/bin - exeinto /usr/bin - doexe ${S}/rootdev - - dodir /usr/lib - dolib.so librootdev.so* - - dodir /usr/include/rootdev - insinto /usr/include/rootdev - doins rootdev.h -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-2.1.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-2.2.0.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-2.1.1-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-2.2.0.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild index 5364a2b213..4c1a12b7f1 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/seismograph/seismograph-9999.ebuild @@ -9,7 +9,7 @@ AUTOTOOLS_AUTORECONF=1 if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="db243fb040ef52b36e9e4bc835f5c11eec89ff2d" + CROS_WORKON_COMMIT="abf96f58562a7fd6dbf62542243cf201641b4a7a" KEYWORDS="amd64 arm arm64 x86" fi @@ -21,6 +21,7 @@ SLOT="0" IUSE="" RDEPEND="!coreos-base/vboot_reference + !sys-apps/rootdev sys-apps/util-linux sys-fs/e2fsprogs" DEPEND="${RDEPEND}"