From db4ff6b48a8bebcf5599c2fcba0f094461c02027 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 00000000000000..9d6464eecfc382
--- /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 68e6f5be926ca8..6ab40528e75e8c 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 UEFI stub from the gummiboot project"
+
+	pkg_install() {
+		vmove "usr/lib/gummiboot/*.efi.stub"
+	}
+}

From f8ba45a87f8d950f2f181f796a3357a77bedd07f 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 c8db2195c8a037..d3b6c661672255 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"