Merge pull request #655 from marineam/updates

Updates
This commit is contained in:
Michael Marineau 2014-06-04 14:53:58 -07:00
commit e330802704
9 changed files with 3 additions and 133 deletions

View File

@ -91,7 +91,6 @@ RDEPEND="${RDEPEND}
# TODO(ifup):
# coreos-base/crash-reporter
# coreos-base/metrics
RDEPEND="${RDEPEND}
app-emulation/xenstore

View File

@ -10,7 +10,7 @@ CROS_WORKON_LOCALDIR="src/platform"
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~x86"
else
CROS_WORKON_COMMIT="077663062baa7c81f20a8ad25b6ddb226a56eede"
CROS_WORKON_COMMIT="d5c4968e694f2d56779562142803ff2cbe8052ab"
KEYWORDS="amd64 arm x86"
fi

View File

@ -10,7 +10,7 @@ CROS_WORKON_LOCALDIR="src/platform"
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~x86"
else
CROS_WORKON_COMMIT="4b158cdacf0fa4c16933e401dd11962b3c6d9838"
CROS_WORKON_COMMIT="d5c4968e694f2d56779562142803ff2cbe8052ab"
KEYWORDS="amd64 arm x86"
fi

View File

@ -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
}

View File

@ -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
}

View File

@ -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