From c3c0d34695d70788457cc35ac547f6b068352e12 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 17 Feb 2016 11:32:01 -0800 Subject: [PATCH 1/3] coreos-base/coreos: clean up dep list Make alphabetical and group amd64-only stuff together. --- .../coreos-base/coreos/coreos-0.0.1.ebuild | 46 ++++++++----------- 1 file changed, 20 insertions(+), 26 deletions(-) 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 c9d5f3694e..57ec372fd2 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 @@ -63,18 +63,7 @@ IUSE="etcd_protocols_1 etcd_protocols_2 selinux" # ################################################################################ -RDEPEND="${RDEPEND} - virtual/linux-sources - " - -RDEPEND="${RDEPEND} >=sys-apps/baselayout-2.0.0" - -# Specifically include the editor we want to appear in chromeos images, so that -# it is deterministic which editor is chosen by 'virtual/editor' dependencies -# (such as in the 'sudo' package). See crosbug.com/5777. -RDEPEND="${RDEPEND} - app-editors/vim - " +RDEPEND=">=sys-apps/baselayout-3.0.0" # Select between versions of etcd # If protocol 1 is installed it must be configured to provide the default @@ -95,12 +84,14 @@ RDEPEND="${RDEPEND} sec-policy/selinux-virt )" +# Only applicable or available on amd64 +RDEPEND="${RDEPEND} + amd64? ( + app-emulation/rkt[actool] + app-emulation/xenserver-pv-version + )" + RDEPEND="${RDEPEND} - amd64? ( app-emulation/rkt[actool] ) - app-emulation/xenstore - amd64? ( app-emulation/xenserver-pv-version ) - sys-apps/findutils - sys-apps/which app-admin/flannel app-admin/fleet app-admin/kubelet @@ -112,22 +103,30 @@ RDEPEND="${RDEPEND} app-arch/tar app-arch/unzip app-arch/zip + app-crypt/gnupg app-crypt/go-tspi + app-editors/vim + app-emulation/docker + app-emulation/xenstore + app-misc/ca-certificates app-misc/jq app-shells/bash - coreos-base/update_engine - coreos-base/coreos-init coreos-base/coreos-cloudinit + coreos-base/coreos-init coreos-base/coreos-metadata coreos-base/coretest + coreos-base/update_engine dev-util/strace + dev-vcs/git net-analyzer/nmap net-dns/bind-tools net-firewall/ebtables net-firewall/ipset net-firewall/iptables + net-fs/nfs-utils net-misc/bridge-utils net-misc/dhcpcd + net-misc/iputils net-misc/ntp net-misc/rsync net-misc/wget @@ -135,6 +134,7 @@ RDEPEND="${RDEPEND} sys-apps/coreutils sys-apps/dbus sys-apps/ethtool + sys-apps/findutils sys-apps/gawk sys-apps/grep sys-apps/iproute2 @@ -150,6 +150,7 @@ RDEPEND="${RDEPEND} sys-apps/shadow sys-apps/usbutils sys-apps/util-linux + sys-apps/which sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm @@ -161,11 +162,4 @@ RDEPEND="${RDEPEND} sys-libs/timezone-data sys-process/lsof sys-process/procps - app-emulation/docker - app-misc/ca-certificates - app-crypt/gnupg - virtual/udev - net-fs/nfs-utils - net-misc/iputils - dev-vcs/git " From ab9daa3e322bb287c451541e23a381399fa36b0c Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 17 Feb 2016 11:38:37 -0800 Subject: [PATCH 2/3] coreos-base/coreos: move a few packages to amd64-only go-tspi is for TPM support in rkt, rkt is currently amd64 and does arm64 even have TPMs? xenstore is related to the xenserver hack which is amd64-only. The kublet package is deprecated so don't bother with it outside amd64. --- .../coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 57ec372fd2..e15703c074 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 @@ -87,14 +87,16 @@ RDEPEND="${RDEPEND} # Only applicable or available on amd64 RDEPEND="${RDEPEND} amd64? ( + app-admin/kubelet + app-crypt/go-tspi app-emulation/rkt[actool] app-emulation/xenserver-pv-version + app-emulation/xenstore )" RDEPEND="${RDEPEND} app-admin/flannel app-admin/fleet - app-admin/kubelet app-admin/locksmith app-admin/mayday app-admin/sudo @@ -104,10 +106,8 @@ RDEPEND="${RDEPEND} app-arch/unzip app-arch/zip app-crypt/gnupg - app-crypt/go-tspi app-editors/vim app-emulation/docker - app-emulation/xenstore app-misc/ca-certificates app-misc/jq app-shells/bash From 463f9373e9d0fc6f0cba4b8ab287d2d14af98be4 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 17 Feb 2016 11:42:37 -0800 Subject: [PATCH 3/3] coreos-base/coreos: add new kublet wrapper script to amd64 images --- .../{coreos-0.0.1-r264.ebuild => coreos-0.0.1-r265.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-r264.ebuild => coreos-0.0.1-r265.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r264.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r265.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r264.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r265.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 e15703c074..77f4400c7c 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 @@ -88,6 +88,7 @@ RDEPEND="${RDEPEND} RDEPEND="${RDEPEND} amd64? ( app-admin/kubelet + app-admin/kubelet-wrapper app-crypt/go-tspi app-emulation/rkt[actool] app-emulation/xenserver-pv-version