From 5c6205cd3af894f2e0ae931d5037621c9697a040 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 17 Jun 2015 14:33:49 -0700 Subject: [PATCH] coreos: add jq to base image Needed by an OEM and it is a small/general-enough thing that it seems better to ship in the image than try to stick it into the OEM partition. --- .../{coreos-0.0.1-r255.ebuild => coreos-0.0.1-r256.ebuild} | 0 .../coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild | 1 + .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 2 ++ 3 files changed, 3 insertions(+) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r255.ebuild => coreos-0.0.1-r256.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r255.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r256.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r255.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r256.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild index 7a7e9f7ff4..aadc2e4cc7 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild @@ -104,6 +104,7 @@ RDEPEND="${RDEPEND} app-arch/tar app-arch/unzip app-arch/zip + app-misc/jq app-shells/bash coreos-base/update_engine coreos-base/coreos-init 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 2c2a89a148..353eecd80b 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 @@ -116,3 +116,5 @@ dev-util/checkbashisms # fix for https://github.com/coreos/bugs/issues/324 =net-misc/curl-7.41 +# link jq binary dynamically +=app-misc/jq-1.4-r1