Merge pull request #1920 from crawford/metadata

coreos-base/coreos-metadata: bump to v0.4.0
This commit is contained in:
Alex Crawford 2016-04-29 16:36:16 -07:00
commit 711e4641cb
4 changed files with 16 additions and 4 deletions

View File

@ -11,7 +11,7 @@ inherit coreos-go cros-workon systemd
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm64" KEYWORDS="~amd64 ~arm64"
else else
CROS_WORKON_COMMIT="d976d664051f5b95ab60f7f1770b1b2bcc2877b2" # v0.3.0 CROS_WORKON_COMMIT="a40c25b40b6b57aa76a4a4b381136d4a0733edd6" # v0.4.0
KEYWORDS="amd64 arm64" KEYWORDS="amd64 arm64"
fi fi
@ -24,11 +24,13 @@ SLOT="0"
IUSE="" IUSE=""
src_compile() { src_compile() {
export GO15VENDOREXPERIMENT="1"
GO_LDFLAGS="-X main.version $(git describe --dirty)" || die GO_LDFLAGS="-X main.version $(git describe --dirty)" || die
go_build "${COREOS_GO_PACKAGE}/src" go_build "${COREOS_GO_PACKAGE}/internal"
} }
src_install() { src_install() {
newbin "${GOBIN}/src" "${PN}" newbin "${GOBIN}/internal" "${PN}"
systemd_dounit "${FILESDIR}/coreos-metadata.service" systemd_dounit "${FILESDIR}/coreos-metadata.service"
systemd_dounit "${FILESDIR}/coreos-metadata-sshkeys@.service"
} }

View File

@ -0,0 +1,10 @@
[Unit]
Description=CoreOS Metadata Agent (SSH Keys)
[Service]
Type=oneshot
ExecStart=/usr/bin/coreos-metadata --cmdline --ssh-keys=%i
[Install]
DefaultInstance=core
RequiredBy=multi-user.target

View File

@ -3,7 +3,7 @@ Description=CoreOS Metadata Agent
[Service] [Service]
Type=oneshot Type=oneshot
ExecStart=/usr/bin/coreos-metadata --cmdline --output=/run/metadata/coreos ExecStart=/usr/bin/coreos-metadata --cmdline --attributes=/run/metadata/coreos
[Install] [Install]
RequiredBy=metadata.target RequiredBy=metadata.target