From 26a596048928986019ff948457333edb29d52c46 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Mon, 16 Oct 2017 18:48:42 -0700 Subject: [PATCH 1/2] profiles: accept socat for arm64 We could have picked either readline or ssl as a thing to remove in package.use since the license issue is ssl XOR readline. I arbitrarily picked ssl. The primary consumer of socat, the kubelet, needs neither. --- .../profiles/coreos/arm64/package.accept_keywords | 1 + .../coreos-overlay/profiles/coreos/base/package.use | 4 ++++ 2 files changed, 5 insertions(+) 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 03e2f4588b..8794385f7d 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 @@ -31,6 +31,7 @@ =net-misc/bridge-utils-1.5 ~arm64 =net-misc/curl-7.55.1 ~arm64 =net-misc/iperf-3.1.3 ** +=net-misc/socat-1.7.3.2 ~arm64 =net-nds/openldap-2.4.44 ~arm64 =perl-core/File-Path-2.130.0 ~arm64 =sys-apps/gptfdisk-1.0.1 ~arm64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use index 064cd58fe7..0599628c3a 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use @@ -99,3 +99,7 @@ sys-process/lsof rpc selinux # Don't include etcd2's etcdctl so we can include the newer version via the # etcdctl package dev-db/etcd -etcdctl + +# can be removed with socat-2.0.0; this is the openssl/readline license +# incompatibility +net-misc/socat -ssl From 22ce951b353fb74989b0d4841a31a87a6f24f302 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Tue, 17 Oct 2017 11:52:49 -0700 Subject: [PATCH 2/2] coreos-base/coreos: add socat to base image This is being added in no small part to better support running the kubelet in more ways. It adds up to a few hundred kbs of disk usage, and the benefit is some tooling which desires to install the kubelet as a static binary on the host can do so with fewer problems. --- .../{coreos-0.0.1-r288.ebuild => coreos-0.0.1-r289.ebuild} | 0 .../coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild | 1 + 2 files changed, 1 insertion(+) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r288.ebuild => coreos-0.0.1-r289.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r288.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r289.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r288.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r289.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 ad824103b7..6c0471d6a1 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 @@ -129,6 +129,7 @@ RDEPEND="${RDEPEND} net-misc/iputils net-misc/ntp net-misc/rsync + net-misc/socat net-misc/wget net-misc/whois sys-apps/coreutils