diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-26 15:48:02 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-26 15:48:02 +0000 |
commit | 38b7258d086dd5e263c3bbe3880c8c956676bc71 (patch) | |
tree | 6fce284d5bfddaf597a490ac66069d16c6a485db /app-emulation/cadvisor | |
parent | 0ebf740b9c9bc7c10ac41bea315ecc6c01c79166 (diff) |
gentoo resync : 25.01.2018
Diffstat (limited to 'app-emulation/cadvisor')
-rw-r--r-- | app-emulation/cadvisor/Manifest | 4 | ||||
-rw-r--r-- | app-emulation/cadvisor/cadvisor-0.28.2.ebuild | 26 | ||||
-rw-r--r-- | app-emulation/cadvisor/cadvisor-0.28.3-r1.ebuild (renamed from app-emulation/cadvisor/cadvisor-0.28.3.ebuild) | 22 |
3 files changed, 20 insertions, 32 deletions
diff --git a/app-emulation/cadvisor/Manifest b/app-emulation/cadvisor/Manifest index 619753253ad8..cd0ef6e322f4 100644 --- a/app-emulation/cadvisor/Manifest +++ b/app-emulation/cadvisor/Manifest @@ -1,6 +1,4 @@ AUX cadvisor.initd 555 BLAKE2B eaea61c2f974f9cfd97244243581d20da2f0312b4772f732193a2e3cededa3807ddfebcb417086c4d6d61257ce209019766b01f11b68eb0225cd131c90d4bf34 SHA512 c38d258b2416070076a51354f0b78be42809c571064a2b4098482137130b63c731fe8c97f9d8295170302b04d6bd5b5313c682594a36787f66193dc3d4f67429 -DIST cadvisor-0.28.2.tar.gz 4109967 BLAKE2B c55268a0768adeea75ecc2baa1093d5d5360d1e0be56cea467fe759278c7047060c4b78179a3a35801afbcf6415ffbeb7e0649c92e79878e5615c73a37eeabeb SHA512 e682b8e062ba373e5726a8076d5be75322e7c592bd751aa32da9a99e5d380a77fc4b376aa478b0beff18bae2bc8432d3a70542605681410d5e1e0b1919a6c252 DIST cadvisor-0.28.3.tar.gz 4110487 BLAKE2B d6b9d6de67e5672a3ba57ea0c28f38e2e96ec43910f8f5bbbe17b377ccbadf026d4418928234149e9ad3936f4c0871d7c371dda2bea49111735a33520154b2d3 SHA512 da111d74bfa3485c42a03a027ccbf833886e561f3244a081ad5439f7a714767cf4666c43c17b0b976089ea40916089aaa2c6070ec4aefc19798a1d5325e005e4 -EBUILD cadvisor-0.28.2.ebuild 564 BLAKE2B 7e048727b92b8e24f69d67804f73b292806a0d60252a548796d2ba8a2f7d96f2e4da31c88cbc1c10d2fc796b6da7f079ab39e0cf2f0ce394210a16f7b298d053 SHA512 3673e73cbe50d3383d12580b7e1dad55e02c2aa229b27b3dd1e03299a8bbae3b8defc0661e369a68245a3fc4eb5ae0ca23384d36b4d1b33cccf99dcc70e0fe99 -EBUILD cadvisor-0.28.3.ebuild 606 BLAKE2B d05563f9fd2e57e2c817ab1ff977e52f61765ee7ac4144927d5aa80ecb4982f27eff9fce99d140beb57cf1349ae443be19b540a0836cf265d9dba55b1dd0d868 SHA512 6867dbc96bd9cb2689c6cb21ad4e0a895c6b5a96f733c048752e75d3c086fce42263867d5dfcbf2369c8fe662e2c5835e7b69a04042a4b8733ebeb70ce22e67e +EBUILD cadvisor-0.28.3-r1.ebuild 1067 BLAKE2B abc96e7260ef9e215c4c9343484b4247d8d492537103e25c12dc890a0bc707eb2a1509f860aac3c1228548c8d0f7e91ff25d2441805be6ba0564bed95ce1f8b2 SHA512 c995afee18eef221f57339d58588a3ae98a659e83da0079b84175b98e36cf2e512d216e78e4b72ed0498497dfd5955438130a2eb9694b1fa2cccfdbcb2afd92d MISC metadata.xml 325 BLAKE2B 3a83be7d0ee504a5ef4b25d8826101878da8bac2228afbe0598ec0aef7435d69ed6d754b88453336fd84a1ef38ab1646eb890bfbff1e8549836aa12c7d497f4b SHA512 d083dae5366eaea34ba9697c49a4399e822000a19b11cffffe82e08f4a331eb0f4672c8271ac342cebb79a66c1a245e41a17ff1d40ecbad2354940bfa14c1b06 diff --git a/app-emulation/cadvisor/cadvisor-0.28.2.ebuild b/app-emulation/cadvisor/cadvisor-0.28.2.ebuild deleted file mode 100644 index 25f12f419338..000000000000 --- a/app-emulation/cadvisor/cadvisor-0.28.2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -EGO_PN="github.com/google/cadvisor" - -inherit user golang-build golang-vcs-snapshot -SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64" - -DESCRIPTION="Analyzes resource usage and performance characteristics of running containers" - -HOMEPAGE="https://github.com/google/cadvisor" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /dev/null ${PN} -} - -src_install() { - dobin ${PN} -} diff --git a/app-emulation/cadvisor/cadvisor-0.28.3.ebuild b/app-emulation/cadvisor/cadvisor-0.28.3-r1.ebuild index c3666053995e..a9f0af88b2da 100644 --- a/app-emulation/cadvisor/cadvisor-0.28.3.ebuild +++ b/app-emulation/cadvisor/cadvisor-0.28.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,10 +6,10 @@ EGO_PN="github.com/google/cadvisor" inherit user golang-build golang-vcs-snapshot SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +COMMIT="1e567c2" KEYWORDS="~amd64" DESCRIPTION="Analyzes resource usage and performance characteristics of running containers" - HOMEPAGE="https://github.com/google/cadvisor" LICENSE="Apache-2.0" @@ -21,7 +21,23 @@ pkg_setup() { enewuser ${PN} -1 -1 /dev/null ${PN} } +src_prepare() { + sed -i -e "/go get/d" src/${EGO_PN}/build/assets.sh || die + sed -i -e "s/git describe.*/echo ${PV} )/"\ + -e "s/git rev-parse --short HEAD.*/echo ${COMMIT} )/"\ + src/${EGO_PN}/build/build.sh || die + default +} + +src_compile() { + pushd "src/${EGO_PN}" + GO_FLAGS="-v -work -x" VERBOSE="true" GOPATH="${S}:$(get_golibdir_gopath)" emake build + popd || die +} + src_install() { newinitd "${FILESDIR}"/${PN}.initd ${PN} - dobin ${PN} + dobin src/${EGO_PN}/${PN} + keepdir /var/log/${PN} + fowners ${PN}:${PN} /var/log/${PN} } |