[OS-BUILD PATCHv2] aarch64: enable uki

[Gerd Hoffmann (via Email Bridge)]

From: Gerd Hoffmann

aarch64: enable uki

Now, with CONFIG_EFI_ZBOOT enabled and aarch64 kernels being
self-unpacking efi binaries instead of gzipped images, building
aarch64 UKIs actually works.

Flip the switch and enable them.

Also add descriptions and scripts for the 16k and 64k kernel
variants.

Signed-off-by: Gerd Hoffmann

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
@@ -285,7 +285,7 @@ Summary: The Linux kernel
 # Want to build a vanilla kernel build without any non-upstream patches?
 %define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}

-%ifarch x86_64
+%ifarch x86_64 aarch64
 %define with_efiuki %{?_without_efiuki: 0} %{?!_without_efiuki: 1}
 %else
 %define with_efiuki 0
@@ -1656,6 +1656,26 @@ Prebuilt debug unified kernel image for virtual machines.
 Prebuilt default unified kernel image for virtual machines.
 %endif

+%if %{with_arm64_16k} && %{with_debug} && %{with_efiuki}
+%description 16k-debug-uki-virt
+Prebuilt 16k debug unified kernel image for virtual machines.
+%endif
+
+%if %{with_arm64_16k_base} && %{with_efiuki}
+%description 16k-uki-virt
+Prebuilt 16k unified kernel image for virtual machines.
+%endif
+
+%if %{with_arm64_64k} && %{with_debug} && %{with_efiuki}
+%description 64k-debug-uki-virt
+Prebuilt 64k debug unified kernel image for virtual machines.
+%endif
+
+%if %{with_arm64_64k_base} && %{with_efiuki}
+%description 64k-uki-virt
+Prebuilt 64k unified kernel image for virtual machines.
+%endif
+
 %if %{with_ipaclones}
 %kernel_ipaclones_package
 %endif
@@ -3353,6 +3373,16 @@ fi\
 %kernel_variant_post -v 16k-debug
 %endif

+%if %{with_arm64_16k} && %{with_debug} && %{with_efiuki}
+%kernel_variant_posttrans -v 16k-debug -u virt
+%kernel_variant_preun -v 16k-debug -u virt
+%endif
+
+%if %{with_arm64_16k_base} && %{with_efiuki}
+%kernel_variant_posttrans -v 16k -u virt
+%kernel_variant_preun -v 16k -u virt
+%endif
+
 %if %{with_arm64_64k_base}
 %kernel_variant_preun -v 64k
 %kernel_variant_post -v 64k
@@ -3363,6 +3393,16 @@ fi\
 %kernel_variant_post -v 64k-debug
 %endif

+%if %{with_arm64_64k} && %{with_debug} && %{with_efiuki}
+%kernel_variant_posttrans -v 64k-debug -u virt
+%kernel_variant_preun -v 64k-debug -u virt
+%endif
+
+%if %{with_arm64_64k_base} && %{with_efiuki}
+%kernel_variant_posttrans -v 64k -u virt
+%kernel_variant_preun -v 64k -u virt
+%endif
+
 %if %{with_realtime_base}
 %kernel_variant_preun -v rt
 %kernel_variant_post -v rt -r (kernel|kernel-smp)

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

[Gerd Hoffmann (via Email Bridge)]

From: Gerd Hoffmann on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2818#note_1641304...

Fixed now.

[Prarit Bhargava (via Email Bridge)]

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

Approving but I think others should take a look as well.  @jstancek
@jmflinuxtx @ptalbert?