From d2f68d78fb7a6e42b83e96942f5658fc05aeba31 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Tue, 25 Aug 2015 11:53:21 -0700 Subject: [PATCH 1/3] coreos-base/coreos-metadata: update ebuild for go --- .../coreos-metadata/coreos-metadata-9999.ebuild | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild index d10507d055..82b3a3df70 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild @@ -5,6 +5,7 @@ EAPI=5 CROS_WORKON_PROJECT="coreos/coreos-metadata" CROS_WORKON_LOCALNAME="coreos-metadata" CROS_WORKON_REPO="git://github.com" +COREOS_GO_PACKAGE="github.com/coreos/coreos-metadata" inherit cros-workon systemd if [[ "${PV}" == 9999 ]]; then @@ -14,7 +15,7 @@ else KEYWORDS="amd64" fi -DESCRIPTION="coreos-metadata" +DESCRIPTION="A simple cloud-provider metadata agent" HOMEPAGE="https://github.com/coreos/coreos-metadata" SRC_URI="" @@ -22,17 +23,7 @@ LICENSE="Apache-2.0" SLOT="0" IUSE="" -DEPEND=" - dev-lang/rust-bin - dev-rust/cargo -" - -src_compile() { - CARGO_HOME="${WORKDIR}/.cargo" cargo build \ - --release --verbose --no-default-features || die -} - src_install() { - dobin "${S}/target/release/${PN}" + dobin "${S}/bin/${PN}" systemd_dounit "${FILESDIR}/coreos-metadata.service" } From 9e6efbf3fd0f7480d5096c50cbf8899a447e133e Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Wed, 26 Aug 2015 18:37:02 -0700 Subject: [PATCH 2/3] coreos-base/coreos-metadata: bump to v0.1.0 --- .../coreos-base/coreos-metadata/coreos-metadata-0.1.0.ebuild | 1 + .../coreos-base/coreos-metadata/coreos-metadata-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.1.0.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.1.0.ebuild new file mode 120000 index 0000000000..7b803e7aa3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.1.0.ebuild @@ -0,0 +1 @@ +coreos-metadata-9999.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild index 82b3a3df70..7510d7f041 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild @@ -11,7 +11,7 @@ inherit cros-workon systemd if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64" else - CROS_WORKON_COMMIT="" + CROS_WORKON_COMMIT="416392f69e60bcd96507cb626a9d3fe380f0af1e" # v0.1.0 KEYWORDS="amd64" fi From 0c920ae353650184f295d0349ef5194471f39b73 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Tue, 25 Aug 2015 11:52:51 -0700 Subject: [PATCH 3/3] coreos-base/coreos: add coreos-metadata --- .../{coreos-0.0.1-r262.ebuild => coreos-0.0.1-r263.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-r262.ebuild => coreos-0.0.1-r263.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r262.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r263.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r262.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r263.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 370ceadedd..8805464635 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 @@ -117,6 +117,7 @@ RDEPEND="${RDEPEND} coreos-base/update_engine coreos-base/coreos-init coreos-base/coreos-cloudinit + coreos-base/coreos-metadata coreos-base/coretest dev-util/strace net-analyzer/nmap