From 24fc33ae25a510025f37f8290f088cb17fea8eb9 Mon Sep 17 00:00:00 2001 From: Zach Dykstra Date: Wed, 19 Aug 2020 22:21:36 -0500 Subject: [PATCH] zfsbootmenu: update to 1.4.1 Closes: #24376 [via git-merge-pr] --- srcpkgs/zfsbootmenu/INSTALL | 14 +++++++++++--- srcpkgs/zfsbootmenu/template | 12 ++++++++---- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/srcpkgs/zfsbootmenu/INSTALL b/srcpkgs/zfsbootmenu/INSTALL index 16b2e65b33d..552efe8861f 100644 --- a/srcpkgs/zfsbootmenu/INSTALL +++ b/srcpkgs/zfsbootmenu/INSTALL @@ -1,6 +1,14 @@ #!/bin/sh case "${ACTION}" in - post) - generate-zbm - ;; +post) + # Migrate legacy INI to YAML + _zbmdir="etc/zfsbootmenu" + if [ -r "${_zbmdir}/config.ini" ]; then + generate-zbm --migrate "${_zbmdir}/config.ini" --config "${_zbmdir}/config.yaml" \ + && mv "${_zbmdir}/config.ini" "${_zbmdir}/config.ini.migrated" + fi + unset _zbmdir + + generate-zbm + ;; esac diff --git a/srcpkgs/zfsbootmenu/template b/srcpkgs/zfsbootmenu/template index 231083d8e79..88c2543394b 100644 --- a/srcpkgs/zfsbootmenu/template +++ b/srcpkgs/zfsbootmenu/template @@ -1,18 +1,22 @@ # Template file for 'zfsbootmenu' pkgname=zfsbootmenu -version=1.3.1 +version=1.4.1 revision=1 archs=noarch build_style=gnu-makefile -conf_files="/etc/zfsbootmenu/config.ini" -depends="dracut zfs fzf kexec-tools bash pigz mbuffer perl-Config-IniFiles perl-Sort-Versions" +conf_files="/etc/zfsbootmenu/config.yaml" +depends="dracut zfs fzf kexec-tools bash pigz mbuffer + perl-Config-IniFiles perl-Sort-Versions perl-boolean perl-YAML-PP" short_desc="ZFS Boot Environment menu, implemented in Dracut" maintainer="Zach Dykstra " license="MIT" homepage="https://github.com/zdykstra/zfsbootmenu" +changelog="https://raw.githubusercontent.com/zdykstra/zfsbootmenu/master/CHANGELOG.md" distfiles="https://github.com/zdykstra/zfsbootmenu/archive/v${version}.tar.gz" -checksum=3a0c84362ef204d180aefae4c73363231ad5b68c88f83de8b823d824b3afb445 +checksum=1174454a1e0e22159e33da2eac83301fd2a1dfae7aa46b41ced5304c512a6847 post_install() { vlicense LICENSE + vmkdir usr/share/examples/${pkgname} + vcopy etc/zfsbootmenu/config.yaml usr/share/examples/${pkgname} }