mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-10-20 20:01:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

dev-util/perf: Sync with Gentoo

Browse Source 
It's from Gentoo commit a621a8618f5ee725b72fb6ff405744996aa6b83b.

Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
This commit is contained in:
Flatcar Buildbot 2025-09-01 07:09:25 +00:00 committed by Krzesimir Nowak
parent 27af7f81e9
commit 7d1a5e61a4
5 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/portage-stable/dev-util/perf/Manifest vendored
View File

@ -1,4 +1,4 @@
DIST linux-6.14.tar.xz 149408504 BLAKE2B 11835719804b406fe281ea1c276a84dc0cbaa808552ddcca9233d3eaeb1c001d0455c7205379b02de8e8db758c1bae6fe7ceb6697e63e3cf9ae7187dc7a9715e SHA512 71dcaa3772d8d9797c3ae30cae9c582b11a7047a3bbcb8dfd479a4dffb40ff0da74cf3d45175f50cc9992e338bcadd46c9c570f54054ca3bde6661768d3d22eb DIST linux-6.14.tar.xz 149408504 BLAKE2B 11835719804b406fe281ea1c276a84dc0cbaa808552ddcca9233d3eaeb1c001d0455c7205379b02de8e8db758c1bae6fe7ceb6697e63e3cf9ae7187dc7a9715e SHA512 71dcaa3772d8d9797c3ae30cae9c582b11a7047a3bbcb8dfd479a4dffb40ff0da74cf3d45175f50cc9992e338bcadd46c9c570f54054ca3bde6661768d3d22eb
DIST linux-6.15.tar.xz 151168812 BLAKE2B 465596c6dc053ff3a3966302a906d3edb4f7ee1ef82f8c20b96360196d3414f5b1deeafa67b8340fcdecd3617280ba9b756d7073ad15c707865e256397b4af53 SHA512 d03788ffa8d8ae1b84ef1286bb44a08fc01432e509dfec6cccae5c5a5a47201d378aec2bcd21e6f0bbd1e625b26f47780c06ee9c1cef3775358f98b160923f30 DIST linux-6.15.tar.xz 151168812 BLAKE2B 465596c6dc053ff3a3966302a906d3edb4f7ee1ef82f8c20b96360196d3414f5b1deeafa67b8340fcdecd3617280ba9b756d7073ad15c707865e256397b4af53 SHA512 d03788ffa8d8ae1b84ef1286bb44a08fc01432e509dfec6cccae5c5a5a47201d378aec2bcd21e6f0bbd1e625b26f47780c06ee9c1cef3775358f98b160923f30
DIST linux-6.16.tar.xz 152620004 BLAKE2B 87bc4da7e89cc8265aebffea7ec6c09f711be24fee87cb1c03a264c03fd5a538d66aa806640835aa5103926e612cdfbc52d7c861d7f7065f1a8bb11d893b0921 SHA512 55a00f89ad6db6db2e26ff5dc5cfc96bbf6654e5bd5d17d2a3b944a47640367e54139716d230923187bebc6cb7756edc9511a620fb8abc6f32c50a658a734784 DIST linux-6.16.tar.xz 152620004 BLAKE2B 87bc4da7e89cc8265aebffea7ec6c09f711be24fee87cb1c03a264c03fd5a538d66aa806640835aa5103926e612cdfbc52d7c861d7f7065f1a8bb11d893b0921 SHA512 55a00f89ad6db6db2e26ff5dc5cfc96bbf6654e5bd5d17d2a3b944a47640367e54139716d230923187bebc6cb7756edc9511a620fb8abc6f32c50a658a734784
DIST linux-6.7.tar.xz 141406528 BLAKE2B cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e SHA512 de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad DIST patch-6.16.2.xz 398724 BLAKE2B 4152a52f0d239585a6bcdfa3f94bd2ca3ee7974dbe21a1deaa88ac58cff52360478f3539c95c1e023909e51b06c57da45536cb843599e8ebc9b05d5c7d91397e SHA512 57b1269cda072d1e43bb22ebeb7cf4e89cd02bdc3c87cf6eea353cd5ccd4c73d37581fb6cdf4dec0e0c6974f16d6c6eec7094710fe129caa3b5cfc108af6b207

