[rpms/sdubby] epel10.2: Add default kernel compatibility flag and install.conf file to force kernel-install to do the right thing, work around BZ 2271674

[rpms/sdubby] epel10.2: Add default kernel compatibility flag and install.conf file to force kernel-install to do the right thing, work around BZ 2271674

[Jeremy Linton]

A new commit has been pushed.

Repo   : rpms/sdubby
Branch : epel10.2
Commit : 0e71a0aa22108efb6538b1e306b68d48fccfe852
Author : Jeremy Linton <jlinton@redhat.com>
Date   : 2024-03-26T18:43:56-05:00
Stats  : +14/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/sdubby/c/0e71a0aa22108efb6538b1e306b68d48fccfe852?branch=epel10.2

Log:
Add default kernel compatibility flag and install.conf file to force kernel-install to do the right thing, work around BZ 2271674

---
diff --git a/install.conf b/install.conf
new file mode 100644
index 0000000..b934256
--- /dev/null
+++ b/install.conf
@@ -0,0 +1,5 @@
+# systemd-boot default anaconda installs
+# mounts the ESP at /boot/efi, tell kernel-install
+# that it should be putting kernel/initrd/bls/etc
+# entries there rather than in /boot
+BOOT_ROOT=/boot/efi

diff --git a/sdubby.spec b/sdubby.spec
index edd4f97..b3a7be2 100644
--- a/sdubby.spec
+++ b/sdubby.spec
@@ -4,7 +4,7 @@
 
 Name: sdubby
 Version: 1.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Set of systemd-boot shims that don't fit anywhere else in the distro
 License: GPLv2+
 URL:	 https://pagure.io/sdubby.git
@@ -16,6 +16,9 @@ Source2: COPYING
 Source3: entries.srel
 Source4: updateloaderentries.8
 Source5: README.md
+# another config script which should eventually be moved to
+# anaconda, because it knows where the ESP is actually mounted
+Source6: install.conf
 
 Requires: findutils
 Requires: util-linux
@@ -54,6 +57,7 @@ install -T -m 444 %{SOURCE3} %{buildroot}%{efi_esp_root}/loader/entries.srel
 ln -sr %{buildroot}%{_sbindir}/updateloaderentries %{buildroot}%{_sbindir}/grubby
 install -TD -m 444 %{SOURCE4} %{buildroot}%{_mandir}/man8/updateloaderentries.8
 gzip %{buildroot}%{_mandir}/man8/updateloaderentries.8
+install -TD -m 444 %{SOURCE6} %{buildroot}%{_sysconfdir}/kernel/install.conf
 
 # should we create /boot/efi/loader/loader.conf here?
 # instead we are ghosting the config file, and letting anaconda create it
@@ -71,10 +75,14 @@ gzip %{buildroot}%{_mandir}/man8/updateloaderentries.8
 # files on the ESP (fat) will always have 700
 %{efi_esp_root}/loader/entries
 %config(noreplace) %{efi_esp_root}/loader/entries.srel
+%config(noreplace) %{_sysconfdir}/kernel/install.conf
 %attr(0644,root,root) %ghost %config(noreplace) %{efi_esp_root}/loader/loader.conf
 
 
 %changelog
+* Tue Mar 26 2024 Jeremy Linton <jeremy.linton@arm.com> - 1.0-8
+- Add default kernel compatibility flag and install.conf file to force kernel-install to do the right thing, work around BZ 2271674
+
 * Mon Mar 18 2024 Adam Williamson <awilliam@redhat.com> - 1.0-7
 - Stop providing grubby (#2269992)