From 33f3a9b2ed6226a23573171c0aeb70309a1b9fc2 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 16 Sep 2016 16:00:52 -0700 Subject: [PATCH 1/2] update_engine: prune old version --- .../update_engine-0.1.0-r4.ebuild | 93 ------------------- 1 file changed, 93 deletions(-) delete mode 100644 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-0.1.0-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.1.0-r4.ebuild deleted file mode 100644 index f40d294dc3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.1.0-r4.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -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 - -CROS_WORKON_COMMIT="c88492c39ec0ad81bb26ae6efde7b4fc46a9804a" -KEYWORDS="amd64 arm x86" - -inherit autotools-utils flag-o-matic toolchain-funcs cros-workon systemd - -DESCRIPTION="CoreOS OS Update Engine" -HOMEPAGE="https://github.com/coreos/update_engine" -SRC_URI="" - -LICENSE="BSD" -SLOT="0" -IUSE="cros-debug cros_host -delta_generator symlink-usr" - -LIBCHROME_VERS="180609" - -RDEPEND="!coreos-base/coreos-installer - app-arch/bzip2 - coreos-base/coreos-au-key - coreos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] - dev-cpp/gflags - dev-libs/dbus-glib - dev-libs/glib - dev-libs/libxml2 - dev-libs/openssl - dev-libs/protobuf:= - dev-util/bsdiff - net-misc/curl - sys-fs/e2fsprogs" -DEPEND="dev-cpp/gmock - dev-cpp/gtest - ${RDEPEND}" - -src_configure() { - # Disable PIE when building for the SDK, this works around a bug that - # breaks using delta_generator from the update.zip bundle. - # https://code.google.com/p/chromium/issues/detail?id=394508 - # https://code.google.com/p/chromium/issues/detail?id=394241 - if use cros_host; then - append-flags -nopie - append-ldflags -nopie - fi - - local myeconfargs=( - $(use_enable cros-debug debug) - $(use_enable delta_generator) - ) - - autotools-utils_src_configure -} - -src_test() { - if use cros_host; then - autotools-utils_src_test - else - ewarn "Skipping tests on cross-compiled target platform..." - fi -} - -src_install() { - autotools-utils_src_install - - if use symlink-usr; then - dosym sbin/coreos-postinst /usr/postinst - else - dosym usr/sbin/coreos-postinst /postinst - fi - - systemd_dounit systemd/update-engine.service - systemd_dounit systemd/update-engine-stub.service - systemd_dounit systemd/update-engine-stub.timer - - systemd_enable_service multi-user.target update-engine.service - systemd_enable_service multi-user.target update-engine-stub.timer - - insinto /usr/share/dbus-1/services - doins com.coreos.update1.service - - insinto /usr/share/dbus-1/system.d - doins com.coreos.update1.conf - - # Install rule to remove old UpdateEngine.conf from /etc - systemd_dotmpfilesd "${FILESDIR}"/update-engine.conf -} From dd95c7c5d6a4618e9f26ee94a3ccf163410af52d Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 16 Sep 2016 16:02:27 -0700 Subject: [PATCH 2/2] update_engine: bump to 0.3.0, adds kernel update support --- .../{update_engine-0.2.2.ebuild => update_engine-0.3.0.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.2.2.ebuild => update_engine-0.3.0.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.2.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.3.0.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.2.2.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.3.0.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 ea5208bc3c..4f835b1ba5 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="c7da62013282f8bd9bd3ab21b9e61e1a4d1768c5" # v0.2.2 + CROS_WORKON_COMMIT="a1e9f5563bbe33ea837bf5ca2a9ba6c2619d8e91" # v0.3.0 KEYWORDS="amd64 arm64" fi