From f87d2c4e3e2e5bc52967990adce21915dedbbea9 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 22 Feb 2016 18:18:39 -0800 Subject: [PATCH 1/4] oem-rackspace: split nova agent container into new package Makes the oem ebuild as small as possible. Also the new ebuild uses a tarball which simplifies dependencies and improves caching. --- .../coreos-base/nova-agent-container/Manifest | 1 + .../nova-agent-container/metadata.xml | 4 ++++ .../nova-agent-container-0.0.1.ebuild | 18 ++++++++++++++++++ ...0.0.3.ebuild => oem-rackspace-0.0.4.ebuild} | 7 +------ 4 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-container/Manifest create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-container/metadata.xml create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-container/nova-agent-container-0.0.1.ebuild rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/{oem-rackspace-0.0.3.ebuild => oem-rackspace-0.0.4.ebuild} (73%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-container/Manifest b/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-container/Manifest new file mode 100644 index 0000000000..b1077281b9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-container/Manifest @@ -0,0 +1 @@ +DIST nova-agent-container-0.0.1.tar.gz 6634988 SHA256 ccaea8ea597111d5b89649e9fb03f6a9fdf8530e69c18c8af6e059d7ac20a029 SHA512 71468307ed8d87fafcaf44d1cb48b5499a42e9902a61d97d6ea191fed3e0e81cc8c3beb61839449f5ec87f54717801d2aa56df848bfa2b6602419360e3196005 WHIRLPOOL 0989323868fcf751c8aa4381130c0607cb19f8271c531018ee7bc12676b89e0f908f3999a7da6462c4654673eed822f427ed24d93da4e46d3ea0ddf7a8cc6eed diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-container/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-container/metadata.xml new file mode 100644 index 0000000000..097975e3ad --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-container/metadata.xml @@ -0,0 +1,4 @@ + + + + diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-container/nova-agent-container-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-container/nova-agent-container-0.0.1.ebuild new file mode 100644 index 0000000000..66342e6c3d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-container/nova-agent-container-0.0.1.ebuild @@ -0,0 +1,18 @@ +# Copyright (c) 2013 CoreOS, Inc.. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +DESCRIPTION="nova agent for rackspace images" +HOMEPAGE="https://github.com/coreos/nova-agent-container" +SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +src_install() { + dodir /usr/share/oem/nova-agent + rsync -aq "${S}/" "${D}/usr/share/oem/nova-agent/" || die +} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.4.ebuild similarity index 73% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.3.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.4.ebuild index 6dec13c100..ba7867d65f 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.3.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.4.ebuild @@ -6,7 +6,6 @@ # EAPI=5 -inherit git-2 DESCRIPTION="oem suite for rackspace images" HOMEPAGE="" @@ -17,10 +16,8 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="" -EGIT_REPO_URI="https://github.com/coreos/nova-agent-container.git" -EGIT_COMMIT="44af5608e9a9e43fe83d05f03049a1f66d564930" - RDEPEND=" + coreos-base/nova-agent-container coreos-base/nova-agent-watcher " @@ -30,8 +27,6 @@ src_prepare() { } src_install() { - dodir /usr/share/oem/nova-agent - rsync --exclude=".git" -aq "${S}/" "${D}/usr/share/oem/nova-agent/" || die insinto "/usr/share/oem" doins "${T}/cloud-config.yml" doins "${FILESDIR}/grub.cfg" From f18b5c42328ffd0d36a8b6a09f9e6cc1f32114cf Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 22 Feb 2016 18:32:28 -0800 Subject: [PATCH 2/4] wa-linux-agent: use tarballs instead of git Simplifies dependencies --- .../app-emulation/wa-linux-agent/Manifest | 1 + ...14.ebuild => wa-linux-agent-2.0.14-r1.ebuild} | 16 ++++++---------- 2 files changed, 7 insertions(+), 10 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/Manifest rename sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/{wa-linux-agent-2.0.14.ebuild => wa-linux-agent-2.0.14-r1.ebuild} (66%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/Manifest new file mode 100644 index 0000000000..4f67057c2f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/Manifest @@ -0,0 +1 @@ +DIST WALinuxAgent-2.0.14.tar.gz 95535 SHA256 e5a755cb2a6c4d4a1237bb97d15532031c8574d1078b44fbbf9f273ea5cdc14c SHA512 59b9b056479657626d2b6a9e3fa0dc8711c38d1efe1378ef1a63732744e68cc44321f0a761801c1a8a66fada24b277edfccc26c172a15bfcc53eed16e4d0d98a WHIRLPOOL 991a9b6bafbb74a7db7226ca764508a91438211500de9ecc128d1475077313b73bedd2f479dde7b4392ada0282db7c39c7b06ce76aa61cb3701c1c52607e81a6 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.0.14.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.0.14-r1.ebuild similarity index 66% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.0.14.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.0.14-r1.ebuild index a581d8c46e..40c8d7a9d5 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.0.14.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.0.14-r1.ebuild @@ -1,21 +1,17 @@ -# # Copyright (c) 2014 CoreOS, Inc.. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -# $Header:$ -# -EAPI=4 +EAPI=5 -EGIT_REPO_URI="git://github.com/Azure/WALinuxAgent" -EGIT_COMMIT="54d4ebde1a626e6bd000abdfd518e150b0495f37" # WALinuxAgent-2.0.14 -EGIT_MASTER="2.0" - -inherit eutils toolchain-funcs git-2 +MY_PN="WALinuxAgent" +MY_PV="WALinuxAgent-${PV}" +MY_P="${MY_PN}-${MY_PV}" +S="${WORKDIR}/${MY_P}" DESCRIPTION="Windows Azure Linux Agent" HOMEPAGE="https://github.com/Azure/WALinuxAgent" KEYWORDS="amd64" -SRC_URI="" +SRC_URI="${HOMEPAGE}/archive/${MY_PV}.tar.gz" LICENSE="Apache-2.0" SLOT="0" From 86d03cd78f224c7f3b45bfdfa682c217569d54ef Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 22 Feb 2016 18:47:38 -0800 Subject: [PATCH 3/4] google-*: remove unused eclasses Drops pointless dep on pkg-config --- ...n-1.1.1-r2.ebuild => google-compute-daemon-1.1.1-r3.ebuild} | 3 --- ...-1.1.1-r1.ebuild => google-startup-scripts-1.1.1-r2.ebuild} | 3 --- 2 files changed, 6 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-daemon/{google-compute-daemon-1.1.1-r2.ebuild => google-compute-daemon-1.1.1-r3.ebuild} (96%) rename sdk_container/src/third_party/coreos-overlay/app-emulation/google-startup-scripts/{google-startup-scripts-1.1.1-r1.ebuild => google-startup-scripts-1.1.1-r2.ebuild} (95%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-daemon/google-compute-daemon-1.1.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-daemon/google-compute-daemon-1.1.1-r3.ebuild similarity index 96% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-daemon/google-compute-daemon-1.1.1-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-daemon/google-compute-daemon-1.1.1-r3.ebuild index 3fb43af1ac..f7df3007fd 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-daemon/google-compute-daemon-1.1.1-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/google-compute-daemon/google-compute-daemon-1.1.1-r3.ebuild @@ -1,10 +1,7 @@ -# # Copyright (c) 2014 CoreOS, Inc. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -# EAPI=5 -inherit toolchain-funcs systemd DESCRIPTION="Google Daemon for Compute Engine" HOMEPAGE="https://github.com/GoogleCloudPlatform/compute-image-packages" diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/google-startup-scripts/google-startup-scripts-1.1.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/google-startup-scripts/google-startup-scripts-1.1.1-r2.ebuild similarity index 95% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/google-startup-scripts/google-startup-scripts-1.1.1-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/google-startup-scripts/google-startup-scripts-1.1.1-r2.ebuild index a093a74c72..24458faaa8 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/google-startup-scripts/google-startup-scripts-1.1.1-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/google-startup-scripts/google-startup-scripts-1.1.1-r2.ebuild @@ -1,10 +1,7 @@ -# # Copyright (c) 2014 CoreOS, Inc. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -# EAPI=5 -inherit toolchain-funcs systemd DESCRIPTION="Google Startup Scripts for Compute Engine" HOMEPAGE="https://github.com/GoogleCloudPlatform/compute-image-packages" From dbea374c18c00cad0f0c21730087e116a9066aba Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 22 Feb 2016 19:11:22 -0800 Subject: [PATCH 4/4] board-packages: build everything that oem packages depend on The oem packages themselves conflict which makes life tricky but we should at least create binary packages for the rest. --- ...0.0.1-r2.ebuild => board-packages-0.0.1-r3.ebuild} | 0 .../board-packages/board-packages-0.0.1.ebuild | 11 +++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/{board-packages-0.0.1-r2.ebuild => board-packages-0.0.1-r3.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1-r3.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 90df011e87..d475ad95cb 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 @@ -15,8 +15,15 @@ IUSE="" DEPEND="" RDEPEND=" - amd64? ( app-emulation/open-vm-tools ) + amd64? ( + app-emulation/google-compute-daemon + app-emulation/google-startup-scripts + app-emulation/open-vm-tools + app-emulation/wa-linux-agent + coreos-base/nova-agent-container + coreos-base/nova-agent-watcher + dev-lang/python-oem + ) coreos-base/coreos coreos-base/coreos-dev - dev-lang/python-oem "