From 7f33fd307cc26598bcd26b00d1f5bd8dc42b07e7 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 2 Jul 2015 14:08:12 -0700 Subject: [PATCH 1/2] Revert "Revert "update_engine: lots of updates"" This reverts commit 7bbc88c31ce48c6da6fb6fd1c1bf9d3927825d9f. --- ...e_engine-0.1.0-r3.ebuild => update_engine-0.1.0-r4.ebuild} | 0 .../coreos-base/update_engine/update_engine-9999.ebuild | 4 +--- 2 files changed, 1 insertion(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.1.0-r3.ebuild => update_engine-0.1.0-r4.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.1.0-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.1.0-r4.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.1.0-r3.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.1.0-r4.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 9650fd7980..cf1723410e 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 @@ -5,13 +5,11 @@ EAPI=5 CROS_WORKON_PROJECT="coreos/update_engine" CROS_WORKON_REPO="git://github.com" AUTOTOOLS_AUTORECONF=1 -# TODO: this can be disabled once -I.. is no longer used -AUTOTOOLS_IN_SOURCE_BUILD=1 if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="c88492c39ec0ad81bb26ae6efde7b4fc46a9804a" + CROS_WORKON_COMMIT="f79c8f95dd8bd2a0c532d1922869e2e602be8037" KEYWORDS="amd64 arm arm64 x86" fi From a437c096fe9c148e607eaffed0092629e0c83b66 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 2 Jul 2015 14:09:56 -0700 Subject: [PATCH 2/2] update_engine: update to latest, fixes kernel payload code --- ...ate_engine-0.1.0-r4.ebuild => update_engine-0.1.0-r5.ebuild} | 0 .../coreos-base/update_engine/update_engine-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.1.0-r4.ebuild => update_engine-0.1.0-r5.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.1.0-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.1.0-r5.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.1.0-r4.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.1.0-r5.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 cf1723410e..fc29fba676 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 @@ -9,7 +9,7 @@ AUTOTOOLS_AUTORECONF=1 if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="f79c8f95dd8bd2a0c532d1922869e2e602be8037" + CROS_WORKON_COMMIT="911c99bc41037be13f773a31fe2f5fdb8fc0ae02" KEYWORDS="amd64 arm arm64 x86" fi