From b09375f94f9ac364718c98686a07aa52e55c66a6 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 12 Mar 2014 11:57:24 -0700 Subject: [PATCH] remove(coreos-base/coreos-installer): replaced by a small shell script The tools this provided are moving to update_engine. --- .../coreos-installer-0.0.1-r285.ebuild | 1 - .../coreos-installer-0.0.1.ebuild | 83 ------------------- .../coreos-installer-9999.ebuild | 82 ------------------ ...1-r226.ebuild => coreos-0.0.1-r227.ebuild} | 0 .../coreos-base/coreos/coreos-0.0.1.ebuild | 1 - 5 files changed, 167 deletions(-) delete mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r285.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-9999.ebuild rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r226.ebuild => coreos-0.0.1-r227.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r285.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r285.ebuild deleted file mode 120000 index a3292c7fa4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r285.ebuild +++ /dev/null @@ -1 +0,0 @@ -coreos-installer-0.0.1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1.ebuild deleted file mode 100644 index 23261ce258..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1.ebuild +++ /dev/null @@ -1,83 +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_COMMIT="95815a7cc15abea574e1b06d9fd403b90b29ba01" -CROS_WORKON_PROJECT="coreos/installer" -CROS_WORKON_LOCALNAME="installer" -CROS_WORKON_LOCALDIR="src/platform" -CROS_WORKON_OUTOFTREE_BUILD=1 -CROS_WORKON_REPO="git://github.com" - -inherit cros-workon cros-debug cros-au - -DESCRIPTION="CoreOS Installer" -SRC_URI="" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="32bit_au cros_host" - -DEPEND=" - coreos-base/verity - dev-cpp/gmock" - -# TODO(adlr): remove coreutils dep if we move to busybox -RDEPEND=" - app-admin/sudo - coreos-base/vboot_reference - dev-util/shflags - sys-apps/coreutils - sys-apps/flashrom - sys-apps/hdparm - sys-apps/rootdev - sys-apps/util-linux - sys-apps/which - sys-block/parted - sys-fs/dosfstools - sys-fs/e2fsprogs" - -src_prepare() { - cros-workon_src_prepare -} - -src_configure() { - # need this to get the verity headers working - append-cxxflags -I"${SYSROOT}"/usr/include/verity/ - append-cxxflags -I"${SYSROOT}"/usr/include/vboot - append-ldflags -L"${SYSROOT}"/usr/lib/vboot32 - - use 32bit_au && board_setup_32bit_au_env - - cros-workon_src_configure -} - -src_compile() { - # We don't need the installer in the sdk, just helper scripts. - use cros_host && return 0 - - cros-workon_src_compile -} - -src_test() { - # Needed for `cros_run_unit_tests`. - cros-workon_src_test -} - -src_install() { - cros-workon_src_install - local path - if use cros_host ; then - # Copy chromeos-* scripts to /usr/lib/installer/ on host. - path="usr/lib/installer" - else - path="usr/sbin" - dobin "${OUT}"/cros_installer - dosym ${path}/chromeos-postinst /postinst - fi - - exeinto /${path} - doexe chromeos-* - doexe coreos-* -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-9999.ebuild deleted file mode 100644 index 05254068d2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-9999.ebuild +++ /dev/null @@ -1,82 +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/installer" -CROS_WORKON_LOCALNAME="installer" -CROS_WORKON_LOCALDIR="src/platform" -CROS_WORKON_OUTOFTREE_BUILD=1 -CROS_WORKON_REPO="git://github.com" - -inherit cros-workon cros-debug cros-au - -DESCRIPTION="CoreOS Installer" -SRC_URI="" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="32bit_au cros_host" - -DEPEND=" - coreos-base/verity - dev-cpp/gmock" - -# TODO(adlr): remove coreutils dep if we move to busybox -RDEPEND=" - app-admin/sudo - coreos-base/vboot_reference - dev-util/shflags - sys-apps/coreutils - sys-apps/flashrom - sys-apps/hdparm - sys-apps/rootdev - sys-apps/util-linux - sys-apps/which - sys-block/parted - sys-fs/dosfstools - sys-fs/e2fsprogs" - -src_prepare() { - cros-workon_src_prepare -} - -src_configure() { - # need this to get the verity headers working - append-cxxflags -I"${SYSROOT}"/usr/include/verity/ - append-cxxflags -I"${SYSROOT}"/usr/include/vboot - append-ldflags -L"${SYSROOT}"/usr/lib/vboot32 - - use 32bit_au && board_setup_32bit_au_env - - cros-workon_src_configure -} - -src_compile() { - # We don't need the installer in the sdk, just helper scripts. - use cros_host && return 0 - - cros-workon_src_compile -} - -src_test() { - # Needed for `cros_run_unit_tests`. - cros-workon_src_test -} - -src_install() { - cros-workon_src_install - local path - if use cros_host ; then - # Copy chromeos-* scripts to /usr/lib/installer/ on host. - path="usr/lib/installer" - else - path="usr/sbin" - dobin "${OUT}"/cros_installer - dosym ${path}/chromeos-postinst /postinst - fi - - exeinto /${path} - doexe chromeos-* - doexe coreos-* -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r226.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r227.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r226.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r227.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 f75404e623..e05d6b0c5f 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 @@ -104,7 +104,6 @@ RDEPEND="${RDEPEND} coreos-base/cros_boot_mode coreos-base/vboot_reference coreos-base/update_engine - coreos-base/coreos-installer coreos-base/coreos-init coreos-base/coreos-cloudinit coreos-base/coretest