mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-10-17 18:31:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3162 from dm0-/gtest

Browse Source 
Upgrade gtest and update_engine
This commit is contained in:
David Michael 2018-04-06 08:28:34 -04:00 committed by GitHub
commit a9e432db12
6 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.5.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.6.ebuild vendored
View File

5
sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild vendored
View File

@ -9,7 +9,7 @@ AUTOTOOLS_AUTORECONF=1
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
else
CROS_WORKON_COMMIT="2319df8546738fad1cd0ca15e1e4ca8317fce990" # v0.4.5
CROS_WORKON_COMMIT="7dc60831aaabda87384779424ee01c96f4ccd686" # v0.4.6
KEYWORDS="amd64 arm64"
fi
@ -37,8 +37,7 @@ RDEPEND="!coreos-base/coreos-installer
net-misc/curl
>=sys-apps/seismograph-2.2.0
sys-fs/e2fsprogs"
DEPEND="dev-cpp/gmock
dev-cpp/gtest
DEPEND="dev-cpp/gtest
${RDEPEND}"
src_configure() {

6
sdk_container/src/third_party/coreos-overlay/coreos/config/env/dev-cpp/gmock vendored
View File

@ -1,6 +0,0 @@
# The autoconf code needs to be migrated from AC_PATH_PROG to
# AC_PATH_TOOL. http://code.google.com/p/googlemock/issues/detail?id=150
cros_pre_src_configure_gtest_config() {
[[ $(cros_target) != "board_sysroot" ]] && return 0
export ac_cv_path_GTEST_CONFIG=${CROS_BUILD_BOARD_BIN}/${CHOST}-gtest-config
}

4
sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords vendored
View File

@ -6,8 +6,8 @@
=app-arch/libarchive-3.3.1 ~arm64
=app-crypt/mit-krb5-1.14.2 ~arm64
=app-text/asciidoc-8.6.9-r3 ~arm64
=dev-cpp/gflags-2.1.2 ~arm64
=dev-cpp/glog-0.3.1 **
=dev-cpp/gflags-2.2.0 ~arm64
=dev-cpp/glog-0.3.4-r1 ~arm64
=dev-lang/perl-5.24.1-r2 ~arm64
=dev-libs/apr-util-1.5.4-r1 ~arm64
=dev-libs/elfutils-0.169-r1 ~arm64

1
sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords vendored
View File

@ -2,7 +2,6 @@
# Copyright (c) 2013 The CoreOS Authors. All rights reserved.
# Distributed under the terms of the GNU General Public License v2
=dev-cpp/gflags-2.0 ~amd64
=dev-util/shflags-1.0.3 ~amd64
=dev-util/perf-4.9.13 ~amd64
=sys-libs/libnih-1.0.3 ~amd64

3
sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.provided vendored
View File

@ -19,3 +19,6 @@ net-mail/mailbase-1.1
# elt-patches has a cyclic dependency
app-arch/xz-utils-0
# doesn't cross-compile, but required for glog, gflags, etc.
dev-util/cmake-3.7.2