From bfadbfd62ac61d74092cef8129bf4b88e966998c Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Wed, 2 Mar 2016 14:34:39 -0800 Subject: [PATCH] profiles/coreos: accept app-misc/jq-1.5-r1 --- .../profiles/coreos/arm64/package.accept_keywords | 1 - .../profiles/coreos/base/package.accept_keywords | 4 ++-- 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 9db4dd8c4d..df1f0eec6c 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 @@ -65,7 +65,6 @@ net-fs/nfs-utils ~arm64 =net-firewall/ipset-6.24 ** =sys-fs/mdadm-3.3.2-r1 ** =sys-apps/rng-tools-5 ** -=app-misc/jq-1.4-r1 ** =net-misc/iperf-3.0.7 ** =dev-libs/liblinear-196-r1 ** 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 074c712b96..9e5ba416bb 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 @@ -56,8 +56,8 @@ dev-util/checkbashisms # Fixes findmnt with overlay and btrfs filesystems =sys-apps/util-linux-2.26.1 -# link jq binary dynamically -=app-misc/jq-1.4-r1 +# 1.5 has fixed version string. coreos/bugs#455 +=app-misc/jq-1.5-r1 ~amd64 ~arm64 # https://bugs.gentoo.org/show_bug.cgi?id=548158 =sys-apps/gentoo-functions-0.10