tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

mkinitcpio: update to 36, adopt

Browse Source
This commit is contained in:
Andrew J. Hesford 2023-08-18 12:16:29 -04:00 committed by Andrew J. Hesford
parent f25ee7e6e4
commit 4be918afb1
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
srcpkgs/mkinitcpio/patches/gzip-default.patch
View File

@ -2,21 +2,21 @@ Because not all Void kernels may support zstd, change the default initramfs
compression to gzip. compression to gzip.
diff -ur a/man/mkinitcpio.conf.5.adoc b/man/mkinitcpio.conf.5.adoc diff -ur a/man/mkinitcpio.conf.5.adoc b/man/mkinitcpio.conf.5.adoc
--- a/man/mkinitcpio.conf.5.adoc --- a/man/mkinitcpio.conf.5.adoc 2023-08-18 11:49:46.735219914 -0400
+++ b/man/mkinitcpio.conf.5.adoc +++ b/man/mkinitcpio.conf.5.adoc 2023-08-18 11:51:34.819551519 -0400
@@ -56,7 +56,7 @@ @@ -55,7 +55,7 @@
Defines a program to filter the generated image through. The kernel Defines a program to filter the generated image through. The kernel
understands the compression formats yielded by the *zstd*, *gzip*, *bzip2*, understands the compression formats yielded by the *zstd*(1), *gzip*(1),
*lz4*, *lzop*, *lzma*, and *xz* compressors. If unspecified, this setting *bzip2*(1), *lz4*(1), *lzop*(1), *lzma*(1), and *xz*(1) compressors. If
- defaults to *zstd* compression. In order to create an uncompressed image, - unspecified, this setting defaults to _zstd_ compression. In order to create
+ defaults to *gzip* compression. In order to create an uncompressed image, + unspecified, this setting defaults to _gzip_ compression. In order to create
define this variable as *cat*. 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 It is not hard to realize that a filter such as a _tac_ or _rev_ will cause
diff -ur a/mkinitcpio b/mkinitcpio diff -ur a/mkinitcpio b/mkinitcpio
--- a/mkinitcpio --- a/mkinitcpio 2023-08-18 11:49:46.735219914 -0400
+++ b/mkinitcpio +++ b/mkinitcpio 2023-08-18 11:49:57.032251508 -0400
@@ -856,7 +856,7 @@ @@ -922,7 +922,7 @@
die "Unable to write to '%s'" "$_optgenimg" die "Unable to write to '%s'" "$_optgenimg"
fi fi
@ -26,8 +26,8 @@ diff -ur a/mkinitcpio b/mkinitcpio
warning "Unable to locate compression method: '%s'" "$_optcompress" warning "Unable to locate compression method: '%s'" "$_optcompress"
_optcompress='cat' _optcompress='cat'
diff -ur a/mkinitcpio.conf b/mkinitcpio.conf diff -ur a/mkinitcpio.conf b/mkinitcpio.conf
--- a/mkinitcpio.conf 2021-02-16 21:37:31.000000000 -0500 --- a/mkinitcpio.conf 2023-08-18 11:49:46.735219914 -0400
+++ b/mkinitcpio.conf 2021-05-17 09:34:24.752605714 -0400 +++ b/mkinitcpio.conf 2023-08-18 11:49:57.033251511 -0400
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
HOOKS=(base udev autodetect modconf kms keyboard keymap consolefont block filesystems fsck) HOOKS=(base udev autodetect modconf kms keyboard keymap consolefont block filesystems fsck)

7
srcpkgs/mkinitcpio/template
View File

@ -1,23 +1,24 @@
# Template file for 'mkinitcpio' # Template file for 'mkinitcpio'
pkgname=mkinitcpio pkgname=mkinitcpio
version=35.2 version=36
revision=1 revision=1
build_style=gnu-makefile build_style=gnu-makefile
hostmakedepends="asciidoc" hostmakedepends="asciidoc"
depends="busybox-static bsdtar bash" depends="busybox-static bsdtar bash"
checkdepends="busybox-static bats-assert lz4 xz zstd" checkdepends="busybox-static bats-assert lz4 xz zstd"
short_desc="Next generation of initramfs creation" short_desc="Next generation of initramfs creation"
maintainer="Andrea Brancaleoni <abc@pompel.me>" maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-only" license="GPL-2.0-only"
homepage="https://git.archlinux.org/mkinitcpio.git" homepage="https://git.archlinux.org/mkinitcpio.git"
distfiles="https://sources.archlinux.org/other/${pkgname}/${pkgname}-${version}.tar.gz" distfiles="https://sources.archlinux.org/other/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=1627dd3de027e9497db054d04799db8e1bf2adcf59a4f36b0c04613b58758c99 checksum=7b3b1cdf546922f47845a3ac4353ca97899a4bb68cfff29098c45135e5fb8b5e
conf_files="/etc/mkinitcpio.conf" conf_files="/etc/mkinitcpio.conf"
alternatives=" alternatives="
initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/mkinitcpio/kernel-hook-postinst 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 initramfs:/etc/kernel.d/post-remove/20-initramfs:/usr/libexec/mkinitcpio/kernel-hook-postrm
" "
replaces="mkinitcpio-udev>=0" replaces="mkinitcpio-udev>=0"
make_dirs="/etc/mkinitcpio.conf.d 0755 root root"
post_install() { post_install() {
# Install udev hooks # Install udev hooks