From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 59A9A158083 for ; Tue, 24 Sep 2024 10:23:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4C1A22BC0B3; Tue, 24 Sep 2024 10:23:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 31C7C2BC0B3 for ; Tue, 24 Sep 2024 10:23:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3AFC434315F for ; Tue, 24 Sep 2024 10:23:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A4C61F45 for ; Tue, 24 Sep 2024 10:23:47 +0000 (UTC) From: "Maciej Barć" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Barć" Message-ID: <1727173350.df4279f3b92ee3c717d996863e6367f03f9a208f.xgqt@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/0xtools/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/0xtools/0xtools-9999.ebuild X-VCS-Directories: dev-util/0xtools/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: df4279f3b92ee3c717d996863e6367f03f9a208f X-VCS-Branch: master Date: Tue, 24 Sep 2024 10:23:47 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d4c2a271-70a0-4303-b86c-4189b96fba4d X-Archives-Hash: 6d2db5347d2f958f1a16c4e2ebbdcb04 commit: df4279f3b92ee3c717d996863e6367f03f9a208f Author: Maciej Barć gentoo org> AuthorDate: Tue Sep 24 10:18:00 2024 +0000 Commit: Maciej Barć gentoo org> CommitDate: Tue Sep 24 10:22:30 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df4279f3 dev-util/0xtools: sync live 9999 version Signed-off-by: Maciej Barć gentoo.org> dev-util/0xtools/0xtools-9999.ebuild | 40 ++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/dev-util/0xtools/0xtools-9999.ebuild b/dev-util/0xtools/0xtools-9999.ebuild index 3b7026647b97..395a7ccf798a 100644 --- a/dev-util/0xtools/0xtools-9999.ebuild +++ b/dev-util/0xtools/0xtools-9999.ebuild @@ -1,31 +1,41 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{11..12} ) -inherit python-single-r1 systemd toolchain-funcs +inherit python-single-r1 systemd toolchain-funcs wrapper DESCRIPTION="Always-on profiling for production systems" HOMEPAGE="https://0x.tools/ https://github.com/tanelpoder/0xtools/" -if [[ ${PV} == *9999* ]] ; then +if [[ "${PV}" == *9999* ]] ; then inherit git-r3 + EGIT_REPO_URI="https://github.com/tanelpoder/${PN}.git" else SRC_URI="https://github.com/tanelpoder/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + + KEYWORDS="amd64 ~x86" fi LICENSE="GPL-2+" SLOT="0" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND="${PYTHON_DEPS}" -BDEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} +" +RDEPEND=" + ${BDEPEND} + sys-power/cpupower + $(python_gen_cond_dep ' + dev-util/bcc[${PYTHON_USEDEP}] + ') +" DOCS=( CHANGELOG.md README.md ) @@ -37,20 +47,32 @@ src_compile() { } src_install() { + # "cpumhzturbo" requires "turbostat", which is not packaged, + # see bug: https://bugs.gentoo.org/939913 + # C executables and scripts exeinto /usr/bin - doexe bin/{run_xcapture.sh,run_xcpu.sh,vmtop,xcapture} + doexe bin/{cpumhz,vmtop,xcapture,xtop} + doexe bin/{run_xcapture.sh,run_xcpu.sh} # Python executables - python_domodule lib/${PN} + python_domodule "lib/${PN}" python_doscript bin/psn python_doscript bin/schedlat + python_doscript bin/syscallargs # Service systemd_dounit xcapture.service systemd_dounit xcapture-restart.service systemd_dounit xcapture-restart.timer + # Setup for "xcapture-bpf". + exeinto "/lib/${PN}/xcapture" + doexe bin/xcapture-bpf + insinto "/lib/${PN}/xcapture" + doins bin/xcapture-bpf.c + make_wrapper xcapture-bpf "/lib/${PN}/xcapture/xcapture-bpf" + # Service config insinto /etc/default newins xcapture.default xcapture