From c8cd2621cc00d55946a9ee5bf1ad4b6b36ad99e6 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Thu, 15 Jan 2015 15:24:41 -0800 Subject: [PATCH 1/4] eclass/coreos-doc: add helper for including docs --- .../coreos-overlay/eclass/coreos-doc.eclass | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/eclass/coreos-doc.eclass diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-doc.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-doc.eclass new file mode 100644 index 0000000000..e908cef33a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-doc.eclass @@ -0,0 +1,23 @@ +# Copyright 2015 CoreOS, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +# @ECLASS: coreos-doc.eclass +# @BLURB: utility function for including documentation + +# @FUNCTION: coreos-dodoc +# @USAGE: [-r] +coreos-dodoc() { + debug-print-function ${FUNCNAME} "${@}" + + local flags + if [[ "${1}" == "-r" ]] ; then + flags="-r" + shift + fi + + [[ "${#}" -lt 1 ]] && die "${0}: at least one file needed" + + insinto "/usr/share/coreos/doc/${P}/" + doins $flags $@ +} From 14dd78db179f3b257fe8776c2f1eb277b6f24b49 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Thu, 15 Jan 2015 15:23:21 -0800 Subject: [PATCH 2/4] coreos-base/coreos-cloudinit: include docs --- ...loudinit-1.1.0.ebuild => coreos-cloudinit-1.1.0-r1.ebuild} | 0 .../coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/{coreos-cloudinit-1.1.0.ebuild => coreos-cloudinit-1.1.0-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.1.0-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.1.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.1.0-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild index fd4d36bdf7..1bd0973715 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild @@ -13,7 +13,7 @@ else KEYWORDS="amd64" fi -inherit cros-workon systemd toolchain-funcs udev +inherit coreos-doc cros-workon systemd toolchain-funcs udev DESCRIPTION="coreos-cloudinit" HOMEPAGE="https://github.com/coreos/coreos-cloudinit" @@ -51,4 +51,6 @@ src_install() { systemd_dounit units/*.target systemd_enable_service default.target system-config.target systemd_enable_service default.target user-config.target + + coreos-dodoc -r Documentation/* } From da9f44529ef74e88e5d7b190290d5d0529ce582b Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Thu, 15 Jan 2015 15:28:27 -0800 Subject: [PATCH 3/4] dev-db/etcd: include docs --- .../etcd/{etcd-0.4.6-r2.ebuild => etcd-0.4.6-r3.ebuild} | 0 .../third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/dev-db/etcd/{etcd-0.4.6-r2.ebuild => etcd-0.4.6-r3.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.6-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.6-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.6-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.6-r3.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild index ca6fdfef75..a2c92ff5f0 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild @@ -8,7 +8,7 @@ EAPI=4 CROS_WORKON_PROJECT="coreos/etcd" CROS_WORKON_LOCALNAME="etcd" CROS_WORKON_REPO="git://github.com" -inherit toolchain-funcs cros-workon systemd +inherit coreos-doc toolchain-funcs cros-workon systemd if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64" @@ -36,4 +36,6 @@ src_install() { systemd_dounit "${FILESDIR}"/${PN}.service systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf + + coreos-dodoc -r Documentation/* } From 6d905e4da8930280bbaf3982713f7585cdad48c1 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Thu, 15 Jan 2015 15:31:14 -0800 Subject: [PATCH 4/4] app-admin/fleet: include docs --- .../fleet/{fleet-0.9.0.ebuild => fleet-0.9.0-r1.ebuild} | 0 .../coreos-overlay/app-admin/fleet/fleet-9999.ebuild | 4 +++- .../src/third_party/coreos-overlay/eclass/coreos-doc.eclass | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/fleet/{fleet-0.9.0.ebuild => fleet-0.9.0-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.9.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.9.0-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.9.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.9.0-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-9999.ebuild index 1307cb7bc6..f35972eac6 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-9999.ebuild @@ -13,7 +13,7 @@ else KEYWORDS="amd64" fi -inherit cros-workon systemd +inherit coreos-doc cros-workon systemd DESCRIPTION="fleet" HOMEPAGE="https://github.com/coreos/fleet" @@ -37,4 +37,6 @@ src_install() { systemd_dounit "${FILESDIR}"/${PN}.service systemd_dounit "${FILESDIR}"/${PN}.socket + + coreos-dodoc -r Documentation/* } diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-doc.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-doc.eclass index e908cef33a..0cbe21a520 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-doc.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-doc.eclass @@ -19,5 +19,5 @@ coreos-dodoc() { [[ "${#}" -lt 1 ]] && die "${0}: at least one file needed" insinto "/usr/share/coreos/doc/${P}/" - doins $flags $@ + doins $flags "$@" }