On Tue, Dec 01, 2020 at 05:27:34PM -0000, GitLab Bridge on behalf of dzickusrh wrote:
> From: Don Zickus <dzickus@xxxxxxxxxx>
>
> This option is needed to allow the latest features of bpftool
> to compile correctly. Currently it was disabled because of
> a gcc bug around DWARF info. That has been resolved with the
> latest gcc and/or dwarves package. Re-enable.
>
> Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
>
> V2: Add dwarves BuildRequires to eln
> ---
> redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF | 2 +-
> redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF | 1 -
> redhat/kernel.spec.template | 4 ----
> 3 files changed, 1 insertion(+), 6 deletions(-)
> delete mode 100644 redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF
>
> diff --git a/redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF b/redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF
> index 3b5ac748f282..39227b4511af 100644
> --- a/redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF
> +++ b/redhat/configs/common/generic/CONFIG_DEBUG_INFO_BTF
> @@ -1 +1 @@
> -# CONFIG_DEBUG_INFO_BTF is not set
> +CONFIG_DEBUG_INFO_BTF=y
> diff --git a/redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF b/redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF
> deleted file mode 100644
> index 39227b4511af..000000000000
> --- a/redhat/configs/fedora/generic/CONFIG_DEBUG_INFO_BTF
> +++ /dev/null
> @@ -1 +0,0 @@
> -CONFIG_DEBUG_INFO_BTF=y
> diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
> index 4d16c0005536..19ff250bda48 100644
> --- a/redhat/kernel.spec.template
> +++ b/redhat/kernel.spec.template
> @@ -501,9 +501,7 @@ BuildRequires: kmod, patch, bash, tar, git-core
> BuildRequires: bzip2, xz, findutils, gzip, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk
> BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex
> BuildRequires: net-tools, hostname, bc, elfutils-devel
> -%if 0%{?fedora}
> BuildRequires: dwarves
> -%endif
> BuildRequires: python3-devel
> %if %{with_headers}
> BuildRequires: rsync
> @@ -544,9 +542,7 @@ BuildConflicts: rhbuildsys(DiskFree) < 500Mb
> %if %{with_debuginfo}
> BuildRequires: rpm-build, elfutils
> BuildConflicts: rpm < 4.13.0.1-19
> -%if 0%{?fedora}
> BuildConflicts: dwarves < 1.13
> -%endif
> # Most of these should be enabled after more investigation
> %undefine _include_minidebuginfo
> %undefine _find_debuginfo_dwz_opts
> --
> GitLab
Acked-by: Herton R. Krzesinski <herton@xxxxxxxxxx>
--
[]'s
Herton
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
