Re: [PR PATCH] [Updated] gummiboot: split *.efi.stub into subpackage

[jirutka <jirutka@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1818 bytes --]

There is an updated pull request by jirutka against master on the void-packages repository

https://github.com/jirutka/void-packages gummiboot-efistub
https://github.com/void-linux/void-packages/pull/31878

gummiboot: split *.efi.stub into subpackage
Gummiboot bootloader is dead for a long time, but UEFI stubs from this project are still useful and being used. For example, mkinitcpio v31 will support UEFI executable generation by utilizing UEFI stub from systemd or gummiboot (actually, it's the same stub because systemd has absorbed gummiboot). For this case, only the UEFI stub is needed, nothing else from gummiboot.

<!-- Mark items with [x] where applicable -->

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/31878.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gummiboot-efistub-31878.patch --]
[-- Type: text/x-diff, Size: 2862 bytes --]

From c6e2c7d4e814610aa70df68a70e9c829e0ac793e Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Sat, 10 Jul 2021 03:11:18 +0200
Subject: [PATCH 1/2] gummiboot: split *.efi.stub into subpackage

dracut-uefi and mkinitcpio (since upcoming v31) needs UEFI stub from
gummiboot (or systemd, which is the same; systemd has absorbed
gummiboot) to bundle Linux kernel and initramdisk into a UEFI executable
- and only the stub, not gummiboot bootloader itself, nor any hooks.
---
 srcpkgs/gummiboot-efistub  |  1 +
 srcpkgs/gummiboot/template | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/gummiboot-efistub

diff --git a/srcpkgs/gummiboot-efistub b/srcpkgs/gummiboot-efistub
new file mode 120000
index 000000000000..9d6464eecfc3
--- /dev/null
+++ b/srcpkgs/gummiboot-efistub
@@ -0,0 +1 @@
+gummiboot
\ No newline at end of file
diff --git a/srcpkgs/gummiboot/template b/srcpkgs/gummiboot/template
index 68e6f5be926c..3f0b0be347f0 100644
--- a/srcpkgs/gummiboot/template
+++ b/srcpkgs/gummiboot/template
@@ -1,12 +1,13 @@
 # Template file for 'gummiboot'
 pkgname=gummiboot
 version=48.1
-revision=7
+revision=8
 archs="i686* x86_64* aarch64*"
 build_style=gnu-configure
 conf_files="/etc/default/gummiboot"
 hostmakedepends="automake pkg-config libxslt docbook-xsl"
 makedepends="gnu-efi-libs liblzma-devel libblkid-devel"
+depends="${pkgname}-efistub>=${version}_${revision}"
 short_desc="Simple UEFI Boot Manager"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="LGPL-2.0-or-later"
@@ -34,3 +35,11 @@ post_install() {
 	vinstall ${FILESDIR}/kernel.d/gummiboot.confd 644 \
 		etc/default gummiboot
 }
+
+gummiboot-efistub_package() {
+	short_desc="Linux EFI stub from gummiboot project"
+
+	pkg_install() {
+		vmove usr/lib/gummiboot/*.efi.stub
+	}
+}

From 7ecb9e79c3dc69e653f3b7da42b08fcf87efb9bc Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Mon, 12 Jul 2021 12:35:01 +0200
Subject: [PATCH 2/2] dracut-uefi: replace gummiboot with gummiboot-efistub

dracut-uefi needs only UEFI stub file from gummiboot.
---
 srcpkgs/dracut/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index c8db2195c8a0..d3b6c6616722 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
 # Template file for 'dracut'
 pkgname=dracut
 version=053
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
@@ -55,7 +55,7 @@ dracut-network_package() {
 }
 
 dracut-uefi_package() {
-	depends="binutils gummiboot ${sourcepkg}>=${version}_${revision}"
+	depends="binutils gummiboot-efistub ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - UEFI bundle hook"
 	conf_files="/etc/default/dracut-uefi-hook"