Re: [OS-BUILD PATCHv4 3/6] redhat: RT packaging changes

["Jan Stancek (via Email Bridge)" <cki-gitlab@xxxxxxxxxx>]

From: Jan Stancek on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2403#note_1419839011

efiuki builds now when -rt is disabled, but with -rt enabled build fails at:
```
rpmbuild -bb  --target=x86_64  --without=debug  --with=realtime
build/SPECS/kernel.spec
Building target platforms: x86_64
Building for target x86_64
error: Package has no %description: kernel-rt-uki-virt
```

You need some (maybe prettier) version of patch below to build/package efiuki
only for 'up' variant:
```diff
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index 8929b58e1c01..d4b157fa7bf4 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -1521,7 +1521,7 @@ Requires: kernel-%{?1:%{1}-}-modules-core-uname-r =
%{KVERREL}%{uname_variant %{
 %endif\
 %if "%{1}" == "rt" || "%{1}" == "rt-debug"\
 %{expand:%%kernel_kvm_package %{?1:%{1}}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\
-%endif \
+%else \
 %if %{with_efiuki}\
 %package %{?1:%{1}-}uki-virt\
 Summary: %{variant_summary} unified kernel image for virtual machines\
@@ -1529,6 +1529,7 @@ Provides: installonlypkg(kernel)\
 Provides: kernel-%{?1:%{1}-}uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
 Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix
%{?1:+%{1}}}\
 %endif\
+%endif \
 %if %{with_gcov}\
 %{expand:%%kernel_gcov_package %{?1:%{1}}}\
 %endif\
@@ -2448,6 +2449,9 @@ BuildKernel() {
        touch lib/modules/$KernelVer/modules.builtin
     fi

+    if [[ "$Variant" == "rt" || "$Variant" == "rt-debug" ]]; then
+       echo "Skipping efiuki build"
+    else
 %if %{with_efiuki}
     popd

@@ -2486,6 +2490,7 @@ BuildKernel() {

 # with_efiuki
 %endif
+    fi # "$Variant" == "rt" || "$Variant" == "rt-debug"

     remove_depmod_files

@@ -3598,14 +3603,14 @@ fi
 %{expand:%%files %{?3:%{3}-}modules-partner}\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/partner\
 %endif\
-%if "%{3}" == "rt" || "%{3}" == "rt-debug"\
-%{expand:%%files -f %{name}-%{?3:%{3}-}kvm.list %{?3:%{3}-}kvm}\
-%endif\
 %if %{with_debuginfo}\
 %ifnarch noarch\
 %{expand:%%files -f debuginfo%{?3}.list %{?3:%{3}-}debuginfo}\
 %endif\
 %endif\
+%if "%{3}" == "rt" || "%{3}" == "rt-debug"\
+%{expand:%%files -f %{name}-%{?3:%{3}-}kvm.list %{?3:%{3}-}kvm}\
+%else\
 %if %{with_efiuki}\
 %{expand:%%files %{?3:%{3}-}uki-virt}\
 %attr(0600, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/System.map\
@@ -3615,6 +3620,7 @@ fi
 /lib/modules/%{KVERREL}%{?3:+%{3}}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-virt.efi\
 %ghost /%{image_install_path}/efi/EFI/Linux/%{?-k:%{-k*}}%{!?-k:*}-%{KVERREL}
%{?3:+%{3}}.efi\
 %endif\
+%endif\
 %if %{?3:1} %{!?3:0}\
 %{expand:%%files %{3}}\
 %endif\
```
_______________________________________________
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