From 146f6f917a2a32d61b974799c3320f6b745f2eb4 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Mon, 15 Jul 2013 16:35:56 -0700 Subject: [PATCH 1/6] chore(coreos-installer): fixup the header details --- .../coreos-installer/coreos-installer-0.0.1-r278.ebuild | 3 +-- .../coreos-base/coreos-installer/coreos-installer-9999.ebuild | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r278.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r278.ebuild index 81ea565a96..733668c052 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r278.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r278.ebuild @@ -11,8 +11,7 @@ CROS_WORKON_REPO="git://github.com" inherit cros-workon cros-debug cros-au -DESCRIPTION="Chrome OS Installer" -HOMEPAGE="http://www.chromium.org/" +DESCRIPTION="CoreOS Installer" SRC_URI="" LICENSE="BSD" 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 index 695fa6c746..4cb4b954bc 100644 --- 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 @@ -9,8 +9,7 @@ CROS_WORKON_REPO="git://github.com" inherit cros-workon cros-debug cros-au -DESCRIPTION="Chrome OS Installer" -HOMEPAGE="http://www.chromium.org/" +DESCRIPTION="CoreOS Installer" SRC_URI="" LICENSE="BSD" From 24e767d538a430d0cebb070c9c1a6a5423e7260a Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Mon, 15 Jul 2013 16:36:24 -0700 Subject: [PATCH 2/6] feat(coreos-installer): install coreos- prefixed commands --- .../coreos-installer/coreos-installer-0.0.1-r278.ebuild | 1 + .../coreos-base/coreos-installer/coreos-installer-9999.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r278.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r278.ebuild index 733668c052..fd880858f1 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r278.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r278.ebuild @@ -79,4 +79,5 @@ src_install() { 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 index 4cb4b954bc..97a2c0eec3 100644 --- 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 @@ -77,4 +77,5 @@ src_install() { exeinto /${path} doexe chromeos-* + doexe coreos-* } From 587d4c1a996f864ce95621ae9cf0e2ec9798cb4d Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Mon, 15 Jul 2013 16:36:51 -0700 Subject: [PATCH 3/6] fix(coreos-installer): fixup deps in -9999 ebuild the verity package moved to coreos. Fix. --- .../coreos-base/coreos-installer/coreos-installer-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 97a2c0eec3..4bbee7568d 100644 --- 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 @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm ~x86" IUSE="32bit_au cros_host" DEPEND=" - chromeos-base/verity + coreos-base/verity dev-cpp/gmock" # TODO(adlr): remove coreutils dep if we move to busybox From 8c45cb7feec66a667fae304c7f0be2f637007c12 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Wed, 17 Jul 2013 11:28:19 -0700 Subject: [PATCH 4/6] chore(coreos-installer): use the symlink style versioning --- .../coreos-installer-0.0.1-r278.ebuild | 84 +------------------ .../coreos-installer-0.0.1.ebuild | 83 ++++++++++++++++++ 2 files changed, 84 insertions(+), 83 deletions(-) mode change 100644 => 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r278.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r278.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r278.ebuild deleted file mode 100644 index fd880858f1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r278.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="0aa57d238f41ea3e57287c93fb5a6792799e1c04" -CROS_WORKON_TREE="6de051af53074e2253d89fbb5a808bcea591267c" -CROS_WORKON_PROJECT="coreos/installer" -CROS_WORKON_LOCALNAME="installer" -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-0.0.1-r278.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r278.ebuild new file mode 120000 index 0000000000..a3292c7fa4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r278.ebuild @@ -0,0 +1 @@ +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 new file mode 100644 index 0000000000..fd880858f1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1.ebuild @@ -0,0 +1,83 @@ +# 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="0aa57d238f41ea3e57287c93fb5a6792799e1c04" +CROS_WORKON_TREE="6de051af53074e2253d89fbb5a808bcea591267c" +CROS_WORKON_PROJECT="coreos/installer" +CROS_WORKON_LOCALNAME="installer" +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-* +} From e0ca2d2e6cfab8a86d7bcb7b200a15b918368c1b Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Wed, 17 Jul 2013 11:29:31 -0700 Subject: [PATCH 5/6] bump(coreos-installer): get the lastest version this introduces the new coreos-setgoodroot code --- ...er-0.0.1-r278.ebuild => coreos-installer-0.0.1-r279.ebuild} | 0 .../coreos-base/coreos-installer/coreos-installer-0.0.1.ebuild | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/{coreos-installer-0.0.1-r278.ebuild => coreos-installer-0.0.1-r279.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r278.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r279.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r278.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-installer/coreos-installer-0.0.1-r279.ebuild 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 index fd880858f1..6f93269e48 100644 --- 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 @@ -2,8 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="4" -CROS_WORKON_COMMIT="0aa57d238f41ea3e57287c93fb5a6792799e1c04" -CROS_WORKON_TREE="6de051af53074e2253d89fbb5a808bcea591267c" +CROS_WORKON_COMMIT="9d8159f6ce5902652f377ebbb19c86e844356c85" CROS_WORKON_PROJECT="coreos/installer" CROS_WORKON_LOCALNAME="installer" CROS_WORKON_OUTOFTREE_BUILD=1 From 8225c3673ec27f55080db93230622005a579cb7c Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Wed, 17 Jul 2013 11:30:46 -0700 Subject: [PATCH 6/6] bump(update_engine): use coreos-setnextroot --- ...engine-0.0.1-r373.ebuild => update_engine-0.0.1-r374.ebuild} | 0 .../coreos-base/update_engine/update_engine-0.0.1.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.0.1-r373.ebuild => update_engine-0.0.1-r374.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r373.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r374.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r373.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r374.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild index 480399c74e..c16f8a1c14 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="4" -CROS_WORKON_COMMIT="0a4f48dbf9585c45a5953ba37370afeb303717a5" +CROS_WORKON_COMMIT="30e8455fb95d83fc6dae82a504c6d16273a7775e" CROS_WORKON_PROJECT="coreos/update_engine" CROS_WORKON_REPO="git://github.com"