linux-tools: update to 5.10.4.

This commit is contained in:
Érico Rolim 2020-12-31 13:56:25 -03:00 committed by Érico Nogueira Rolim
parent 7195b3d47a
commit da92a4a98b
2 changed files with 10 additions and 39 deletions

View file

@ -1,26 +0,0 @@
Source: @pullmoll
Upstream: no
Reason: The binutils macros for bfd section access changed slightly.
--- tools/perf/util/srcline.c 2020-05-20 08:20:41.000000000 +0200
+++ tools/perf/util/srcline.c 2020-05-27 13:48:11.606027082 +0200
@@ -197,7 +197,7 @@
if (a2l->found)
return;
- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0)
+ if ((bfd_section_flags(section) & SEC_ALLOC) == 0)
return;
pc = a2l->addr;
@@ -201,8 +201,8 @@
return;
pc = a2l->addr;
- vma = bfd_get_section_vma(abfd, section);
- size = bfd_get_section_size(section);
+ vma = bfd_section_vma(section);
+ size = bfd_section_size(section);
if (pc < vma || pc >= vma + size)
return;

View file

@ -1,20 +1,21 @@
# Template file for 'linux-tools' # Template file for 'linux-tools'
pkgname=linux-tools pkgname=linux-tools
version=5.4.42 version=5.10.4
revision=3 revision=1
wrksrc="linux-${version}" wrksrc="linux-${version}"
build_style=meta build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3 xmlto" hostmakedepends="asciidoc automake flex gettext libtool perl python3 xmlto"
makedepends="babeltrace-devel binutils-devel eudev-libudev-devel makedepends="babeltrace-devel binutils-devel eudev-libudev-devel
libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
libzstd-devel ncurses-devel pciutils-devel python3-devel slang-devel" libzstd-devel ncurses-devel pciutils-devel python3-devel slang-devel
elfutils-devel"
depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}" depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"
short_desc="Linux kernel tools meta-pkg" short_desc="Linux kernel tools meta-pkg"
maintainer="Enno Boland <gottox@voidlinux.org>" maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-only" license="GPL-2.0-only"
homepage="https://www.kernel.org" homepage="https://www.kernel.org"
distfiles="${KERNEL_SITE}/kernel/v5.x/linux-${version}.tar.xz" distfiles="${KERNEL_SITE}/kernel/v5.x/linux-${version}.tar.xz"
checksum=4e431b7c0266a07b76fdb77f8917ad681f0fa34ffba0eb8a172b67f7ef57bc31 checksum=904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
python_version=3 python_version=3
subpackages="cpupower libcpupower libcpupower-devel libusbip libusbip-devel usbip perf freefall tmon" subpackages="cpupower libcpupower libcpupower-devel libusbip libusbip-devel usbip perf freefall tmon"
@ -37,15 +38,14 @@ esac
nocross=yes nocross=yes
post_extract() { post_extract() {
sed -i 's/\$(LIBS)/& $(LDFLAGS)/' tools/power/cpupower/bench/Makefile vsed -i 's/\$(LIBS)/& $(LDFLAGS)/' tools/power/cpupower/bench/Makefile
sed -i 's/SIGCLD/SIGCHLD/g' tools/usb/usbip/src/usbipd.c vsed -i 's/ \-Werror / /g' tools/build/feature/Makefile \
sed -i 's/^CFLAGS/override &/g' tools/thermal/tmon/Makefile
sed -i 's/ \-Werror / /g' tools/build/feature/Makefile \
tools/lib/bpf/Makefile tools/lib/bpf/Makefile
} }
do_build() { do_build() {
cd ${wrksrc}/tools/perf cd ${wrksrc}/tools/perf
make ${makejobs} CC=$CC LD=$LD CFLAGS="$CFLAGS" EXTRA_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ make ${makejobs} \
CC=$CC LD=$LD CFLAGS="$CFLAGS" EXTRA_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
WERROR=0 DESTDIR=${DESTDIR} prefix=/usr lib=lib/perf \ WERROR=0 DESTDIR=${DESTDIR} prefix=/usr lib=lib/perf \
NO_GTK2=1 NO_SDT=1 PYTHON=python3 \ NO_GTK2=1 NO_SDT=1 PYTHON=python3 \
PERF_VERSION=${version}_${revision} \ PERF_VERSION=${version}_${revision} \
@ -108,10 +108,7 @@ do_install() {
printf 'usbip-core\nusbip-host\n' > \ printf 'usbip-core\nusbip-host\n' > \
${DESTDIR}/usr/lib/modules-load.d/usbip.conf ${DESTDIR}/usr/lib/modules-load.d/usbip.conf
if [ -d ${DESTDIR}/usr/lib64 ]; then rm ${DESTDIR}/usr/include/cpuidle.h
mv ${DESTDIR}/usr/lib64/* ${DESTDIR}/usr/lib/
fi
rm -f ${DESTDIR}/usr/include/cpuidle.h
} }
cpupower_package() { cpupower_package() {