mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-23 07:21:14 +02:00
bump(coreos-base/update_engine): New update_engine, no more metrics.
This update removes the dependency on the ChromeOS metrics library that we never made use of in CoreOS.
This commit is contained in:
parent
8325b51a6d
commit
3b9a91e464
@ -91,7 +91,6 @@ RDEPEND="${RDEPEND}
|
|||||||
|
|
||||||
# TODO(ifup):
|
# TODO(ifup):
|
||||||
# coreos-base/crash-reporter
|
# coreos-base/crash-reporter
|
||||||
# coreos-base/metrics
|
|
||||||
|
|
||||||
RDEPEND="${RDEPEND}
|
RDEPEND="${RDEPEND}
|
||||||
app-emulation/xenstore
|
app-emulation/xenstore
|
||||||
|
@ -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
|
|
||||||
}
|
|
@ -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
|
|
||||||
}
|
|
@ -8,7 +8,7 @@ CROS_WORKON_REPO="git://github.com"
|
|||||||
if [[ "${PV}" == 9999 ]]; then
|
if [[ "${PV}" == 9999 ]]; then
|
||||||
KEYWORDS="~amd64 ~arm ~x86"
|
KEYWORDS="~amd64 ~arm ~x86"
|
||||||
else
|
else
|
||||||
CROS_WORKON_COMMIT="574bb572abea8c713efa9a858102bfdd175c9e77"
|
CROS_WORKON_COMMIT="9346a95ab688b3cb416758a0d2a6038ea5e8b0ed"
|
||||||
KEYWORDS="amd64 arm x86"
|
KEYWORDS="amd64 arm x86"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -29,7 +29,6 @@ RDEPEND="!coreos-base/coreos-installer
|
|||||||
coreos-base/coreos-au-key
|
coreos-base/coreos-au-key
|
||||||
coreos-base/libchrome:${LIBCHROME_VERS}[cros-debug=]
|
coreos-base/libchrome:${LIBCHROME_VERS}[cros-debug=]
|
||||||
coreos-base/libchromeos
|
coreos-base/libchromeos
|
||||||
coreos-base/metrics
|
|
||||||
coreos-base/verity
|
coreos-base/verity
|
||||||
dev-cpp/gflags
|
dev-cpp/gflags
|
||||||
dev-libs/dbus-glib
|
dev-libs/dbus-glib
|
||||||
|
Loading…
x
Reference in New Issue
Block a user