From a62e942d14eab326da76ba9c452ae90af22f5da6 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Fri, 17 Nov 2023 09:16:14 -0500 Subject: [PATCH] mkinitcpio: update to 37. --- srcpkgs/mkinitcpio/patches/setfont.patch | 31 ------------------------ srcpkgs/mkinitcpio/template | 13 +++++----- 2 files changed, 7 insertions(+), 37 deletions(-) delete mode 100644 srcpkgs/mkinitcpio/patches/setfont.patch diff --git a/srcpkgs/mkinitcpio/patches/setfont.patch b/srcpkgs/mkinitcpio/patches/setfont.patch deleted file mode 100644 index f4042fc1337..00000000000 --- a/srcpkgs/mkinitcpio/patches/setfont.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio/-/merge_requests/259 - -From 889b1c39653e66b5492b01cd34892506a9a5e9ee Mon Sep 17 00:00:00 2001 -From: classabbyamp -Date: Tue, 12 Sep 2023 22:31:36 -0400 -Subject: [PATCH] install/consolefont: include setfont binary - -if not using the sd-vconsole hook (like on Void Linux, where there is no -systemd), setfont is not available unless manually added to BINARIES. -This also ensures this hook is fully modular and does not rely on other -hooks to work. ---- - install/consolefont | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/install/consolefont b/install/consolefont -index 0ec554e1..36451912 100644 ---- a/install/consolefont -+++ b/install/consolefont -@@ -6,6 +6,8 @@ build() { - # shellcheck disable=SC2034 - local KEYMAP KEYMAP_TOGGLE FONT FONT_MAP FONT_UNIMAP XKBLAYOUT XKBMODEL XKBVARIANT XKBOPTIONS - -+ add_binary setfont -+ - # subshell to avoid namespace pollution - ( - # shellcheck disable=SC1091 --- -GitLab - diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template index 0271589ea11..2708a08048d 100644 --- a/srcpkgs/mkinitcpio/template +++ b/srcpkgs/mkinitcpio/template @@ -1,17 +1,18 @@ # Template file for 'mkinitcpio' pkgname=mkinitcpio -version=36 -revision=2 +version=37 +revision=1 build_style=gnu-makefile hostmakedepends="asciidoc" depends="busybox-static bsdtar bash" -checkdepends="busybox-static bats-assert lz4 xz zstd" +checkdepends="busybox-static bats-assert lz4 xz zstd lzop" short_desc="Next generation of initramfs creation" maintainer="Andrew J. Hesford " license="GPL-2.0-only" -homepage="https://git.archlinux.org/mkinitcpio.git" -distfiles="https://sources.archlinux.org/other/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=7b3b1cdf546922f47845a3ac4353ca97899a4bb68cfff29098c45135e5fb8b5e +homepage="https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio" +changelog="https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio/-/raw/master/CHANGELOG" +distfiles="${homepage}/-/archive/v${version}/mkinitcpio-v${version}.tar.gz" +checksum=904126c8f917285309ea8bfa9ea3344720602bd66a1eaea32f74744de72756b6 conf_files="/etc/mkinitcpio.conf" alternatives=" initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/mkinitcpio/kernel-hook-postinst