From: Prarit Bhargava <prarit@xxxxxxxxxx>
kernel.spec.template: Fix --without bpftool
The selftests turn bpftool on unconditionally. If a user has specified
--without bpftool it means the user really wants to disable bpftool. In
this case the selftest should be disabled.
Disable selftests and output a message to the user disabled when --without
bpftool is specified.
Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx>
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
@@ -298,8 +298,6 @@ Summary: The Linux kernel
%define with_perf 0
%define with_tools 0
%define with_bpftool 0
-# selftests turns on bpftool
-%define with_selftests 0
# No realtime fedora variants
%define with_realtime 0
%define with_arm64_64k 0
@@ -445,9 +443,9 @@ Summary: The Linux kernel
%define use_vdso 1
%endif
-# selftests require bpftool to be built
-%if %{with_selftests}
-%define with_bpftool 1
+# selftests require bpftool to be built. If bpftools is disabled, then disable selftests
+%if %{with_bpftool} == 0
+%define with_selftests 0
%endif
%ifnarch noarch
@@ -2716,12 +2714,14 @@ if [ -f $DevelDir/vmlinux.h ]; then
RPM_VMLINUX_H=$DevelDir/vmlinux.h
fi
+%if %{with_bpftool}
%global bpftool_make \
%{__make} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" EXTRA_LDFLAGS="%{__global_ldflags}" DESTDIR=$RPM_BUILD_ROOT %{?make_opts} VMLINUX_H="${RPM_VMLINUX_H}" V=1
-%if %{with_bpftool}
pushd tools/bpf/bpftool
%{bpftool_make}
popd
+%else
+echo "bpftools disabled ... disabling selftests"
%endif
%if %{with_selftests}
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2720
_______________________________________________
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
