diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild index 2d6c742bfa..64b58577d4 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild @@ -91,7 +91,6 @@ RDEPEND="${RDEPEND} # TODO(ifup): # coreos-base/crash-reporter -# coreos-base/metrics RDEPEND="${RDEPEND} app-emulation/xenstore diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/metrics/metrics-0.0.1-r87.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/metrics/metrics-0.0.1-r87.ebuild deleted file mode 100644 index ebcbbdac81..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/metrics/metrics-0.0.1-r87.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" -CROS_WORKON_COMMIT="023af3b10511f328ae9f0f69868153aecaf320e3" -CROS_WORKON_TREE="9f3e891c2d2a00256d984bd2b937bc10bebbdc0b" -CROS_WORKON_PROJECT="chromiumos/platform/metrics" - -inherit cros-debug cros-workon - -DESCRIPTION="Chrome OS Metrics Collection Utilities" -HOMEPAGE="http://www.chromium.org/" -SRC_URI="" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="" - -LIBCHROME_VERS="180609" - -RDEPEND="coreos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] - coreos-base/libchromeos - dev-cpp/gflags - dev-libs/dbus-glib - >=dev-libs/glib-2.0 - sys-apps/dbus - sys-apps/rootdev - " -DEPEND="${RDEPEND} - dev-cpp/gmock - dev-cpp/gtest - " - -src_compile() { - tc-export CXX AR PKG_CONFIG - cros-debug-add-NDEBUG - export BASE_VER=${LIBCHROME_VERS} - emake -} - -src_test() { - tc-export CXX AR PKG_CONFIG - cros-debug-add-NDEBUG - emake tests - if ! use x86 && ! use amd64 ; then - elog "Skipping unit tests on non-x86 platform" - else - for test in ./*_test; do - # Always test the shared object we just built by - # adding . to the library path. - LD_LIBRARY_PATH=.:${LD_LIBRARY_PATH} \ - "${test}" ${GTEST_ARGS} || die "${test} failed" - done - fi -} - -src_install() { - dobin metrics_{client,daemon} syslog_parser.sh - - dolib.so libmetrics.so - - insinto /usr/include/metrics - doins c_metrics_library.h metrics_library{,_mock}.h timer{,_mock}.h -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/metrics/metrics-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/metrics/metrics-9999.ebuild deleted file mode 100644 index f6dd7b3cf6..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/metrics/metrics-9999.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" -CROS_WORKON_PROJECT="chromiumos/platform/metrics" - -inherit cros-debug cros-workon - -DESCRIPTION="Chrome OS Metrics Collection Utilities" -HOMEPAGE="http://www.chromium.org/" -SRC_URI="" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -LIBCHROME_VERS="180609" - -RDEPEND="chromeos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] - chromeos-base/libchromeos - dev-cpp/gflags - dev-libs/dbus-glib - >=dev-libs/glib-2.0 - sys-apps/dbus - sys-apps/rootdev - " -DEPEND="${RDEPEND} - dev-cpp/gmock - dev-cpp/gtest - " - -src_compile() { - tc-export CXX AR PKG_CONFIG - cros-debug-add-NDEBUG - export BASE_VER=${LIBCHROME_VERS} - emake -} - -src_test() { - tc-export CXX AR PKG_CONFIG - cros-debug-add-NDEBUG - emake tests - if ! use x86 && ! use amd64 ; then - elog "Skipping unit tests on non-x86 platform" - else - for test in ./*_test; do - # Always test the shared object we just built by - # adding . to the library path. - LD_LIBRARY_PATH=.:${LD_LIBRARY_PATH} \ - "${test}" ${GTEST_ARGS} || die "${test} failed" - done - fi -} - -src_install() { - dobin metrics_{client,daemon} syslog_parser.sh - - dolib.so libmetrics.so - - insinto /usr/include/metrics - doins c_metrics_library.h metrics_library{,_mock}.h timer{,_mock}.h -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r394.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r395.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r394.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r395.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 b2bcdcf6f1..fe3d82aee6 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 @@ -8,7 +8,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~x86" else - CROS_WORKON_COMMIT="574bb572abea8c713efa9a858102bfdd175c9e77" + CROS_WORKON_COMMIT="9346a95ab688b3cb416758a0d2a6038ea5e8b0ed" KEYWORDS="amd64 arm x86" fi @@ -29,7 +29,6 @@ RDEPEND="!coreos-base/coreos-installer coreos-base/coreos-au-key coreos-base/libchrome:${LIBCHROME_VERS}[cros-debug=] coreos-base/libchromeos - coreos-base/metrics coreos-base/verity dev-cpp/gflags dev-libs/dbus-glib