3
sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.14.ebuild vendored
View File

@ -274,7 +274,6 @@ perf_make() {
NO_BACKTRACE= NO_BACKTRACE=
NO_CAPSTONE=$(puse capstone) NO_CAPSTONE=$(puse capstone)
NO_DEMANGLE= NO_DEMANGLE=
NO_JEVENTS=$(puse python)
NO_JVMTI=$(puse java) NO_JVMTI=$(puse java)
NO_LIBAUDIT=1 NO_LIBAUDIT=1
NO_LIBBABELTRACE=$(puse babeltrace) NO_LIBBABELTRACE=$(puse babeltrace)
@ -304,7 +303,7 @@ perf_make() {
plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins"
"$@" "$@"
) )
emake "${emakeargs[@]}" NO_JEVENTS=$(puse python) emake "${emakeargs[@]}"
} }
src_compile() { src_compile() {

3
sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.15.ebuild vendored
View File

@ -273,7 +273,6 @@ perf_make() {
NO_BACKTRACE= NO_BACKTRACE=
NO_CAPSTONE=$(puse capstone) NO_CAPSTONE=$(puse capstone)
NO_DEMANGLE= NO_DEMANGLE=
NO_JEVENTS=$(puse python)
NO_JVMTI=$(puse java) NO_JVMTI=$(puse java)
NO_LIBAUDIT=1 NO_LIBAUDIT=1
NO_LIBBABELTRACE=$(puse babeltrace) NO_LIBBABELTRACE=$(puse babeltrace)
@ -303,7 +302,7 @@ perf_make() {
plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins"
"$@" "$@"
) )
emake "${emakeargs[@]}" NO_JEVENTS=$(puse python) emake "${emakeargs[@]}"
} }
src_compile() { src_compile() {

55
sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.7.ebuild → sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.16.2.ebuild vendored
View File

@ -3,8 +3,9 @@
EAPI=8 EAPI=8
PYTHON_COMPAT=( python3_{10..12} ) LLVM_COMPAT=( {18..20} )
inherit bash-completion-r1 estack flag-o-matic linux-info llvm toolchain-funcs python-r1 PYTHON_COMPAT=( python3_{10..14} python3_{13,14}t)
inherit bash-completion-r1 estack flag-o-matic linux-info llvm-r1 toolchain-funcs python-r1
DESCRIPTION="Userland tools for Linux Performance Counters" DESCRIPTION="Userland tools for Linux Performance Counters"
HOMEPAGE="https://perfwiki.github.io/main/" HOMEPAGE="https://perfwiki.github.io/main/"
@ -33,8 +34,8 @@ S="${S_K}/tools/perf"
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd" IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 babeltrace capstone big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl +python +slang systemtap tcmalloc unwind"
REQUIRED_USE=" REQUIRED_USE="
${PYTHON_REQUIRED_USE} ${PYTHON_REQUIRED_USE}
@ -48,6 +49,7 @@ BDEPEND="
dev-python/setuptools[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}]
app-alternatives/yacc app-alternatives/yacc
app-alternatives/lex app-alternatives/lex
sys-apps/which
virtual/pkgconfig virtual/pkgconfig
doc? ( doc? (
app-text/asciidoc app-text/asciidoc
@ -58,18 +60,18 @@ BDEPEND="
" "
RDEPEND=" RDEPEND="
audit? ( sys-process/audit )
babeltrace? ( dev-util/babeltrace:0/1 ) babeltrace? ( dev-util/babeltrace:0/1 )
bpf? ( bpf? (
dev-libs/libbpf dev-libs/libbpf
dev-util/bpftool dev-util/bpftool
dev-util/pahole dev-util/pahole
$(llvm_gen_dep '
llvm-core/clang:${LLVM_SLOT}=
llvm-core/llvm:${LLVM_SLOT}=
')
) )
caps? ( sys-libs/libcap ) caps? ( sys-libs/libcap )
bpf? ( capstone? ( dev-libs/capstone )
llvm-core/clang:=
llvm-core/llvm:=
)
crypt? ( dev-libs/openssl:= ) crypt? ( dev-libs/openssl:= )
gtk? ( x11-libs/gtk+:2 ) gtk? ( x11-libs/gtk+:2 )
java? ( virtual/jre:* ) java? ( virtual/jre:* )
@ -84,10 +86,11 @@ RDEPEND="
systemtap? ( dev-debug/systemtap ) systemtap? ( dev-debug/systemtap )
tcmalloc? ( dev-util/google-perftools ) tcmalloc? ( dev-util/google-perftools )
unwind? ( sys-libs/libunwind:= ) unwind? ( sys-libs/libunwind:= )
zstd? ( app-arch/zstd:= ) app-arch/zstd:=
dev-libs/elfutils dev-libs/elfutils
sys-libs/binutils-libs:= sys-libs/binutils-libs:=
sys-libs/zlib sys-libs/zlib
virtual/libcrypt
" "
DEPEND="${RDEPEND} DEPEND="${RDEPEND}
@ -110,7 +113,9 @@ pkg_pretend() {
pkg_setup() { pkg_setup() {
local CONFIG_CHECK=" local CONFIG_CHECK="
~!SCHED_OMIT_FRAME_POINTER
~DEBUG_INFO ~DEBUG_INFO
~FRAME_POINTER
~FTRACE ~FTRACE
~FTRACE_SYSCALLS ~FTRACE_SYSCALLS
~FUNCTION_TRACER ~FUNCTION_TRACER
@ -119,17 +124,19 @@ pkg_setup() {
~KPROBES ~KPROBES
~KPROBE_EVENTS ~KPROBE_EVENTS
~PERF_EVENTS ~PERF_EVENTS
~STACKTRACE
~TRACEPOINTS
~UPROBES ~UPROBES
~UPROBE_EVENTS ~UPROBE_EVENTS
" "
use bpf && llvm_pkg_setup use bpf && llvm-r1_pkg_setup
# We enable python unconditionally as libbpf always generates # We enable python unconditionally as libbpf always generates
# API headers using python script # API headers using python script
python_setup python_setup
if use bpf ; then if use bpf ; then
CONFIG_CHECK+="~BPF ~BPF_EVENTS ~BPF_SYSCALL ~DEBUG_INFO_BTF ~HAVE_EBPF_JIT" CONFIG_CHECK+="~BPF ~BPF_EVENTS ~BPF_SYSCALL ~DEBUG_INFO_BTF ~HAVE_EBPF_JIT ~UNWINDER_FRAME_POINTER"
fi fi
linux-info_pkg_setup linux-info_pkg_setup
@ -139,8 +146,10 @@ pkg_setup() {
# it's building from the same tarball, please keep it in sync with bpftool # it's building from the same tarball, please keep it in sync with bpftool
src_unpack() { src_unpack() {
local paths=( local paths=(
kernel/bpf tools/{arch,bpf,build,include,lib,perf,scripts} 'arch/*/include/*' 'arch/*/lib/*' 'arch/*/tools/*' 'include/*'
scripts include lib "arch/*/lib" "arch/*/tools" 'kernel/bpf/*' 'lib/*' 'scripts/*' 'tools/arch/*' 'tools/bpf/*'
'tools/build/*' 'tools/include/*' 'tools/lib/*' 'tools/perf/*'
'tools/scripts/*'
) )
# We expect the tar implementation to support the -j option (both # We expect the tar implementation to support the -j option (both
@ -152,9 +161,10 @@ src_unpack() {
if [[ -n ${LINUX_PATCH} ]] ; then if [[ -n ${LINUX_PATCH} ]] ; then
eshopts_push -o noglob eshopts_push -o noglob
ebegin "Filtering partial source patch" ebegin "Filtering partial source patch"
filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \ xzcat "${DISTDIR}"/${LINUX_PATCH} | filterdiff -p1 ${paths[@]/#/-i} > ${P}.patch
> ${P}.patch assert -n "Unpacking to ${P} from ${DISTDIR}/${LINUX_PATCH} failed"
eend $? || die "filterdiff failed" eend $? || die "filterdiff failed"
test -s ${P}.patch || die "patch is empty?!"
eshopts_pop eshopts_pop
fi fi
@ -175,8 +185,7 @@ src_prepare() {
fi fi
pushd "${S_K}" >/dev/null || die pushd "${S_K}" >/dev/null || die
eapply "${FILESDIR}"/perf-6.4-libtracefs.patch # Gentoo patches go here
eapply "${FILESDIR}"/perf-6.7-expr.patch
popd || die popd || die
# Drop some upstream too-developer-oriented flags and fix the # Drop some upstream too-developer-oriented flags and fix the
@ -262,10 +271,10 @@ perf_make() {
feature-gtk2-infobar=$(usex gtk 1 "") feature-gtk2-infobar=$(usex gtk 1 "")
NO_AUXTRACE= NO_AUXTRACE=
NO_BACKTRACE= NO_BACKTRACE=
NO_CAPSTONE=$(puse capstone)
NO_DEMANGLE= NO_DEMANGLE=
NO_JEVENTS=$(puse python)
NO_JVMTI=$(puse java) NO_JVMTI=$(puse java)
NO_LIBAUDIT=$(puse audit) NO_LIBAUDIT=1
NO_LIBBABELTRACE=$(puse babeltrace) NO_LIBBABELTRACE=$(puse babeltrace)
NO_LIBBIONIC=1 NO_LIBBIONIC=1
NO_LIBBPF=$(puse bpf) NO_LIBBPF=$(puse bpf)
@ -273,25 +282,27 @@ perf_make() {
NO_LIBCRYPTO=$(puse crypt) NO_LIBCRYPTO=$(puse crypt)
NO_LIBDW_DWARF_UNWIND="${disable_libdw}" NO_LIBDW_DWARF_UNWIND="${disable_libdw}"
NO_LIBELF= NO_LIBELF=
NO_LIBLLVM=$(puse bpf)
NO_LIBNUMA=$(puse numa) NO_LIBNUMA=$(puse numa)
NO_LIBPERL=$(puse perl) NO_LIBPERL=$(puse perl)
NO_LIBPFM4=$(puse libpfm) NO_LIBPFM4=$(puse libpfm)
NO_LIBPYTHON=$(puse python) NO_LIBPYTHON=$(puse python)
NO_LIBTRACEEVENT=$(puse libtraceevent) NO_LIBTRACEEVENT=$(puse libtraceevent)
NO_LIBUNWIND=$(puse unwind) NO_LIBUNWIND=$(puse unwind)
NO_LIBZSTD=$(puse zstd)
NO_SDT=$(puse systemtap) NO_SDT=$(puse systemtap)
NO_SHELLCHECK=1
NO_SLANG=$(puse slang) NO_SLANG=$(puse slang)
NO_LZMA=$(puse lzma) NO_LZMA=$(puse lzma)
NO_ZLIB= NO_ZLIB=
TCMALLOC=$(usex tcmalloc 1 "") TCMALLOC=$(usex tcmalloc 1 "")
WERROR=0 WERROR=0
DEBUG=$(usex debug 1 "")
LIBDIR="/usr/libexec/perf-core" LIBDIR="/usr/libexec/perf-core"
libdir="${EPREFIX}/usr/$(get_libdir)" libdir="${EPREFIX}/usr/$(get_libdir)"
plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins"
"$@" "$@"
) )
emake "${emakeargs[@]}" NO_JEVENTS=$(puse python) emake "${emakeargs[@]}"
} }
src_compile() { src_compile() {

3
sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.16.ebuild vendored
View File

@ -273,7 +273,6 @@ perf_make() {
NO_BACKTRACE= NO_BACKTRACE=
NO_CAPSTONE=$(puse capstone) NO_CAPSTONE=$(puse capstone)
NO_DEMANGLE= NO_DEMANGLE=
NO_JEVENTS=$(puse python)
NO_JVMTI=$(puse java) NO_JVMTI=$(puse java)
NO_LIBAUDIT=1 NO_LIBAUDIT=1
NO_LIBBABELTRACE=$(puse babeltrace) NO_LIBBABELTRACE=$(puse babeltrace)
@ -303,7 +302,7 @@ perf_make() {
plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins"
"$@" "$@"
) )
emake "${emakeargs[@]}" NO_JEVENTS=$(puse python) emake "${emakeargs[@]}"
} }
src_compile() { src_compile() {