From f9dcefb00c0ca2a952a65bd7d97cdfd868474354 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Thu, 21 Feb 2013 17:13:10 -0800 Subject: [PATCH] fix(coreos/hard-host-depends): add the installer this is required for build image --- .../coreos-installer-0.0.1-r265.ebuild | 78 +++++++++++++++++++ .../coreos-installer-9999.ebuild | 78 +++++++++++++++++++ .../hard-host-depends-0.0.1.ebuild | 1 + 3 files changed, 157 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r265.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-9999.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r265.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r265.ebuild new file mode 100644 index 0000000000..7999c3d219 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r265.ebuild @@ -0,0 +1,78 @@ +# 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="3933b7af319b131d958803261fd318ab1964b9a1" +CROS_WORKON_TREE="e5c05be79112b34348527a8b17d8b287d91a9140" +CROS_WORKON_PROJECT="chromiumos/platform/installer" +CROS_WORKON_LOCALNAME="installer" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-workon cros-debug cros-au + +DESCRIPTION="Chrome OS Installer" +HOMEPAGE="http://www.chromium.org/" +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 + 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/ + + 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() { + 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-* +} 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 new file mode 100644 index 0000000000..474408bb46 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-9999.ebuild @@ -0,0 +1,78 @@ +# 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="chromiumos/platform/installer" +CROS_WORKON_LOCALNAME="installer" +CROS_WORKON_OUTOFTREE_BUILD=1 + +inherit cros-workon cros-debug cros-au + +DESCRIPTION="Chrome OS Installer" +HOMEPAGE="http://www.chromium.org/" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="32bit_au cros_host" + +DEPEND=" + chromeos-base/verity + dev-cpp/gmock" + +# TODO(adlr): remove coreutils dep if we move to busybox +RDEPEND=" + app-admin/sudo + coreos-base/vboot_reference + coreos-base/vpd + 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/ + + 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() { + 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-* +} 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 c19b9476a1..205e2d6912 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 @@ -45,6 +45,7 @@ RDEPEND="${RDEPEND} app-text/texi2html coreos-base/google-breakpad coreos-base/coreos-base + coreos-base/coreos-installer coreos-base/cros-devutils[cros_host] coreos-base/cros-factoryutils coreos-base/cros-testutils