From f35bb80c4f04af75cd1f3f964a0ff3479efa4bd2 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 18 Oct 2016 14:52:42 -0700 Subject: [PATCH] coreos-base/coreos-oem-gce: build by default This adds the GCE ACI meta-package to board-packages so a binary package gets built for it on the first build_packages run. It also moves the CoreOS-specific glibc dependencies from the GCE Python ebuild onto the meta-package. --- .../google-compute-engine-20160930.ebuild | 4 +--- .../coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1.ebuild | 2 ++ ...ackages-0.0.1-r7.ebuild => board-packages-0.0.1-r8.ebuild} | 0 .../coreos-devel/board-packages/board-packages-0.0.1.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/{board-packages-0.0.1-r7.ebuild => board-packages-0.0.1-r8.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/google-compute-engine-20160930.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/google-compute-engine-20160930.ebuild index 781470b0cb..56092ae0d3 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/google-compute-engine-20160930.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-engine/google-compute-engine-20160930.ebuild @@ -16,7 +16,7 @@ IUSE="" DEPEND="dev-python/setuptools" -# These dependencies cover everything possibly called by the scripts. +# These dependencies cover all commands called by the scripts. RDEPEND=" app-admin/sudo dev-python/boto @@ -26,8 +26,6 @@ RDEPEND=" sys-apps/grep sys-apps/iproute2 sys-apps/shadow - sys-libs/glibc - sys-libs/nss-usrfiles " S="${WORKDIR}/compute-image-packages-${PV}" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1.ebuild index f078935872..d42d1befb7 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/coreos-oem-gce-0.0.1.ebuild @@ -13,4 +13,6 @@ IUSE="" RDEPEND=" app-emulation/google-compute-engine + sys-libs/glibc + sys-libs/nss-usrfiles " diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1-r7.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1-r8.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1-r7.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1-r8.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild index 441c891069..87d2d5ab48 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild @@ -16,9 +16,9 @@ IUSE="" DEPEND="" RDEPEND=" amd64? ( - app-emulation/google-compute-engine app-emulation/open-vm-tools app-emulation/wa-linux-agent + coreos-base/coreos-oem-gce coreos-base/nova-agent-container coreos-base/nova-agent-watcher dev-lang/python-oem