From 9546f2bd72d838410d808d1614e80e650b3c7471ee1555398f5c795617507238 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 17 Jul 2021 18:00:13 +0000 Subject: [PATCH 1/4] Accepting request 906855 from home:michals - Use system libbpf when available (bsc#1188420 bsc#1188419 jsc#SLE-17288 jsc#SLE-18805). OBS-URL: https://build.opensuse.org/request/show/906855 OBS-URL: https://build.opensuse.org/package/show/devel:tools/dwarves?expand=0&rev=71 --- _service | 1 + _servicedata | 4 ++++ dwarves.changes | 5 +++++ dwarves.spec | 15 +++++++++++++-- 4 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 _servicedata diff --git a/_service b/_service index 20140ce..918b344 100644 --- a/_service +++ b/_service @@ -5,6 +5,7 @@ master v(.*) @PARENT_TAG@+git@TAG_OFFSET@.%h + enable dwarves diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..4be9d11 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + git://git.kernel.org/pub/scm/devel/pahole/pahole + 1ef87b26fd268b529b3568f3625d9eb10753a1a8 \ No newline at end of file diff --git a/dwarves.changes b/dwarves.changes index d7b9407..fd44b19 100644 --- a/dwarves.changes +++ b/dwarves.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jul 17 15:48:30 UTC 2021 - Michal Suchanek + +- Use system libbpf when available (bsc#1188420 bsc#1188419 jsc#SLE-17288 jsc#SLE-18805). + ------------------------------------------------------------------- Thu Jul 15 20:04:36 UTC 2021 - msuchanek@suse.com diff --git a/dwarves.spec b/dwarves.spec index f0460ed..f2c4507 100644 --- a/dwarves.spec +++ b/dwarves.spec @@ -16,6 +16,10 @@ # +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 +%define have_libbpf 1 +%endif + Name: dwarves Version: 1.21+git175.1ef87b2 Release: 0 @@ -34,7 +38,9 @@ BuildRequires: cmake BuildRequires: libdw-devel >= 0.171 BuildRequires: libelf-devel BuildRequires: pkgconfig -BuildRequires: pkgconfig(libbpf) +%if 0%{?have_libbpf} +BuildRequires: pkgconfig(libbpf) >= 0.4.0 +%endif BuildRequires: pkgconfig(zlib) # Also known by its most prominent tool Provides: pahole = %version-%release @@ -93,7 +99,12 @@ for processing DWARF, a debugging data format for ELF files. sv="$PWD/lib.v" ver=$(echo %version | cut -d+ -f1) echo "DWARVES_$ver{ global: *; };" >"$sv" -%cmake -DCMAKE_SHARED_LINKER_FLAGS:STRING="-Wl,--version-script=$sv" +%cmake -DCMAKE_SHARED_LINKER_FLAGS:STRING="-Wl,--version-script=$sv" \ +%if 0%{?have_libbpf} + -DLIBBPF_EMBEDDED=OFF +%else + +%endif %cmake_build %install From 58ed810138f4a0a7f09d1f7c28062fa101d6e1dc9c4051252096eaf26db5901b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 17 Jul 2021 18:00:43 +0000 Subject: [PATCH 2/4] don't use changesgenerate OBS-URL: https://build.opensuse.org/package/show/devel:tools/dwarves?expand=0&rev=72 --- _service | 1 - _servicedata | 4 ---- 2 files changed, 5 deletions(-) delete mode 100644 _servicedata diff --git a/_service b/_service index 918b344..20140ce 100644 --- a/_service +++ b/_service @@ -5,7 +5,6 @@ master v(.*) @PARENT_TAG@+git@TAG_OFFSET@.%h - enable dwarves diff --git a/_servicedata b/_servicedata deleted file mode 100644 index 4be9d11..0000000 --- a/_servicedata +++ /dev/null @@ -1,4 +0,0 @@ - - - git://git.kernel.org/pub/scm/devel/pahole/pahole - 1ef87b26fd268b529b3568f3625d9eb10753a1a8 \ No newline at end of file From c6fcc3b39fc90982a7a23f8b45f73070f276bb322c50c23f5abf7f78ae1276b4 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 29 Jul 2021 05:38:09 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/devel:tools/dwarves?expand=0&rev=74 --- dwarves.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dwarves.spec b/dwarves.spec index f2c4507..0159d34 100644 --- a/dwarves.spec +++ b/dwarves.spec @@ -29,7 +29,7 @@ Group: Development/Tools/Debuggers URL: https://acmel.wordpress.com/ #Git-Clone: git://git.kernel.org/pub/scm/devel/pahole/pahole #Git-Web: http://git.kernel.org/cgit/devel/pahole/pahole.git -Source: %{name}-%{version}.tar.xz +Source: %name-%version.tar.xz #Source: https://fedorapeople.org/~acme/dwarves/dwarves-%version.tar.xz #Source2: https://fedorapeople.org/~acme/dwarves/dwarves-%version.tar.sign Source9: baselibs.conf @@ -101,10 +101,9 @@ ver=$(echo %version | cut -d+ -f1) echo "DWARVES_$ver{ global: *; };" >"$sv" %cmake -DCMAKE_SHARED_LINKER_FLAGS:STRING="-Wl,--version-script=$sv" \ %if 0%{?have_libbpf} - -DLIBBPF_EMBEDDED=OFF -%else - + -DLIBBPF_EMBEDDED=OFF \ %endif + %nil %cmake_build %install From 32c85307f7a22ff99cf74d5b15f904efcfe83cfa4efe4aca0b40aef5e2fde623 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 13 Aug 2021 14:54:29 +0000 Subject: [PATCH 4/4] Accepting request 911975 from home:michals - 15.4 has new elfutils, drop libebl-plugins dependency. - Update to version 1.21+git177.1ef87b2: * Fix crash with split BTF debuginfo * CMakeList.txt: Bump version to the upcoming 1.22 release, not out of the door yet - Remove upstreamed patch dwarves-Prep-1.22.patch OBS-URL: https://build.opensuse.org/request/show/911975 OBS-URL: https://build.opensuse.org/package/show/devel:tools/dwarves?expand=0&rev=75 --- dwarves-1.21+git175.1ef87b2.tar.xz | 3 --- dwarves-1.21+git177.1ef87b2.tar.xz | 3 +++ dwarves-Prep-1.22.patch | 14 -------------- dwarves.changes | 9 +++++++++ dwarves.spec | 12 +++++++----- 5 files changed, 19 insertions(+), 22 deletions(-) delete mode 100644 dwarves-1.21+git175.1ef87b2.tar.xz create mode 100644 dwarves-1.21+git177.1ef87b2.tar.xz delete mode 100644 dwarves-Prep-1.22.patch diff --git a/dwarves-1.21+git175.1ef87b2.tar.xz b/dwarves-1.21+git175.1ef87b2.tar.xz deleted file mode 100644 index db91ebd..0000000 --- a/dwarves-1.21+git175.1ef87b2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ca6190d1ae24570a4162a085b9c525a9b7235e8c2a46ea655bbce248df90172 -size 910348 diff --git a/dwarves-1.21+git177.1ef87b2.tar.xz b/dwarves-1.21+git177.1ef87b2.tar.xz new file mode 100644 index 0000000..5c7dc4e --- /dev/null +++ b/dwarves-1.21+git177.1ef87b2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6ad2458d9ac5d60ab84fc150481e0f1331a6b90b917719542e47ec02738ef3f +size 910360 diff --git a/dwarves-Prep-1.22.patch b/dwarves-Prep-1.22.patch deleted file mode 100644 index 54fd905..0000000 --- a/dwarves-Prep-1.22.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- dwarves-1.21+git175.1ef87b2/CMakeLists.txt 2021-06-17 02:07:22.000000000 +0200 -+++ dwarves-1.21+git175.1ef87b2/CMakeLists.txt 2021-07-15 22:09:41.020434732 +0200 -@@ -53,9 +53,9 @@ - endif (NOT DEFINED BUILD_SHARED_LIBS) - - # Just for grepping, DWARVES_VERSION isn't used anywhere anymore --# add_definitions(-D_GNU_SOURCE -DDWARVES_VERSION="v1.21") -+# add_definitions(-D_GNU_SOURCE -DDWARVES_VERSION="v1.22") - add_definitions(-D_GNU_SOURCE -DDWARVES_MAJOR_VERSION=1) --add_definitions(-D_GNU_SOURCE -DDWARVES_MINOR_VERSION=21) -+add_definitions(-D_GNU_SOURCE -DDWARVES_MINOR_VERSION=22) - find_package(DWARF REQUIRED) - find_package(ZLIB REQUIRED) - diff --git a/dwarves.changes b/dwarves.changes index fd44b19..d8c7f94 100644 --- a/dwarves.changes +++ b/dwarves.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Aug 13 11:35:30 UTC 2021 - msuchanek@suse.com + +- 15.4 has new elfutils, drop libebl-plugins dependency. +- Update to version 1.21+git177.1ef87b2: + * Fix crash with split BTF debuginfo + * CMakeList.txt: Bump version to the upcoming 1.22 release, not out of the door yet + - Remove upstreamed patch dwarves-Prep-1.22.patch + ------------------------------------------------------------------- Sat Jul 17 15:48:30 UTC 2021 - Michal Suchanek diff --git a/dwarves.spec b/dwarves.spec index 0159d34..866d4a2 100644 --- a/dwarves.spec +++ b/dwarves.spec @@ -19,9 +19,12 @@ %if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 %define have_libbpf 1 %endif +%if ( 0%{?sle_version} && 0%{?sle_version} <= 150300 ) || ( 0%{?suse_version} && 0%{?suse_version} < 1500 ) +%define have_libebl-plugins 1 +%endif Name: dwarves -Version: 1.21+git175.1ef87b2 +Version: 1.21+git177.1ef87b2 Release: 0 Summary: DWARF utilities License: GPL-2.0-only @@ -29,11 +32,10 @@ Group: Development/Tools/Debuggers URL: https://acmel.wordpress.com/ #Git-Clone: git://git.kernel.org/pub/scm/devel/pahole/pahole #Git-Web: http://git.kernel.org/cgit/devel/pahole/pahole.git -Source: %name-%version.tar.xz +Source: %{name}-%{version}.tar.xz #Source: https://fedorapeople.org/~acme/dwarves/dwarves-%version.tar.xz #Source2: https://fedorapeople.org/~acme/dwarves/dwarves-%version.tar.sign Source9: baselibs.conf -Patch0: dwarves-Prep-1.22.patch BuildRequires: cmake BuildRequires: libdw-devel >= 0.171 BuildRequires: libelf-devel @@ -44,7 +46,7 @@ BuildRequires: pkgconfig(libbpf) >= 0.4.0 BuildRequires: pkgconfig(zlib) # Also known by its most prominent tool Provides: pahole = %version-%release -%if 0%{?suse_version} < 1550 +%if 0%{?have_libebl_plugins} BuildRequires: libebl-devel %endif @@ -70,7 +72,7 @@ about inlining, etc. %package -n libdwarves1 Summary: DWARF processing libraries of dwarves tools Group: System/Libraries -%if 0%{?suse_version} < 1550 +%if 0%{?have_libebl_plugins} Requires: libebl-plugins %endif