Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package bpftool for openSUSE:Factory checked
in at 2024-05-23 15:34:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bpftool (Old)
and /work/SRC/openSUSE:Factory/.bpftool.new.24587 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bpftool"
Thu May 23 15:34:46 2024 rev:12 rq:1175869 version:7.4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/bpftool/bpftool.changes 2024-04-16
20:04:38.402205305 +0200
+++ /work/SRC/openSUSE:Factory/.bpftool.new.24587/bpftool.changes
2024-05-23 15:35:21.483828500 +0200
@@ -1,0 +2,6 @@
+Wed May 22 09:43:32 UTC 2024 - Shung-Hsi Yu <shung-hsi...@suse.com>
+
+- Update LLVM version selection logic to align with bcc and bpftrace
+ * narrow down the dependency to clang and llvm
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bpftool.spec ++++++
--- /var/tmp/diff_new_pack.3FFfqA/_old 2024-05-23 15:35:22.819876982 +0200
+++ /var/tmp/diff_new_pack.3FFfqA/_new 2024-05-23 15:35:22.827877273 +0200
@@ -16,6 +16,28 @@
#
+# Use default LLVM on openSUSE unless it is not yet supported
+%if 0%{?suse_version} >= 1600 || 0%{?is_opensuse}
+ %if 0%{?product_libs_llvm_ver} > 17
+ %define llvm_major_version 17
+ %else
+ %define llvm_major_version %{nil}
+ %endif
+%else
+ # Hard-code latest LLVM for SLES, the default version is too old
+ %if 0%{?sle_version} == 150600
+ %define llvm_major_version 17
+ %else
+ %if 0%{?sle_version} == 150500
+ %define llvm_major_version 15
+ %else
+ %if 0%{?sle_version} == 150400
+ %define llvm_major_version 11
+ %endif
+ %endif
+ %endif
+%endif
+
Name: bpftool
Version: 7.4.0
Release: 0
@@ -26,19 +48,14 @@
Source0:
https://github.com/libbpf/bpftool/releases/download/v%{version}/bpftool-libbpf-v%{version}-sources.tar.gz
Patch0: binutils-2.40.patch
BuildRequires: binutils-devel
-%if 0%{?suse_version} && 0%{?suse_version} <= 1500
-%if 0%{?sle_version} < 150400
-BuildRequires: clang12-devel
-%else
-BuildRequires: clang13-devel
-%endif
-%else
-BuildRequires: clang-devel
-%endif
+# Needed for compiling included BPF program (i.e. skeletons)
+BuildRequires: clang%{llvm_major_version}
BuildRequires: docutils
BuildRequires: libcap-devel
BuildRequires: libelf-devel
BuildRequires: libzstd-devel
+# llvm-strip is needed for the included BPF program (i.e. skeletons)
+BuildRequires: llvm%{llvm_major_version}
%description
bpftool allows for inspection and simple modification of BPF objects (programs
