From: Michael Hofmann <mhofmann@xxxxxxxxxx>
kernel.spec: add rpmbuild --without base option
Currently, it is possible to only build the base variant by specifying
--without debug. The same is not true if one wants to only build the
debug variant.
Using --with dbgonly will disable base variants, but will also disable a
variety of other subpackages.
Keeping the design pattern introduced by --without debug, add a
--without base. Rework --with dbgonly to be a superset of this.
Signed-off-by: Michael Hofmann <mhofmann@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
@@ -193,6 +193,8 @@ Summary: The Linux kernel
#
# standard kernel
%define with_up %{?_without_up: 0} %{?!_without_up: 1}
+# build the base variants
+%define with_base %{?_without_base: 0} %{?!_without_base: 1}
# build also debug variants
%define with_debug %{?_without_debug: 0} %{?!_without_debug: 1}
# kernel-zfcpdump (s390 specific kernel for zfcpdump)
@@ -205,7 +207,7 @@ Summary: The Linux kernel
%define with_realtime %{?_with_realtime: 1} %{?!_with_realtime: 0}
# Supported variants
-# (base) with_debug with_gcov
+# with_base with_debug with_gcov
# up X X X
# zfcpdump X X
# arm64_16k X X X
@@ -399,6 +401,7 @@ Summary: The Linux kernel
# if requested, only build debug kernel
%if %{with_dbgonly}
+%define with_base 0
%define with_vdso_install 0
%define with_perf 0
%define with_tools 0
@@ -606,22 +609,22 @@ Summary: The Linux kernel
%endif
# short-hand for "are we building base/non-debug variants of ...?"
-%if %{with_up} && !%{with_dbgonly}
+%if %{with_up} && %{with_base}
%define with_up_base 1
%else
%define with_up_base 0
%endif
-%if %{with_realtime} && !%{with_dbgonly}
+%if %{with_realtime} && %{with_base}
%define with_realtime_base 1
%else
%define with_realtime_base 0
%endif
-%if %{with_arm64_16k} && !%{with_dbgonly}
+%if %{with_arm64_16k} && %{with_base}
%define with_arm64_16k_base 1
%else
%define with_arm64_16k_base 0
%endif
-%if %{with_arm64_64k} && !%{with_dbgonly}
+%if %{with_arm64_64k} && %{with_base}
%define with_arm64_64k_base 1
%else
%define with_arm64_64k_base 0
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2647
_______________________________________________
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
