[OS-BUILD PATCHv2] aarch64: enable zboot

[Gerd Hoffmann (via Email Bridge)]

From: Gerd Hoffmann <kraxel(a)redhat.com&gt;

aarch64: enable zboot

Enable CONFIG_EFI_ZBOOT.

Also adapt %make_target and %kernel_image for zboot.

With the kernel self-uncompressing itself the bootloader or the
systemd-stub doesn't need to handle the uncompressing (and doesn't need
to know how the kernel is compressed, i.e. whenever it is .gz or .xz).

Some more background: https://github.com/systemd/systemd/issues/23788

It also makes aarch64 work more like x86_64 where the kernel
decompresses itself too.

Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com&gt;

diff --git a/redhat/configs/fedora/generic/CONFIG_EFI_ZBOOT
b/redhat/configs/fedora/generic/CONFIG_EFI_ZBOOT
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_EFI_ZBOOT
+++ b/redhat/configs/fedora/generic/CONFIG_EFI_ZBOOT
@@ -1 +1 @@
-# CONFIG_EFI_ZBOOT is not set
+CONFIG_EFI_ZBOOT=y
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
@@ -484,8 +484,8 @@ Summary: The Linux kernel
 %define all_arch_configs kernel-%{version}-aarch64*.config
 %define asmarch arm64
 %define hdrarch arm64
-%define make_target Image.gz
-%define kernel_image arch/arm64/boot/Image.gz
+%define make_target vmlinuz.efi
+%define kernel_image arch/arm64/boot/vmlinuz.efi
 %endif
 
 # Should make listnewconfig fail if there's config options

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

[Justin M. Forbes (via Email Bridge)]

From: Justin M. Forbes on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2283#note_1271...

While I did originally try to enable this for Fedora, we had to turn it off
quicky as it breaks CKI. It can't be re-enabled until CKI fixes their scripts
to handle it.

[Veronika Kabátová (via Email Bridge)]

From: Veronika Kabátová on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2283#note_1271...

We've sent a patch to fix the issue upstream: https://lore.kernel.org/linux-
arm-kernel/20221214132002.2547357-1-vkabatov(a)redhat.com/T/#u but I don't think
it got merged yet

[Gerd Hoffmann (via Email Bridge)]

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

Committed as 731c4eac848ff9dd42776da8ed3407b257e3abf0 and landed in 6.2-rc1

[Veronika Kabátová (via Email Bridge)]

From: Veronika Kabátová on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2283#note_1272...

Perfect, thank you! I have not received any response to the email besides the
first ack, so thanks for finding it. And since it's in the mainline already
the subsystem trees should have it in as well, in which case CKI should not
have any issues.

[Justin M. Forbes (via Email Bridge)]

From: Justin M. Forbes on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2283#note_1272...

For the spec changes, we either need to limit those to Fedora only, or we need
to turn on the config for both Fedora and ELN/RHEL.