From: Michael Hofmann on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2647
Fixes https://gitlab.com/cki-project/kernel-webhooks/-/issues/452
Signed-off-by: Michael Hofmann mhofmann@redhat.com
--- redhat/kernel.spec.template | 27 +++++++++++++++------------ .gitlab-ci.yml | 40 ++++++++++++++++++++++++++++++++-------- 2 files changed, 47 insertions(+), 20 deletions(-)
From: Michael Hofmann mhofmann@redhat.com
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@redhat.com
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
From: Michael Hofmann mhofmann@redhat.com
gitlab-ci: use --with debug/base to select kernel variants
Signed-off-by: Michael Hofmann mhofmann@redhat.com
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/2647
From: Michael Hofmann mhofmann@redhat.com
gitlab-ci: enable build-only pipelines for Rawhide/16k/aarch64
Fixes https://gitlab.com/cki-project/kernel-webhooks/-/issues/452
Signed-off-by: Michael Hofmann mhofmann@redhat.com
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index blahblah..blahblah 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -130,6 +130,14 @@ workflow: rpmbuild_with: up debug package_name: kernel-debug architectures: x86_64 aarch64 + rawhide-16k: &rawhide-16k + rpmbuild_with: arm64_16k base + package_name: kernel-16k + architectures: aarch64 + rawhide-16k-debug: &rawhide-16k-debug + rpmbuild_with: arm64_16k debug + package_name: kernel-16k-debug + architectures: aarch64 eln-up: &eln-up rpmbuild_with: up base package_name: kernel @@ -165,6 +173,14 @@ ark_debug_merge_request: extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot] variables: *rawhide-up-debug
+ark_16k_merge_request: + extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot] + variables: *rawhide-16k + +ark_16k_debug_merge_request: + extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot] + variables: *rawhide-16k-debug + # Rawhide baselines ark_baseline: extends: [.baseline, .trigger_rawhide, .reported_tests, .ark_latest_head] @@ -174,6 +190,14 @@ ark_debug_baseline: extends: [.baseline, .trigger_rawhide, .reported_tests, .ark_latest_head] variables: *rawhide-up-debug
+ark_16k_baseline: + extends: [.baseline, .trigger_rawhide, .no_tests, .ark_latest_head] + variables: *rawhide-16k + +ark_16k_debug_baseline: + extends: [.baseline, .trigger_rawhide, .no_tests, .ark_latest_head] + variables: *rawhide-16k-debug + # ELN CI eln_merge_request: extends: [.merge_request, .trigger_eln, .no_tests, .srpm_for_bot]
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2647
From: Michael Hofmann mhofmann@redhat.com
kernel.spec: allow to enable arm64_16k variant
Signed-off-by: Michael Hofmann mhofmann@redhat.com
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 @@ -200,7 +200,7 @@ Summary: The Linux kernel # kernel-zfcpdump (s390 specific kernel for zfcpdump) %define with_zfcpdump %{?_without_zfcpdump: 0} %{?!_without_zfcpdump: 1} # kernel-16k (aarch64 kernel with 16K page_size) -%define with_arm64_16k %{?_without_arm64_16k: 0} %{?!_without_arm64_16k: 1} +%define with_arm64_16k %{?_with_arm64_16k: 1} %{?!_with_arm64_16k: 0} # kernel-64k (aarch64 kernel with 64K page_size) %define with_arm64_64k %{?_without_arm64_64k: 0} %{?!_without_arm64_64k: 1} # kernel-rt (x86_64 and aarch64 only PREEMPT_RT enabled kernel) @@ -307,9 +307,6 @@ Summary: The Linux kernel %define with_arm64_64k 0 %endif
-# No arm64-16k flavor for now -%define with_arm64_16k 0 - %if %{with_verbose} %define make_opts V=1 %else
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2647
From: Michael Hofmann on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2647#note_1571453...
done!
From: Michael Hofmann mhofmann@redhat.com
kernel.spec: adjust build option comment
The comment was already wrong for realtime, which is disabled by default in Rawhide/ELN atm. With the arm64_16k variant, there are now two variants that are disabled by default.
Signed-off-by: Michael Hofmann mhofmann@redhat.com
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 @@ -187,9 +187,12 @@ Summary: The Linux kernel # should not be exported to RPM provides %global __provides_exclude_from ^%{_libexecdir}/kselftests
-# The following build options are enabled by default, but may become disabled -# by later architecture-specific checks. These can also be disabled by using -# --without <opt> in the rpmbuild command, or by forcing these values to 0. +# The following build options are (mostly) enabled by default, but may become +# enabled/disabled by later architecture-specific checks. +# Where disabled by default, they can be enabled by using --with <opt> in the +# rpmbuild command, or by forcing these values to 1. +# Where enabled by default, they can be disabled by using --without <opt> in +# the rpmbuild command, or by forcing these values to 0. # # standard kernel %define with_up %{?_without_up: 0} %{?!_without_up: 1}
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2647
kernel@lists.fedoraproject.org
-
Michael Hofmann (via Email Bridge)