mkinitcpio: update to 35.2.

Closes: #43285
This commit is contained in:
Andrew J. Hesford 2023-04-05 10:57:28 -04:00
parent 4aac19c838
commit f7f7f50623
5 changed files with 26 additions and 60 deletions

View file

@ -11,7 +11,7 @@ diff --git a/init b/init
index 4891ed8..7534d23 100644 index 4891ed8..7534d23 100644
--- a/init --- a/init
+++ b/init +++ b/init
@@ -2,7 +2,7 @@ @@ -5,7 +5,7 @@
udevd_running=0 udevd_running=0
mount_handler=default_mount_handler mount_handler=default_mount_handler

View file

@ -1,30 +0,0 @@
From e629e34f18141a6244eaac2f0288d7b2a5d669ee Mon Sep 17 00:00:00 2001
From: Chih-Hsuan Yen <yan12125@gmail.com>
Date: Sun, 3 Jul 2022 11:03:10 +0800
Subject: [PATCH] Fix the warning about missing modules.builtin.modinfo
> depmod: WARNING: could not open modules.builtin.modinfo at /tmp/mkinitcpio.EftMSK/root/lib/modules/5.15.52-1-lts: No such file or directory
kmod wants modules.builtin.modinfo since v30 [1].
Also adds modules.order as suggested by heftig. That file is used (if
exists) since the first commit of depmod.
[1] https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/?id=0246e06340df292b5dda4bc00e24cc9ae894e881
---
functions | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/functions b/functions
index 48cfd7a..e77a4c4 100644
--- a/functions
+++ b/functions
@@ -876,7 +876,7 @@ install_modules() {
(( ${#zst_comp[*]} )) && zstd -d --rm -q "${zst_comp[@]}"
msg "Generating module dependencies"
- install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.builtin
+ install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.{builtin,builtin.modinfo,order}
# we install all modules into kernel/, making the .order file incorrect for
# the module tree. munge it, so that we have an accurate index. This avoids

View file

@ -1,10 +1,10 @@
Because not all Void kernels may support zstd, change the default initramfs 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.txt b/man/mkinitcpio.conf.5.txt diff -ur a/man/mkinitcpio.conf.5.adoc b/man/mkinitcpio.conf.5.adoc
--- a/man/mkinitcpio.conf.5.txt 2021-02-16 21:37:31.000000000 -0500 --- a/man/mkinitcpio.conf.5.adoc
+++ b/man/mkinitcpio.conf.5.txt 2021-05-17 09:33:32.418504652 -0400 +++ b/man/mkinitcpio.conf.5.adoc
@@ -55,7 +55,7 @@ @@ -56,7 +56,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*, *gzip*, *bzip2*,
*lz4*, *lzop*, *lzma*, and *xz* compressors. If unspecified, this setting *lz4*, *lzop*, *lzma*, and *xz* compressors. If unspecified, this setting
@ -14,22 +14,22 @@ diff -ur a/man/mkinitcpio.conf.5.txt b/man/mkinitcpio.conf.5.txt
+ +
It's not hard to realize that a filter such as a *tac* or *rev* will cause It's 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 2021-02-16 21:37:31.000000000 -0500 --- a/mkinitcpio
+++ b/mkinitcpio 2021-05-17 09:34:15.970588222 -0400 +++ b/mkinitcpio
@@ -508,7 +508,7 @@ @@ -856,7 +856,7 @@
die 'Unable to write to %s' "$_optgenimg" die "Unable to write to '%s'" "$_optgenimg"
fi fi
- _optcompress=${_optcompress:-${COMPRESSION:-zstd}} - _optcompress="${_optcompress:-"${COMPRESSION:-zstd}"}"
+ _optcompress=${_optcompress:-${COMPRESSION:-gzip}} + _optcompress="${_optcompress:-"${COMPRESSION:-gzip}"}"
if ! type -P "$_optcompress" >/dev/null; then if ! type -P "$_optcompress" >/dev/null; then
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 2021-02-16 21:37:31.000000000 -0500
+++ b/mkinitcpio.conf 2021-05-17 09:34:24.752605714 -0400 +++ b/mkinitcpio.conf 2021-05-17 09:34:24.752605714 -0400
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
HOOKS=(base udev autodetect modconf block filesystems keyboard fsck) HOOKS=(base udev autodetect modconf kms keyboard keymap consolefont block filesystems fsck)
# COMPRESSION # COMPRESSION
-# Use this to compress the initramfs image. By default, zstd compression -# Use this to compress the initramfs image. By default, zstd compression

View file

@ -14,25 +14,25 @@ diff --git a/install/consolefont b/install/consolefont
index c10b65d..dad38e2 100644 index c10b65d..dad38e2 100644
--- a/install/consolefont --- a/install/consolefont
+++ b/install/consolefont +++ b/install/consolefont
@@ -3,7 +3,7 @@ @@ -9,7 +9,7 @@
build() {
# subshell to avoid namespace pollution # subshell to avoid namespace pollution
( (
# shellcheck disable=SC1091
- [[ -s /etc/vconsole.conf ]] && . /etc/vconsole.conf - [[ -s /etc/vconsole.conf ]] && . /etc/vconsole.conf
+ [[ -s /etc/rc.conf ]] && . /etc/rc.conf + [[ -s /etc/rc.conf ]] && . /etc/rc.conf
if [[ $FONT ]]; then if [[ -n "$FONT" ]]; then
for file in "/usr/share/kbd/consolefonts/$FONT".@(fnt|psf?(u))?(.gz); do for file in "/usr/share/kbd/consolefonts/$FONT".@(fnt|psf?(u))?(.gz|.zst); do
diff --git a/install/keymap b/install/keymap diff --git a/install/keymap b/install/keymap
index 7de6acb..beb4f7f 100644 index 7de6acb..beb4f7f 100644
--- a/install/keymap --- a/install/keymap
+++ b/install/keymap +++ b/install/keymap
@@ -7,7 +7,7 @@ build() { @@ -12,7 +12,7 @@ build() {
l=$LANG l="$LANG"
unset LANG unset LANG
- for cfg in /etc/{vconsole,locale}.conf; do - for cfg in /etc/{vconsole,locale}.conf; do
+ for cfg in /etc/{rc,locale}.conf; do + for cfg in /etc/{rc,locale}.conf; do
[[ -s $cfg ]] && . "$cfg" # shellcheck disable=SC1090
[[ -s "$cfg" ]] && . "$cfg"
done done

View file

@ -1,17 +1,17 @@
# Template file for 'mkinitcpio' # Template file for 'mkinitcpio'
pkgname=mkinitcpio pkgname=mkinitcpio
version=31 version=35.2
revision=3 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" 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="Andrea Brancaleoni <abc@pompel.me>"
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=8f2811250b852ab78375bf90e1a7430daa132e57e128b0f6eaadddd9b27bbc63 checksum=1627dd3de027e9497db054d04799db8e1bf2adcf59a4f36b0c04613b58758c99
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
@ -19,10 +19,6 @@ alternatives="
" "
replaces="mkinitcpio-udev>=0" replaces="mkinitcpio-udev>=0"
pre_check() {
sed -i -e '1s,/lib/initcpio/busybox,/usr/bin/busybox.static,' test/*
}
post_install() { post_install() {
# Install udev hooks # Install udev hooks
vinstall ${FILESDIR}/udev_hook 644 usr/lib/initcpio/hooks udev vinstall ${FILESDIR}/udev_hook 644 usr/lib/initcpio/hooks udev