From: Don Zickus <dzickus@xxxxxxxxxx>
Apply partial snippet configs to all configs
There is a macro all_arch_configs that tries to optimize what configs we
apply the partial snippets to. While it speeds up things up a bit, it
creates conflicts with CLANG options. The process_configs.sh script
still processes _all_ the arches and expects the CLANG options to be set
correctly.
I can either add in an arch specific option to process_configs.sh to
only process the configs the correct CLANG snippet was applied to _or_
just apply the snippets to _all_ the configs.
The latter is easier so that is what this change does. The cost is an
extra second to apply the snippets to more config files.
Signed-off-by: Don Zickus <dzickus@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
@@ -469,6 +469,8 @@ Summary: The Linux kernel
%endif
%endif
+%define all_configs %{name}-%{specrpmversion}-*.config
+
# don't build noarch kernels or headers (duh)
%ifarch noarch
%define with_up 0
@@ -480,7 +482,6 @@ Summary: The Linux kernel
%define with_bpftool 0
%define with_selftests 0
%define with_debug 0
-%define all_arch_configs %{name}-%{specrpmversion}-*.config
%endif
# sparse blows up on ppc
@@ -509,13 +510,11 @@ Summary: The Linux kernel
%ifarch i686
%define asmarch x86
%define hdrarch i386
-%define all_arch_configs %{name}-%{specrpmversion}-i?86*.config
%define kernel_image arch/x86/boot/bzImage
%endif
%ifarch x86_64
%define asmarch x86
-%define all_arch_configs %{name}-%{specrpmversion}-x86_64*.config
%define kernel_image arch/x86/boot/bzImage
%endif
@@ -526,19 +525,16 @@ Summary: The Linux kernel
%define kernel_image vmlinux
%define kernel_image_elf 1
%define use_vdso 0
-%define all_arch_configs %{name}-%{specrpmversion}-ppc64le*.config
%endif
%ifarch s390x
%define asmarch s390
%define hdrarch s390
-%define all_arch_configs %{name}-%{specrpmversion}-s390x.config
%define kernel_image arch/s390/boot/bzImage
%define vmlinux_decompressor arch/s390/boot/vmlinux
%endif
%ifarch aarch64
-%define all_arch_configs %{name}-%{specrpmversion}-aarch64*.config
%define asmarch arm64
%define hdrarch arm64
%define make_target vmlinuz.efi
@@ -1781,7 +1777,7 @@ FLAVOR=%{primary_target} SPECPACKAGE_NAME=%{name} SPECVERSION=%{specversion} SPE
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
-for i in %{all_arch_configs}
+for i in %{all_configs}
do
mv $i $i.tmp
./merge.py %{SOURCE3001} $i.tmp > $i
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2654
_______________________________________________
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
