From d908869b8651017800e0255a462f6d3d0b5fa313 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 12 Mar 2014 18:40:27 -0700 Subject: [PATCH] fix(coreos-base/*): Clean up cros-installer and cros-factoryutils cros-installer has already been removed, clean up lingering references. cros-factoryutils installed nothing, just remove the ebuild. --- .../cros-factoryutils-0.0.1-r96.ebuild | 37 ------------------- .../cros-factoryutils-9999.ebuild | 33 ----------------- ...ld => hard-host-depends-0.0.1-r160.ebuild} | 0 .../hard-host-depends-0.0.1.ebuild | 3 +- 4 files changed, 1 insertion(+), 72 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/cros-factoryutils/cros-factoryutils-0.0.1-r96.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/cros-factoryutils/cros-factoryutils-9999.ebuild rename sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/{hard-host-depends-0.0.1-r159.ebuild => hard-host-depends-0.0.1-r160.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-factoryutils/cros-factoryutils-0.0.1-r96.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-factoryutils/cros-factoryutils-0.0.1-r96.ebuild deleted file mode 100644 index 9ba6f031a2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-factoryutils/cros-factoryutils-0.0.1-r96.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -# TODO(jsalz): Remove this ebuild; it's no longer used. - -EAPI="4" -CROS_WORKON_COMMIT="c759366a1dd3d733b12bb2edc3bae9868d38ee5b" -CROS_WORKON_TREE="46e050754b5a2f5392223d734036b7b51dde5b5b" -CROS_WORKON_PROJECT="chromiumos/platform/factory-utils" - -inherit cros-workon - -DESCRIPTION="Factory development utilities for ChromiumOS" -HOMEPAGE="http://www.chromium.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="cros_factory_bundle" - -CROS_WORKON_LOCALNAME="factory-utils" -RDEPEND="" - -# chromeos-installer for solving "lib/chromeos-common.sh" symlink. -# vboot_reference for binary programs (ex, cgpt). -DEPEND="coreos-base/coreos-installer[cros_host] - coreos-base/vboot_reference" - -DEPEND="" - -src_compile() { - true -} - -src_install() { - true -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-factoryutils/cros-factoryutils-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-factoryutils/cros-factoryutils-9999.ebuild deleted file mode 100644 index 77d9fff64f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-factoryutils/cros-factoryutils-9999.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -# TODO(jsalz): Remove this ebuild; it's no longer used. - -EAPI="4" -CROS_WORKON_PROJECT="chromiumos/platform/factory-utils" - -inherit cros-workon - -DESCRIPTION="Factory development utilities for ChromiumOS" -HOMEPAGE="http://www.chromium.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="cros_factory_bundle" - -CROS_WORKON_LOCALNAME="factory-utils" -RDEPEND="" - -# chromeos-installer for solving "lib/chromeos-common.sh" symlink. -# vboot_reference for binary programs (ex, cgpt). -DEPEND="coreos-base/coreos-installer[cros_host] - coreos-base/vboot_reference" - -src_compile() { - true -} - -src_install() { - true -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r159.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r160.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r159.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r160.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 6bdbde0029..c7f385faf4 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 @@ -39,10 +39,9 @@ RDEPEND="${RDEPEND} app-emulation/qemu app-text/texi2html coreos-base/google-breakpad - coreos-base/coreos-installer coreos-base/cros-devutils[cros_host] - coreos-base/cros-factoryutils coreos-base/cros-testutils + coreos-base/vboot_reference =dev-lang/python-2* dev-python/setuptools dev-lang/nasm