From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6F7FB13988E for ; Sat, 22 Aug 2015 20:41:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 038D0141A5; Sat, 22 Aug 2015 20:41:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A3178141A5 for ; Sat, 22 Aug 2015 20:41:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 941863409E2 for ; Sat, 22 Aug 2015 20:41:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 880E813F for ; Sat, 22 Aug 2015 20:41:53 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1440276072.d5da422b82e6f9078d263094d9d40c3e7f630aee.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/linux-misc-apps/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild X-VCS-Directories: sys-apps/linux-misc-apps/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: d5da422b82e6f9078d263094d9d40c3e7f630aee X-VCS-Branch: master Date: Sat, 22 Aug 2015 20:41:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 87fa98bd-5e41-452b-9dc9-ce6520d8b72c X-Archives-Hash: 71e6f98ad4629a7215bd8bc154b8e1cf commit: d5da422b82e6f9078d263094d9d40c3e7f630aee Author: Robin H. Johnson gentoo org> AuthorDate: Sat Aug 22 20:27:46 2015 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sat Aug 22 20:41:12 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5da422b Fix turbostat build & install. Package-Manager: portage-2.2.18 sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild index be86d16..43f20ad 100644 --- a/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild +++ b/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit versionator eutils toolchain-funcs linux-info autotools flag-o-matic +inherit versionator eutils toolchain-funcs linux-info flag-o-matic DESCRIPTION="Misc tools bundled with kernel sources" HOMEPAGE="http://kernel.org/" @@ -69,7 +69,7 @@ TARGETS_SIMPLE=( # These have a broken make install, no DESTDIR TARGET_MAKE_SIMPLE=( tools/firewire:nosy-dump - tools/power/x86/turbostat:../../../../turbostat + tools/power/x86/turbostat:turbostat:../../../../turbostat tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy Documentation/misc-devices/mei:mei-amt-version ) @@ -133,8 +133,10 @@ src_compile() { done for t in ${TARGET_MAKE_SIMPLE[@]} ; do - dir=${t/:*} target=${t/*:} - einfo "Building $dir => $target" + dir=${t/:*} target_binfile=${t#*:} + target=${target_binfile/:*} binfile=${target_binfile/*:} + [ -z "${binfile}" ] && binfile=$target + einfo "Building $dir => $binfile (via emake $target)" emake -C $dir ARCH=${karch} $target done } @@ -148,9 +150,11 @@ src_install() { done for t in ${TARGET_MAKE_SIMPLE[@]} ; do - dir=${t/:*} target=${t/*:} - einfo "Installing $dir => $target" - dosbin ${dir}/${target} + dir=${t/:*} target_binfile=${t#*:} + target=${target_binfile/:*} binfile=${target_binfile/*:} + [ -z "${binfile}" ] && binfile=$target + einfo "Installing $dir => $binfile" + dosbin ${dir}/${binfile} done newconfd "${FILESDIR}"/freefall.confd freefall