From 4292c9852f3ad1ff3605c0dba47b5717c3a0bb0e Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 11 May 2016 18:06:27 -0700 Subject: [PATCH] update_engine: update live ebuild, adding glog and removing libchrome --- .../coreos-base/update_engine/update_engine-9999.ebuild | 6 +----- .../coreos-overlay/profiles/coreos/base/package.use | 3 +++ 2 files changed, 4 insertions(+), 5 deletions(-) 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..d1600bcaa3 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,8 +5,6 @@ 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" @@ -25,13 +23,11 @@ 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-cpp/glog[gflags] dev-libs/dbus-glib dev-libs/glib dev-libs/libxml2 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use index b096dfd572..739d48cf32 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use @@ -72,3 +72,6 @@ sys-auth/sssd -manpages -python # needed for realmd build sys-auth/polkit introspection + +# enable logging command-line options in update_engine +dev-cpp/glog gflags