[OS-BUILD PATCH 0/2] Add rpmbuild --without base option

[Michael Hofmann (via Email Bridge)]

From: Michael Hofmann on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2719

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.

Convert `.gitlab-ci.yml` to use `--without debug` and --without base` to
select kernel variants.

This requires https://gitlab.com/cki-project/pipeline-
definition/-/merge_requests/1836 to be merged first. This ensures debug
kernels automatically get a `--without base`.

Signed-off-by: Michael Hofmann <mhofmann(a)redhat.com&gt;

---
 redhat/kernel.spec.template |  13 ++++++++-----
 .gitlab-ci.yml              |  16 ++++++++--------
 2 files changed, 16 insertions(+), 13 deletions(-)

[OS-BUILD PATCH 1/2] Add rpmbuild --without base option

[Michael Hofmann (via Email Bridge)]

From: Michael Hofmann <mhofmann(a)redhat.com&gt;

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(a)redhat.com&gt;

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/2719

[OS-BUILD PATCH 2/2] gitlab-ci: use --with debug/base to select kernel variants

[Michael Hofmann (via Email Bridge)]

From: Michael Hofmann <mhofmann(a)redhat.com&gt;

gitlab-ci: use --with debug/base to select kernel variants

Signed-off-by: Michael Hofmann <mhofmann(a)redhat.com&gt;

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -122,37 +122,37 @@ workflow:
 
 .variants:
   rawhide-up: &rawhide-up
-    rpmbuild_with: up
+    rpmbuild_with: up base
     package_name: kernel
     architectures: x86_64 aarch64 s390x ppc64le
     run_redhat_self_test: 'true'
   rawhide-up-debug: &rawhide-up-debug
-    rpmbuild_with: up dbgonly
+    rpmbuild_with: up debug
     package_name: kernel-debug
     architectures: x86_64 aarch64
   eln-up: &eln-up
-    rpmbuild_with: up
+    rpmbuild_with: up base
     package_name: kernel
     architectures: x86_64 aarch64 s390x ppc64le
     run_redhat_self_test: 'true'
   eln-up-debug: &eln-up-debug
-    rpmbuild_with: up dbgonly
+    rpmbuild_with: up debug
     package_name: kernel-debug
     architectures: x86_64 aarch64 s390x ppc64le
   eln-rt: &eln-rt
-    rpmbuild_with: realtime
+    rpmbuild_with: realtime base
     package_name: kernel-rt
     architectures: x86_64
   eln-rt-debug: &eln-rt-debug
-    rpmbuild_with: realtime dbgonly
+    rpmbuild_with: realtime debug
     package_name: kernel-rt-debug
     architectures: x86_64
   eln-64k: &eln-64k
-    rpmbuild_with: arm64_64k
+    rpmbuild_with: arm64_64k base
     package_name: kernel-64k
     architectures: aarch64
   eln-64k-debug: &eln-64k-debug
-    rpmbuild_with: arm64_64k dbgonly
+    rpmbuild_with: arm64_64k debug
     package_name: kernel-64k-debug
     architectures: aarch64
 

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2719

[Tales L. Aparecida (via Email Bridge)]

From: Tales L. Aparecida on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2719#note_1569...

Would you mind adding a prefix to your first commit?

I feel like there's no std yet, so pick one:

- `redhat/kernel.spec.template:`
- `kernel.spec.template:`
- `redhat: kernel.spec:`
- `[redhat] spec:`
- `kernel.spec:`

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2719#note_1569...

I'm with @tales-aparecida on ths, please fixup the commit.