From 5ca565eb91e17a8461b7a122019562e3f9984e41 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 5 Apr 2018 16:10:32 -0400 Subject: [PATCH 1/5] coreos/config/env: Drop configuration for the removed gmock --- .../coreos-overlay/coreos/config/env/dev-cpp/gmock | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/config/env/dev-cpp/gmock diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/dev-cpp/gmock b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/dev-cpp/gmock deleted file mode 100644 index 4b1016e9cc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/dev-cpp/gmock +++ /dev/null @@ -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 -} From f7a585450215a7b7cd52825bc1bf2488e38f1cbd Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 5 Apr 2018 16:11:35 -0400 Subject: [PATCH 2/5] coreos-base/update_engine: Drop the gmock build dependency --- .../coreos-base/update_engine/update_engine-9999.ebuild | 3 +-- 1 file changed, 1 insertion(+), 2 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 d89d97d6f7..3c2561a61f 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 @@ -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() { From 2c3238fd4a7a7b1ca1c359eb10c5e1f09306e544 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 5 Apr 2018 16:14:07 -0400 Subject: [PATCH 3/5] profiles: Sync gflags and glog versions on arm64 --- .../profiles/coreos/arm64/package.accept_keywords | 4 ++-- .../profiles/coreos/base/package.accept_keywords | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords index 0ef06037c2..49f9726a51 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords @@ -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 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index df4162ea45..88f9c8c8c7 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -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 From 2cc0b1513aaa401de86cc03cc075bb1db86b3ab5 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 5 Apr 2018 16:50:25 -0400 Subject: [PATCH 4/5] profiles: Don't install cmake on the boards It doesn't cross-compile, and only the host command is needed. --- .../profiles/coreos/targets/generic/package.provided | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.provided b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.provided index 25f99a356e..c848732293 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.provided +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.provided @@ -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 From 9518505ee9a8147e0a4de7712617e805c246bf9e Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 5 Apr 2018 16:59:34 -0400 Subject: [PATCH 5/5] coreos-base/update_engine: Bump to 0.4.6 --- .../{update_engine-0.4.5.ebuild => update_engine-0.4.6.ebuild} | 0 .../coreos-base/update_engine/update_engine-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.4.5.ebuild => update_engine-0.4.6.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.5.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.6.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.5.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.6.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 3c2561a61f..d05ccf2a87 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 @@ -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