Including linuxx64.efi.stub for Arch compatibility with the latest zfsbootmenu.

Signed-off-by: gardar <gardar@users.noreply.github.com>

4 files changed, 53 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ae648c2df596..b84445325335 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = zfsbootmenu
 	pkgdesc = ZFS bootloader for root-on-ZFS systems
 	pkgver = 2.2.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/zbm-dev/zfsbootmenu
 	arch = x86_64
 	license = MIT
@@ -26,6 +26,10 @@ pkgbase = zfsbootmenu
 	backup = etc/zfsbootmenu/dracut.conf.d/omit-drivers.conf
 	backup = etc/zfsbootmenu/dracut.conf.d/zfsbootmenu.conf
 	source = zfsbootmenu-v2.2.1.tar.gz::https://github.com/zbm-dev/zfsbootmenu/archive/v2.2.1.tar.gz
+	source = makefile.patch
+	source = config.yaml.patch
 	sha256sums = 02b7e8b5573c843042c9f4164209e012790c05665c463f547bed03eb0821e348
+	sha256sums = 5104b54d161077afed8006645762aa9661c5ae8e77c0a699a0530bfd8b750a7e
+	sha256sums = a2fc30c06e360d39d620b9339c79299c16b0553bc2dc875c8ebd7783d9791a16
 
 pkgname = zfsbootmenu
diff --git a/PKGBUILD b/PKGBUILD
index b620347c33eb..c8d40cc5e191 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,17 +2,33 @@
 # Contributor: gardar <aur@gardar.net>
 pkgname=zfsbootmenu
 pkgver=2.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="ZFS bootloader for root-on-ZFS systems"
 license=('MIT')
 url="https://github.com/zbm-dev/$pkgname"
 arch=('x86_64')
 depends=('zfs' 'kexec-tools' 'fzf' 'bash' 'mbuffer' 'ncurses' 'perl-sort-versions' 'perl-boolean' 'perl-yaml-pp' 'openssl-1.1')
 optdepends=('dracut' 'mkinitcpio' 'efibootmgr' 'refind' 'syslinux' 'grub')
-source=("${pkgname}-v${pkgver}.tar.gz::${url}/archive/v$pkgver.tar.gz")
-sha256sums=('02b7e8b5573c843042c9f4164209e012790c05665c463f547bed03eb0821e348')
+source=(
+	"${pkgname}-v${pkgver}.tar.gz::${url}/archive/v$pkgver.tar.gz"
+	"makefile.patch"
+	"config.yaml.patch"
+)
+sha256sums=(
+	'02b7e8b5573c843042c9f4164209e012790c05665c463f547bed03eb0821e348'
+	'5104b54d161077afed8006645762aa9661c5ae8e77c0a699a0530bfd8b750a7e'
+	'a2fc30c06e360d39d620b9339c79299c16b0553bc2dc875c8ebd7783d9791a16'
+)
 backup=("etc/${pkgname}/config.yaml" "etc/${pkgname}/mkinitcpio.conf" "etc/${pkgname}/dracut.conf.d/omit-drivers.conf" "etc/${pkgname}/dracut.conf.d/${pkgname}.conf")
 
+# Patch for Arch compatibility with the latest zfsbootmenu.
+# https://github.com/zbm-dev/zfsbootmenu/discussions/501
+prepare() {
+    cd "$pkgname-$pkgver"
+    patch -p1 < "${srcdir}/makefile.patch"
+    patch -p1 < "${srcdir}/config.yaml.patch"
+}
+
 package() {
         cd "$pkgname-$pkgver"
         make DESTDIR="$pkgdir"
diff --git a/config.yaml.patch b/config.yaml.patch
new file mode 100644
index 000000000000..e1dc6a145c80
--- /dev/null
+++ b/config.yaml.patch
@@ -0,0 +1,11 @@
+--- a/etc/zfsbootmenu/config.yaml
++++ b/etc/zfsbootmenu/config.yaml
+@@ -15,6 +15,7 @@ Components:
+ EFI:
+   ImageDir: /boot/efi/EFI/zbm
+   Versions: false
++  Stub: /usr/share/zfsbootmenu/stubs/linuxx64.efi.stub  # workaround: https://github.com/zbm-dev/zfsbootmenu/discussions/501
+   Enabled: false
+ Kernel:
+   CommandLine: ro quiet loglevel=0
+
diff --git a/makefile.patch b/makefile.patch
new file mode 100644
index 000000000000..84f6f392a383
--- /dev/null
+++ b/makefile.patch
@@ -0,0 +1,18 @@
+--- a/Makefile
++++ b/Makefile
+@@ -4,6 +4,7 @@
+ MODDIR=$(PREFIX)/share
+ DRACUTDIR=$(PREFIX)/lib/dracut/modules.d
+ INITCPIODIR=$(PREFIX)/lib/initcpio
++STUBSDIR=$(PREFIX)/share/zfsbootmenu/stubs
+ MANDIR=$(PREFIX)/share/man
+ BINDIR=$(PREFIX)/bin
+ EXAMPLES=$(PREFIX)/share/examples/zfsbootmenu
+@@ -19,6 +20,7 @@
+ 	install -m 0644 -t "$(DESTDIR)$(MANDIR)/man5" -D docs/man/dist/man5/*.5
+ 	install -m 0644 -t "$(DESTDIR)$(MANDIR)/man7" -D docs/man/dist/man7/*.7
+ 	install -m 0644 -t "$(DESTDIR)$(MANDIR)/man8" -D docs/man/dist/man8/*.8
++	install -m 0644 -t "$(DESTDIR)$(STUBSDIR)/linuxx64.efi.stub" -D testing/stubs/linuxx64.efi.stub
+ 	install -m 0755 -t "$(DESTDIR)$(EXAMPLES)" -D contrib/*
+ 
+ dracut: