From 4ee93a3f7917abfb10f877826695092aae3211a4 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Fri, 18 Aug 2023 12:16:29 -0400 Subject: [PATCH] mkinitcpio: update to 36, adopt --- srcpkgs/mkinitcpio/patches/gzip-default.patch | 32 +++++++++---------- srcpkgs/mkinitcpio/template | 7 ++-- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/srcpkgs/mkinitcpio/patches/gzip-default.patch b/srcpkgs/mkinitcpio/patches/gzip-default.patch index 2ede9f30715a4..52d0dcc2574b1 100644 --- a/srcpkgs/mkinitcpio/patches/gzip-default.patch +++ b/srcpkgs/mkinitcpio/patches/gzip-default.patch @@ -2,21 +2,21 @@ Because not all Void kernels may support zstd, change the default initramfs compression to gzip. diff -ur a/man/mkinitcpio.conf.5.adoc b/man/mkinitcpio.conf.5.adoc ---- a/man/mkinitcpio.conf.5.adoc -+++ b/man/mkinitcpio.conf.5.adoc -@@ -56,7 +56,7 @@ - Defines a program to filter the generated image through. The kernel - understands the compression formats yielded by the *zstd*, *gzip*, *bzip2*, - *lz4*, *lzop*, *lzma*, and *xz* compressors. If unspecified, this setting -- defaults to *zstd* compression. In order to create an uncompressed image, -+ defaults to *gzip* compression. In order to create an uncompressed image, - define this variable as *cat*. - + - It's not hard to realize that a filter such as a *tac* or *rev* will cause +--- a/man/mkinitcpio.conf.5.adoc 2023-08-18 11:49:46.735219914 -0400 ++++ b/man/mkinitcpio.conf.5.adoc 2023-08-18 11:51:34.819551519 -0400 +@@ -55,7 +55,7 @@ + Defines a program to filter the generated image through. The kernel + understands the compression formats yielded by the *zstd*(1), *gzip*(1), + *bzip2*(1), *lz4*(1), *lzop*(1), *lzma*(1), and *xz*(1) compressors. If +- unspecified, this setting defaults to _zstd_ compression. In order to create ++ unspecified, this setting defaults to _gzip_ compression. In order to create + an uncompressed image, define this variable as _cat_. + + + It is not hard to realize that a filter such as a _tac_ or _rev_ will cause diff -ur a/mkinitcpio b/mkinitcpio ---- a/mkinitcpio -+++ b/mkinitcpio -@@ -856,7 +856,7 @@ +--- a/mkinitcpio 2023-08-18 11:49:46.735219914 -0400 ++++ b/mkinitcpio 2023-08-18 11:49:57.032251508 -0400 +@@ -922,7 +922,7 @@ die "Unable to write to '%s'" "$_optgenimg" fi @@ -26,8 +26,8 @@ diff -ur a/mkinitcpio b/mkinitcpio warning "Unable to locate compression method: '%s'" "$_optcompress" _optcompress='cat' diff -ur a/mkinitcpio.conf b/mkinitcpio.conf ---- a/mkinitcpio.conf 2021-02-16 21:37:31.000000000 -0500 -+++ b/mkinitcpio.conf 2021-05-17 09:34:24.752605714 -0400 +--- a/mkinitcpio.conf 2023-08-18 11:49:46.735219914 -0400 ++++ b/mkinitcpio.conf 2023-08-18 11:49:57.033251511 -0400 @@ -52,7 +52,7 @@ HOOKS=(base udev autodetect modconf kms keyboard keymap consolefont block filesystems fsck) diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template index 80b06163ade00..925c690011aa6 100644 --- a/srcpkgs/mkinitcpio/template +++ b/srcpkgs/mkinitcpio/template @@ -1,23 +1,24 @@ # Template file for 'mkinitcpio' pkgname=mkinitcpio -version=35.2 +version=36 revision=1 build_style=gnu-makefile hostmakedepends="asciidoc" depends="busybox-static bsdtar bash" checkdepends="busybox-static bats-assert lz4 xz zstd" short_desc="Next generation of initramfs creation" -maintainer="Andrea Brancaleoni " +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=1627dd3de027e9497db054d04799db8e1bf2adcf59a4f36b0c04613b58758c99 +checksum=7b3b1cdf546922f47845a3ac4353ca97899a4bb68cfff29098c45135e5fb8b5e conf_files="/etc/mkinitcpio.conf" alternatives=" initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/mkinitcpio/kernel-hook-postinst initramfs:/etc/kernel.d/post-remove/20-initramfs:/usr/libexec/mkinitcpio/kernel-hook-postrm " replaces="mkinitcpio-udev>=0" +make_dirs="/etc/mkinitcpio.conf.d 0755 root root" post_install() { # Install udev hooks