[OS-BUILD PATCH 4/5] redhat/kernel.spec.template: Reorganize RHEL and Fedora specific files

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/kernel.spec.template: Reorganize RHEL and Fedora specific files

Reorganize the RHEL and Fedora specific files into a single section.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -690,13 +690,6 @@ Source1: Makefile.rhelver
 %define signing_key_filename kernel-signing-s390.cer
 %endif
 
-%if 0%{?include_rhel}
-Source8: x509.genkey.rhel
-%endif
-%if 0%{?include_fedora}
-Source9: x509.genkey.fedora
-%endif
-
 %if %{?released_kernel}
 
 Source10: redhatsecurebootca5.cer
@@ -741,40 +734,19 @@ Source13: redhatsecureboot003.cer
 # released_kernel
 %endif
 
-%if 0%{?include_rhel}
-Source22: mod-extra.list.rhel
-%endif
-%if 0%{?include_fedora}
-Source16: mod-extra.list.fedora
-%endif
 Source17: mod-denylist.sh
 Source18: mod-sign.sh
 Source79: parallel_xz.sh
 
-%if 0%{?include_fedora}
-Source80: filter-x86_64.sh.fedora
-Source81: filter-armv7hl.sh.fedora
-Source82: filter-i686.sh.fedora
-Source83: filter-aarch64.sh.fedora
-Source86: filter-ppc64le.sh.fedora
-Source87: filter-s390x.sh.fedora
-Source89: filter-modules.sh.fedora
-%endif
-
-%if 0%{?include_rhel}
-Source90: filter-x86_64.sh.rhel
-Source91: filter-armv7hl.sh.rhel
-Source92: filter-i686.sh.rhel
-Source93: filter-aarch64.sh.rhel
-Source96: filter-ppc64le.sh.rhel
-Source97: filter-s390x.sh.rhel
-Source99: filter-modules.sh.rhel
-%endif
 %define modsign_cmd %{SOURCE18}
 
 %if 0%{?include_rhel}
+Source8: x509.genkey.rhel
+
 Source20: kernel-aarch64-rhel.config
 Source21: kernel-aarch64-debug-rhel.config
+Source22: mod-extra.list.rhel
+
 Source30: kernel-ppc64le-rhel.config
 Source31: kernel-ppc64le-debug-rhel.config
 Source32: kernel-s390x-rhel.config
@@ -782,9 +754,20 @@ Source33: kernel-s390x-debug-rhel.config
 Source34: kernel-s390x-zfcpdump-rhel.config
 Source35: kernel-x86_64-rhel.config
 Source36: kernel-x86_64-debug-rhel.config
+
+Source90: filter-x86_64.sh.rhel
+Source91: filter-armv7hl.sh.rhel
+Source92: filter-i686.sh.rhel
+Source93: filter-aarch64.sh.rhel
+Source96: filter-ppc64le.sh.rhel
+Source97: filter-s390x.sh.rhel
+Source99: filter-modules.sh.rhel
 %endif
 
 %if 0%{?include_fedora}
+Source9: x509.genkey.fedora
+Source16: mod-extra.list.fedora
+
 Source37: kernel-aarch64-fedora.config
 Source38: kernel-aarch64-debug-fedora.config
 Source39: kernel-armv7hl-fedora.config
@@ -799,6 +782,14 @@ Source47: kernel-s390x-fedora.config
 Source48: kernel-s390x-debug-fedora.config
 Source49: kernel-x86_64-fedora.config
 Source50: kernel-x86_64-debug-fedora.config
+
+Source80: filter-x86_64.sh.fedora
+Source81: filter-armv7hl.sh.fedora
+Source82: filter-i686.sh.fedora
+Source83: filter-aarch64.sh.fedora
+Source86: filter-ppc64le.sh.fedora
+Source87: filter-s390x.sh.fedora
+Source89: filter-modules.sh.fedora
 %endif
 
 

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