From 364f54b340d7c2ec2722db55eb263b7ac99acf24 Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Apr 25 2022 11:36:03 +0000 Subject: pahole 1.22 required for full BTF features. also recommend pahole for kernel-source to make the kernel buildable with standard config --- diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in index 3ffc8da..138c8e5 100644 --- a/rpm/kernel-binary.spec.in +++ b/rpm/kernel-binary.spec.in @@ -1298,7 +1298,7 @@ Requires: kernel-source-vanilla = %version-%source_rel Supplements: packageand(%name:kernel-source-vanilla) %endif %if "%CONFIG_DEBUG_INFO_BTF_MODULES" == "y" -Requires: dwarves >= 1.21 +Requires: dwarves >= 1.22 %endif @PROVIDES_OBSOLETES_DEVEL@ %obsolete_rebuilds %name-devel diff --git a/rpm/kernel-source.spec.in b/rpm/kernel-source.spec.in index 2647269..50ed136 100644 --- a/rpm/kernel-source.spec.in +++ b/rpm/kernel-source.spec.in @@ -129,6 +129,10 @@ Recommends: bison Recommends: flex Recommends: libelf-devel Recommends: openssl-devel +# pahole needed for BTF +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 +Recommends: dwarves >= 1.22 +%endif # dracut no longer carries installkernel %if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300 Recommends: kernel-install-tools