[OS-BUILD PATCH] redhat/kernel.spec.template: Fix RHEL systemd-boot-unsigned dependency for

[Prarit Bhargava (via Email Bridge)]

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

redhat/kernel.spec.template: Fix RHEL systemd-boot-unsigned dependency for
RHEL

systemd-boot-unsigned should also only be included in .eln.

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
@@ -726,9 +726,9 @@ BuildRequires: dracut
 BuildRequires: binutils
 # For the initrd
 BuildRequires: lvm2
-%if 0%{?fedora} > 37
-# The UKI code was introduced in Fedora 38 and is not needed by
-# earlier versions.  This wrapper can be removed in Fedora 41.
+%if 0%{?fedora} > 37 || 0%{?rhel} > 9
+# The UKI code was introduced in Fedora 38 and is not needed by earlier
+# versions.  This wrapper can be removed for fedora in Fedora 41.
 BuildRequires: systemd-boot-unsigned
 %endif
 # For systemd-stub and systemd-pcrphase

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

[Jeffrey Layton (via Email Bridge)]

From: Jeffrey Layton on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2341#note_1295...

Shouldn't this be >= 9 ? We need this change in RHEL9 as well as 10, no?

[Prarit Bhargava (via Email Bridge)]

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

Nope, RHEL9 doesn't need this package AFAICT.

[Jeffrey Layton (via Email Bridge)]

From: Jeffrey Layton on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2341#note_1295...

This packaging change seems to have crept into more recent systemd packages on
rhel9 though. My centos9 dist-brew build failed even with this change because
of:

`dracut: Can't find a uefi stub '/usr/lib/systemd/boot/efi/linuxx64.efi.stub'
to create a UEFI executable`

That build had systemd-252-8.el9.x86_64 installed. The brew build for that is
here

     https://brewweb.engineering.redhat.com/brew/buildinfo?buildID=2393085

...and with that, the uefi stub is in systemd-boot-
unsigned-252-8.el9.x86_64.rpm.

[Rafael Aquini (via Email Bridge)]

From: Rafael Aquini on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2341#note_1295...

I observed the same failure happening earlier today, and the failure happens
for any centos-stream-9 kernel newer than -269.el9 which is where the
dependency on systemd-boot-unsigned was introduced

[Herton R. Krzesinski (via Email Bridge)]

From: Herton R. Krzesinski on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2341#note_1295...

As Aquini pointed out: https://bugzilla.redhat.com/show_bug.cgi?id=2157663 -
they changed it on rhel9 now, surprisingly now breaking any kernel build on
rhel9

[Justin M. Forbes (via Email Bridge)]

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

Wonder if they plan to change it in Fedora 37 too? Not too concerned with 36,
but if they change 37, we can drop the conditional all together.  Sure, RHEL 8
won't build it, but I don't think we support RHEL 8 building this kernel as it
is.

[Prarit Bhargava (via Email Bridge)]

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

This is much more confusing than I realized.  It looks like a change did make
it into RHEL9 to update systemd, so this additional change may not be
necessary.  I think for our sanity ATM we probably want to wait a week to see
where the systemd update ends up:

https://src.fedoraproject.org/rpms/systemd

RHEL9 BZ: https://bugzilla.redhat.com/show_bug.cgi?id=2174371

[Justin M. Forbes (via Email Bridge)]

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

I pinged zbyszek on IRC, the split out can happen for F37 too, so my
recommendation for kernel-ark is just to drop the entire conditional. There
might be a brief period that F36 is a supported release and can't build a
rawhide kernel, but that is short lived.

[Justin M. Forbes (via Email Bridge)]

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

Adding this MR as it is to include in release as a temporary work around so
that ELN builds from ark-latest until we determine the proper solution.

[Justin M. Forbes (via Email Bridge)]

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

So it seems that RHEL will be keeping this new package too. Once @zbyszek gets
the F37 split pushed, we can drop this and revert the previous conditional.

[Zbigniew Jędrzejewski-Szmek (via Email Bridge)]

From: Zbigniew Jędrzejewski-Szmek on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2341#note_1303...

The split was pushed into f37-stable today, i.e. it should be available
tomorrow after the next compose.

[Patrick Talbert (via Email Bridge)]

From: Patrick Talbert on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2341#note_1304...

This issue has been addressed in !2355.