From 5d79193f1cfeeb8d70c52ed7e7461e7bced133ca Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 27 Jan 2025 15:19:00 -0500 Subject: [PATCH] zfsbootmenu: update to 3.0.0. --- srcpkgs/zfsbootmenu/patches/date.patch | 22 ------------------- .../zfsbootmenu/patches/dracut-config.patch | 7 ------ srcpkgs/zfsbootmenu/template | 7 +++--- 3 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 srcpkgs/zfsbootmenu/patches/date.patch delete mode 100644 srcpkgs/zfsbootmenu/patches/dracut-config.patch diff --git a/srcpkgs/zfsbootmenu/patches/date.patch b/srcpkgs/zfsbootmenu/patches/date.patch deleted file mode 100644 index 3c7866aa204..00000000000 --- a/srcpkgs/zfsbootmenu/patches/date.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 4868300e3295dce16f3672176caf4dad413d1d6d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ferm=C3=ADn=20Olaiz?= -Date: Tue, 9 Jan 2024 17:59:28 -0300 -Subject: [PATCH] install-helpers.sh: fix date template syntax - ---- - zfsbootmenu/install-helpers.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/zfsbootmenu/install-helpers.sh b/zfsbootmenu/install-helpers.sh -index 5af273e7d..8eb1ef41c 100644 ---- a/zfsbootmenu/install-helpers.sh -+++ b/zfsbootmenu/install-helpers.sh -@@ -262,7 +262,7 @@ install_zbm_osver() { - local build_date - [ -r "${zfsbootmenu_module_root}/zbm-release" ] || return 0 - zbm_install_file "${zfsbootmenu_module_root}/zbm-release" "/etc/zbm-release" -- if build_date="$(date %Y-%m-%d)"; then -+ if build_date="$(date '+%Y-%m-%d')"; then - cat >> "${BUILDROOT}/etc/zbm-release" <<-EOF - BUILD_ID="${build_date}" - EOF diff --git a/srcpkgs/zfsbootmenu/patches/dracut-config.patch b/srcpkgs/zfsbootmenu/patches/dracut-config.patch deleted file mode 100644 index a0a15cf5abf..00000000000 --- a/srcpkgs/zfsbootmenu/patches/dracut-config.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- a/etc/zfsbootmenu/dracut.conf.d/zfsbootmenu.conf -+++ b/etc/zfsbootmenu/dracut.conf.d/zfsbootmenu.conf -@@ -1,3 +1,3 @@ - nofsck="yes" --add_dracutmodules+=" zfsbootmenu " -+add_dracutmodules+=" zfsbootmenu bash " - omit_dracutmodules+=" btrfs zfs resume systemd systemd-initrd dracut-systemd plymouth dash " diff --git a/srcpkgs/zfsbootmenu/template b/srcpkgs/zfsbootmenu/template index a6ba5c09deb..408aadd7ecd 100644 --- a/srcpkgs/zfsbootmenu/template +++ b/srcpkgs/zfsbootmenu/template @@ -1,9 +1,10 @@ # Template file for 'zfsbootmenu' pkgname=zfsbootmenu -version=2.3.0 -revision=3 +version=3.0.0 +revision=1 build_style=gnu-makefile make_build_target="zbm-release" +hostmakedepends="tar" depends="dracut zfs kexec-tools fzf bash pigz mbuffer ncurses perl-Sort-Versions perl-boolean perl-YAML-PP" short_desc="ZFS bootloader for root-on-ZFS systems" @@ -12,7 +13,7 @@ license="MIT" homepage="https://github.com/zbm-dev/zfsbootmenu" changelog="https://raw.githubusercontent.com/zbm-dev/zfsbootmenu/master/CHANGELOG.md" distfiles="https://github.com/zbm-dev/zfsbootmenu/archive/refs/tags/v${version}.tar.gz" -checksum=8f103353a1dd0d3ee7338fe8c6bf0dc336217dc85998e27e6829e6cb71a966a0 +checksum=5b0896a2756ac12947ccbb544c1e31b03aebe61faba74aa2c43eb167af564c1b conf_files="/etc/zfsbootmenu/config.yaml /etc/zfsbootmenu/mkinitcpio.conf" post_install() {