From fb32e66150d95fe7e757eb3dab070bfe1064dc1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 27 May 2020 13:59:34 +0200 Subject: [PATCH] linux-tools: update to 5.4.42; fix build Switch to current stable LTS kernel series 5.4 latest build 42. Add libzstd support and fix binutils macro changes. --- .../patches/bfd_section_flags.patch | 26 +++++++++++++++++++ srcpkgs/linux-tools/patches/python3.8.patch | 15 ----------- srcpkgs/linux-tools/template | 12 ++++----- 3 files changed, 32 insertions(+), 21 deletions(-) create mode 100644 srcpkgs/linux-tools/patches/bfd_section_flags.patch delete mode 100644 srcpkgs/linux-tools/patches/python3.8.patch diff --git a/srcpkgs/linux-tools/patches/bfd_section_flags.patch b/srcpkgs/linux-tools/patches/bfd_section_flags.patch new file mode 100644 index 0000000000..aa10648bb9 --- /dev/null +++ b/srcpkgs/linux-tools/patches/bfd_section_flags.patch @@ -0,0 +1,26 @@ +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; diff --git a/srcpkgs/linux-tools/patches/python3.8.patch b/srcpkgs/linux-tools/patches/python3.8.patch deleted file mode 100644 index 630fabc69e..0000000000 --- a/srcpkgs/linux-tools/patches/python3.8.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- tools/perf/Makefile.config.orig -+++ tools/perf/Makefile.config -@@ -225,10 +225,10 @@ - PYTHON_CONFIG_SQ := $(call shell-sq,$(PYTHON_CONFIG)) - - ifdef PYTHON_CONFIG -- PYTHON_EMBED_LDOPTS := $(shell $(PYTHON_CONFIG_SQ) --ldflags 2>/dev/null) -+ PYTHON_EMBED_LDOPTS := $(shell $(PYTHON_CONFIG_SQ) --embed --ldflags 2>/dev/null) - PYTHON_EMBED_LDFLAGS := $(call strip-libs,$(PYTHON_EMBED_LDOPTS)) - PYTHON_EMBED_LIBADD := $(call grep-libs,$(PYTHON_EMBED_LDOPTS)) -lutil -- PYTHON_EMBED_CCOPTS := $(shell $(PYTHON_CONFIG_SQ) --includes 2>/dev/null) -+ PYTHON_EMBED_CCOPTS := $(shell $(PYTHON_CONFIG_SQ) --embed --includes 2>/dev/null) - FLAGS_PYTHON_EMBED := $(PYTHON_EMBED_CCOPTS) $(PYTHON_EMBED_LDOPTS) - endif - diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template index b635ab6a79..313125ff65 100644 --- a/srcpkgs/linux-tools/template +++ b/srcpkgs/linux-tools/template @@ -1,21 +1,21 @@ # Template file for 'linux-tools' pkgname=linux-tools -version=5.3.1 -revision=2 +version=5.4.42 +revision=1 wrksrc="linux-${version}" build_style=meta hostmakedepends="asciidoc automake flex gettext libtool perl python3 xmlto" makedepends="babeltrace-devel binutils-devel eudev-libudev-devel - liblzma-devel libressl-devel libsysfs-devel libunwind-devel - ncurses-devel pciutils-devel python3-devel slang-devel" + libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel + libzstd-devel ncurses-devel pciutils-devel python3-devel slang-devel" depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}" short_desc="Linux kernel tools meta-pkg" maintainer="Enno Boland " license="GPL-2.0-only" homepage="https://www.kernel.org" distfiles="${KERNEL_SITE}/kernel/v5.x/linux-${version}.tar.xz" -checksum=9890b5a909d316211d045a95f5f0680e39749f2319cb26d7cd067efaa692f858 -python_version=2 #unverified +checksum=4e431b7c0266a07b76fdb77f8917ad681f0fa34ffba0eb8a172b67f7ef57bc31 +python_version=3 subpackages="cpupower libcpupower libcpupower-devel libusbip libusbip-devel usbip perf freefall tmon"