Merge pull request #1448 from crawford/ignition

sys-apps/ignition: include the version

sdk_container/src/third_party/coreos-overlay/eclass/cros-workon.eclass

@@ -72,10 +72,12 @@ local_copy() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	local path="$(get_path)"
-	einfo "Copying source from ${path}"
 
-	mkdir -p "${S}" || return 1
+	einfo "Cloning ${path}"
-	rsync -a "${path}/" "${S}" || return 1
+	git clone -sn "${path}" "${S}" || die "Can't clone ${path}"
+
+	einfo "Copying source from ${path}"
+	rsync -a --exclude=.git "${path}/" "${S}" || return 1
 }
 
 local_clone() {

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.2-r2.ebuild

@@ -1 +0,0 @@
-ignition-9999.ebuild

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.2-r2.ebuild

@@ -0,0 +1,41 @@
+# Copyright (c) 2015 CoreOS, Inc.. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CROS_WORKON_PROJECT="coreos/ignition"
+CROS_WORKON_LOCALNAME="ignition"
+CROS_WORKON_REPO="git://github.com"
+COREOS_GO_PACKAGE="github.com/coreos/ignition"
+inherit coreos-doc coreos-go cros-workon systemd udev
+
+if [[ "${PV}" == 9999 ]]; then
+	KEYWORDS="~amd64 ~arm64"
+else
+	CROS_WORKON_COMMIT="284c166903f86c76eb931c28f980e68c01f7ad29" # tag v0.1.2
+	KEYWORDS="amd64 arm64"
+fi
+
+DESCRIPTION="Pre-boot provisioning utility"
+HOMEPAGE="https://github.com/coreos/ignition"
+SRC_URI=""
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+src_compile() {
+	go_build "${COREOS_GO_PACKAGE}/src"
+}
+
+src_install() {
+	newbin ${GOBIN}/src ${PN}
+
+	udev_dorules "${FILESDIR}"/90-ignition.rules
+
+	systemd_dounit "${FILESDIR}"/mnt-oem.mount
+	systemd_dounit "${FILESDIR}"/ignition.target
+	systemd_dounit "${FILESDIR}"/ignition-disks.service
+	systemd_dounit "${FILESDIR}"/ignition-files.service
+
+	coreos-dodoc -r doc/*
+}

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild

@@ -24,6 +24,7 @@ SLOT="0"
 IUSE=""
 
 src_compile() {
+	GO_LDFLAGS="-X main.version $(git describe --dirty)" || die
 	go_build "${COREOS_GO_PACKAGE}/src"
 }