diff --git a/extra/linux-tools/PKGBUILD b/extra/linux-tools/PKGBUILD index 73b55b123..d2e8e671b 100644 --- a/extra/linux-tools/PKGBUILD +++ b/extra/linux-tools/PKGBUILD @@ -16,14 +16,13 @@ pkgname=( 'hyperv' 'linux-tools-meta' 'perf' -# 'python-perf' 'tmon' 'usbip' 'gpio-utils' 'iio-utils' ) -pkgver=6.2 -pkgrel=1 +pkgver=6.3 +pkgrel=2 license=('GPL2') arch=('x86_64') url='https://www.kernel.org' @@ -33,7 +32,8 @@ makedepends=('git') # kernel source deps makedepends+=('asciidoc' 'xmlto') # perf deps -makedepends+=('perl' 'python' 'python-setuptools' 'slang' 'elfutils' 'libunwind' 'audit' 'zstd' 'libcap') +makedepends+=('perl' 'python' 'python-setuptools' 'slang' 'elfutils' 'libunwind' + 'audit' 'zstd' 'libcap' 'libtraceevent' 'openssl' 'clang') # cpupower deps makedepends+=('pciutils') # usbip deps @@ -78,6 +78,11 @@ prepare() { echo ":: Applying patch $src" patch -p1 -N -i "$srcdir/$src" done + # force our perf version + cat > tools/perf/util/PERF-VERSION-GEN << EOF +#!/bin/sh +echo '#define PERF_VERSION "$pkgver-$pkgrel"' > "\${1:-.}"/PERF-VERSION-FILE +EOF } build() { @@ -92,7 +97,6 @@ build() { WERROR=0 \ PYTHON=python \ PYTHON_CONFIG=python-config \ - PERF_VERSION=$pkgver-$pkgrel \ DESTDIR="$pkgdir" popd @@ -160,7 +164,6 @@ package_linux-tools-meta() { 'cpupower' 'hyperv' 'perf' -# 'python-perf' 'tmon' 'usbip' ) @@ -173,7 +176,7 @@ package_perf() { pkgdesc='Linux kernel performance auditing tool' depends=('glibc' 'perl' 'python' 'slang' 'elfutils' 'libunwind' 'binutils' 'numactl' 'audit' 'coreutils' 'glib2' 'xz' 'zlib' 'libelf' 'bash' - 'zstd' 'libcap') + 'zstd' 'libcap' 'libtraceevent' 'openssl') cd linux-$pkgver/tools/perf make -f Makefile.perf \ @@ -185,9 +188,8 @@ package_perf() { WERROR=0 \ PYTHON=python \ PYTHON_CONFIG=python-config \ - PERF_VERSION=$pkgver-$pkgrel \ DESTDIR="$pkgdir" \ - install + install install-python_ext cd "$pkgdir" # add linker search path mkdir "$pkgdir/etc/ld.so.conf.d" @@ -199,15 +201,6 @@ package_perf() { find usr/share -type f -exec chmod a-x {} \; } -#package_python-perf(){ -# pkgdesc='Linux kernel performance auditing tool (python bindings)' -# depends=('python') -# -# cd linux/tools/perf -# -# make install-python_ext PYTHON=python DESTDIR="$pkgdir" -#} - package_cpupower() { pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor' backup=('etc/default/cpupower') @@ -291,7 +284,7 @@ package_iio-utils() { package_bpf() { pkgdesc='BPF tools' - depends=('glibc' 'readline' 'zlib' 'libelf' 'libcap') + depends=('glibc' 'readline' 'zlib' 'libelf' 'libcap' 'zstd' 'llvm-libs' 'binutils') cd linux-$pkgver/tools/bpf # skip runsqlower until disabled in build