From 815193f7ba658bd1ebf724e213c27bfa47acd832 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 17 May 2016 22:37:33 -0700 Subject: [PATCH] profiles: update protobuf from 1.5 to 1.6 The newer version is needed for arm64, and need the same version across all architectures because the build host and target's version must match. --- .../profiles/coreos/arm64/package.accept_keywords | 1 - .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) 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 623a6f2440..303fa1ae10 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 @@ -34,7 +34,6 @@ dev-libs/dbus-glib ~arm64 sys-block/parted ~arm64 sys-fs/btrfs-progs ~arm64 sys-apps/gptfdisk ~arm64 -dev-libs/protobuf ~arm64 sys-apps/usbutils ~arm64 net-misc/bridge-utils ~arm64 net-libs/serf ~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 2448e9b599..dcf45abf92 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 @@ -101,3 +101,5 @@ dev-util/checkbashisms # https://bugs.gentoo.org/show_bug.cgi?id=580606 =app-misc/jq-1.5-r2 ~amd64 ~arm64 +# Must use the same version across all architectures +=dev-libs/protobuf-2.6.1-r3