From: Justin M. Forbes <jforbes@xxxxxxxxxxxxxxxxx> Don't use upstream bpftool version for Fedora package Upstream bpftool went with their own versioning. While this works in rawhide and RHEL where release is bumped wth every build, it does not work with Fedora. Because bpftool sublevel is not bumped with stable updates, and we don't update the release in Fedora when the version has changed, we ended up with a failure because the bpftool subpackage version already exists. For Fedora, we will stick with the kernel versioning for the package. bpftool -V still displays the upstream bpftool version number. Signed-off-by: Justin M. Forbes <jforbes@xxxxxxxxxxxxxxxxx> diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100644 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -1227,7 +1227,14 @@ analysing the logical and timing behavior of Linux. %if %{with_bpftool} +%if 0%{?fedora} +# bpftoolverion doesn't bump with stable updates so let's stick with +# upstream kernel version for the package name. We still get correct +# output with bpftool -V. +%define bpftoolversion %specrpmversion +%else %define bpftoolversion %%SPECBPFTOOLVERSION%% +%endif %package -n bpftool Summary: Inspection and simple manipulation of eBPF programs and maps -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2907 -- _______________________________________________ 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 Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue