Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package bpftool for openSUSE:Factory checked in at 2023-02-21 15:35:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bpftool (Old) and /work/SRC/openSUSE:Factory/.bpftool.new.22824 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bpftool" Tue Feb 21 15:35:27 2023 rev:6 rq:1066190 version:MACRO Changes: -------- --- /work/SRC/openSUSE:Factory/bpftool/bpftool.changes 2022-10-14 15:41:21.471800031 +0200 +++ /work/SRC/openSUSE:Factory/.bpftool.new.22824/bpftool.changes 2023-02-21 15:35:29.572097635 +0100 @@ -1,0 +2,7 @@ +Wed Feb 15 09:11:12 UTC 2023 - Martin Liška <mli...@suse.cz> + +- Add binutils-2.40.patch where we need to explicitly link against + -lsframe. It's a workaround for an existing issue: + https://github.com/libbpf/bpftool/issues/73. + +------------------------------------------------------------------- New: ---- binutils-2.40.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bpftool.spec ++++++ --- /var/tmp/diff_new_pack.j5hcEq/_old 2023-02-21 15:35:30.084100577 +0100 +++ /var/tmp/diff_new_pack.j5hcEq/_new 2023-02-21 15:35:30.088100601 +0100 @@ -1,7 +1,7 @@ # # spec file for package bpftool # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,6 +20,7 @@ Name: bpftool Version: %{version} Release: 0 +Patch0: binutils-2.40.patch Summary: Tool for inspection and manipulation of BPF programs and maps License: GPL-2.0-only Group: Development/Tools/Other @@ -36,8 +37,8 @@ %package bash-completion Summary: Bash completion for bpftool Group: System/Shells -Requires: bash-completion Requires: %{name} +Requires: bash-completion Supplements: (%{name} and bash-completion) %description bash-completion @@ -58,12 +59,16 @@ (cd %{_prefix}/src/linux ; tar -cf - COPYING CREDITS README tools include scripts Kbuild Makefile arch/*/{include,lib,Makefile} kernel/bpf lib) | tar -xf - cp %{_prefix}/src/linux/LICENSES/preferred/GPL-2.0 . sed -i -e 's/CFLAGS += -O2/CFLAGS = $(RPM_OPT_FLAGS)/' Makefile +%patch0 -p1 %build cd tools/bpf/bpftool %make_build \ feature-reallocarray=1 \ feature-libbfd-liberty=1 \ +%if %(if gcc -lsframe -shared 2>/dev/null ; then echo 1 ; else echo 0; fi; ) + feature-libbfd-liberty-sframe=1 \ +%endif feature-disassembler-four-args=1 \ all \ doc ++++++ binutils-2.40.patch ++++++ diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile index 4a95c017ad4c..9a4851df3276 100644 --- a/tools/bpf/bpftool/Makefile +++ b/tools/bpf/bpftool/Makefile @@ -139,6 +139,8 @@ SRCS = $(filter-out $(BFD_SRCS),$(wildcard *.c)) ifeq ($(feature-libbfd),1) LIBS += -lbfd -ldl -lopcodes +else ifeq ($(feature-libbfd-liberty-sframe),1) + LIBS += -lbfd -ldl -lopcodes -liberty -lsframe else ifeq ($(feature-libbfd-liberty),1) LIBS += -lbfd -ldl -lopcodes -liberty else ifeq ($(feature-libbfd-liberty-z),1)
