From b3789e2f411e18c20225b4f8ade875019b0c72d9 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 30 Apr 2014 16:30:10 -0700 Subject: [PATCH 1/3] fix(coreos-base/update_engine): Install update signing key via ebuild. This removes the need to perform this step during build_image. --- ..._engine-0.0.1-r389.ebuild => update_engine-0.0.1-r390.ebuild} | 0 .../coreos-base/update_engine/update_engine-9999.ebuild | 1 + 2 files changed, 1 insertion(+) rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.0.1-r389.ebuild => update_engine-0.0.1-r390.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r389.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r390.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r389.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r390.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 7582e046ae..9791cb151b 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 @@ -26,6 +26,7 @@ LIBCHROME_VERS="180609" RDEPEND="!coreos-base/coreos-installer app-arch/bzip2 + coreos-base/coreos-au-key coreos-base/coreos-ca-certificates coreos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] coreos-base/libchromeos From 67f1ae115e4fda5193b629b76ee0388f242dc005 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 1 May 2014 09:54:04 -0700 Subject: [PATCH 2/3] feat(coreos-base/coreos-au-key): Install signing key in SDK This just means tools looking for the test key don't need to point at the long and screwy path into the coreos-overlay repo. --- ...s-au-key-0.0.1-r2.ebuild => coreos-au-key-0.0.1-r3.ebuild} | 0 .../coreos-base/coreos-au-key/coreos-au-key-0.0.1.ebuild | 4 ++++ 2 files changed, 4 insertions(+) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/{coreos-au-key-0.0.1-r2.ebuild => coreos-au-key-0.0.1-r3.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/coreos-au-key-0.0.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/coreos-au-key-0.0.1-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/coreos-au-key-0.0.1-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/coreos-au-key-0.0.1-r3.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/coreos-au-key-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/coreos-au-key-0.0.1.ebuild index 53bbe6c821..7e8086269b 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/coreos-au-key-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/coreos-au-key-0.0.1.ebuild @@ -12,9 +12,13 @@ SRC_URI="" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 arm x86" +IUSE="cros_host" src_install() { KEY_DIR=/usr/share/update_engine/ insinto "${KEY_DIR}" doins "${FILESDIR}"/update-payload-key.pub.pem + if use cros_host; then + doins "${FILESDIR}"/update-payload-key.key.pem + fi } From 143031536257de83c7182d94aa925ec2bbb1452b Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 1 May 2014 10:07:54 -0700 Subject: [PATCH 3/3] bump(coreos-base/cros-devutils): Sign updates generated by devserver --- ...vutils-0.0.1-r527.ebuild => cros-devutils-0.0.1-r528.ebuild} | 0 .../coreos-base/cros-devutils/cros-devutils-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/{cros-devutils-0.0.1-r527.ebuild => cros-devutils-0.0.1-r528.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1-r527.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1-r528.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1-r527.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1-r528.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-9999.ebuild index 3a4a143971..a09d1a64e2 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_LOCALDIR="src/platform" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~x86" else - CROS_WORKON_COMMIT="4b158cdacf0fa4c16933e401dd11962b3c6d9838" + CROS_WORKON_COMMIT="077663062baa7c81f20a8ad25b6ddb226a56eede" KEYWORDS="amd64 arm x86" fi