From 31270815047e11369b68ad242dc41cb68d2235e8 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 27 May 2015 12:10:55 -0700 Subject: [PATCH] Revert "update_engine: lots of updates" This reverts commit 4dbfe48bd20b036a11c30538e3ce5cdfb5bb1715: - remove call to crossystem - support for payloads that include kernels - lots of refactoring/cleanups The support for kernel payloads broke updates on systems that did not already have the newer /boot/coreos/vmlinuz-{a,b} kernels. Rolling back does restore the call to /usr/bin/crossystem but that call failing shouldn't have any adverse behavior, just it will just add yet another useless error message to our logs. --- ...e_engine-0.1.0-r4.ebuild => update_engine-0.1.0-r3.ebuild} | 0 .../coreos-base/update_engine/update_engine-9999.ebuild | 4 +++- 2 files changed, 3 insertions(+), 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-r3.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-r3.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-r3.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..9650fd7980 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,11 +5,13 @@ 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="f79c8f95dd8bd2a0c532d1922869e2e602be8037" + CROS_WORKON_COMMIT="c88492c39ec0ad81bb26ae6efde7b4fc46a9804a" KEYWORDS="amd64 arm arm64 x86" fi