* Re: dracut: update to 103, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
@ 2024-07-22 0:12 ` LaszloGombos
2024-07-22 1:24 ` classabbyamp
` (47 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: LaszloGombos @ 2024-07-22 0:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 451 bytes --]
New comment by LaszloGombos on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2241829922
Comment:
To minimize the risk of regressions, please consider taking the following two additional patches from upstream
- https://github.com/dracut-ng/dracut-ng/commit/ef0972fe5349bdf6e821cb79a47cf412caf99059.patch
- https://github.com/dracut-ng/dracut-ng/commit/39eacd9223f2e8c14c76cbe885789a84df36a29b.patch
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 103, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
2024-07-22 0:12 ` LaszloGombos
@ 2024-07-22 1:24 ` classabbyamp
2024-07-22 2:08 ` LaszloGombos
` (46 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: classabbyamp @ 2024-07-22 1:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 520 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2241875848
Comment:
first patch is probably not necessary as eudev doesn't do the "dependency minimisation" that systemd-udev has done:
```
$ libtree /usr/bin/udevd
/usr/bin/udevd
├── libblkid.so.1 [default path]
└── libkmod.so.2 [default path]
├── libzstd.so.1 [default path]
├── libz.so.1 [default path]
└── liblzma.so.5 [default path]
```
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 103, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
2024-07-22 0:12 ` LaszloGombos
2024-07-22 1:24 ` classabbyamp
@ 2024-07-22 2:08 ` LaszloGombos
2024-07-22 20:42 ` [PR PATCH] [Updated] " classabbyamp
` (45 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: LaszloGombos @ 2024-07-22 2:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 344 bytes --]
New comment by LaszloGombos on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2241910572
Comment:
I was wondering if you're able to also drop `crypt-openssl-3.patch` ? This is in the upstream tree - https://github.com/dracut-ng/dracut-ng/commit/c5dca3d68915cef077fda2bc5292e12f82cf6dd6. Thanks !
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: [PR PATCH] [Updated] dracut: update to 103, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (2 preceding siblings ...)
2024-07-22 2:08 ` LaszloGombos
@ 2024-07-22 20:42 ` classabbyamp
2024-08-07 1:47 ` jozzsi
` (44 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: classabbyamp @ 2024-07-22 20:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 531 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages star-dracut-the-next-generation
https://github.com/void-linux/void-packages/pull/51344
dracut: update to 103, switch to dracut-ng
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
@zdykstra
A patch file from https://github.com/void-linux/void-packages/pull/51344.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-star-dracut-the-next-generation-51344.patch --]
[-- Type: text/x-diff, Size: 16507 bytes --]
From 749a3af1e8a9dc7b2a2523d6fb86b7d53fca37c1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 19 Jul 2024 16:50:28 -0400
Subject: [PATCH] dracut: update to 103, switch to dracut-ng
---
...408c8644a0add1907b0593eb83f90d6247b1.patch | 45 -------------------
srcpkgs/dracut/patches/amd-ucode-readme.patch | 26 -----------
srcpkgs/dracut/patches/crypt-openssl-3.patch | 24 ----------
srcpkgs/dracut/patches/crypt-unlock.patch | 26 +++++++++++
srcpkgs/dracut/patches/fix-fsck.patch | 27 -----------
srcpkgs/dracut/patches/force_poweroff.patch | 30 -------------
.../dracut/patches/isoscan-udev-trigger.patch | 25 -----------
srcpkgs/dracut/patches/network.patch | 37 ---------------
srcpkgs/dracut/patches/silence-setfont.patch | 19 --------
srcpkgs/dracut/template | 19 ++++----
10 files changed, 35 insertions(+), 243 deletions(-)
delete mode 100644 srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch
delete mode 100644 srcpkgs/dracut/patches/amd-ucode-readme.patch
delete mode 100644 srcpkgs/dracut/patches/crypt-openssl-3.patch
create mode 100644 srcpkgs/dracut/patches/crypt-unlock.patch
delete mode 100644 srcpkgs/dracut/patches/fix-fsck.patch
delete mode 100644 srcpkgs/dracut/patches/force_poweroff.patch
delete mode 100644 srcpkgs/dracut/patches/isoscan-udev-trigger.patch
delete mode 100644 srcpkgs/dracut/patches/network.patch
delete mode 100644 srcpkgs/dracut/patches/silence-setfont.patch
diff --git a/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch b/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch
deleted file mode 100644
index 6d3295c8e26c1a..00000000000000
--- a/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 6c80408c8644a0add1907b0593eb83f90d6247b1 Mon Sep 17 00:00:00 2001
-From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
-Date: Mon, 14 Aug 2023 12:28:11 +0200
-Subject: [PATCH] fix(dracut.sh): remove microcode check based on
- CONFIG_MICROCODE_[AMD|INTEL]
-
-`CONFIG_MICROCODE_AMD` and `CONFIG_MICROCODE_INTEL` are hidden since
-https://lore.kernel.org/all/20230810160805.081212701@linutronix.de/, therefore
-this check is wrong and early microcode is always disabled.
----
- dracut.sh | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index e0abdb3b0..3b292910f 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1561,23 +1561,20 @@ fi
-
- if [[ $early_microcode == yes ]]; then
- if [[ $hostonly ]]; then
-- if [[ $(get_cpu_vendor) == "AMD" ]]; then
-- check_kernel_config CONFIG_MICROCODE_AMD || unset early_microcode
-- elif [[ $(get_cpu_vendor) == "Intel" ]]; then
-- check_kernel_config CONFIG_MICROCODE_INTEL || unset early_microcode
-+ if [[ $(get_cpu_vendor) == "AMD" || $(get_cpu_vendor) == "Intel" ]]; then
-+ check_kernel_config CONFIG_MICROCODE || unset early_microcode
- else
- unset early_microcode
- fi
- else
-- ! check_kernel_config CONFIG_MICROCODE_AMD \
-- && ! check_kernel_config CONFIG_MICROCODE_INTEL \
-+ ! check_kernel_config CONFIG_MICROCODE \
- && unset early_microcode
- fi
- # Do not complain on non-x86 architectures as it makes no sense
- case "${DRACUT_ARCH:-$(uname -m)}" in
- x86_64 | i?86)
- [[ $early_microcode != yes ]] \
-- && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y"
-+ && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE!=y"
- ;;
- *) ;;
- esac
diff --git a/srcpkgs/dracut/patches/amd-ucode-readme.patch b/srcpkgs/dracut/patches/amd-ucode-readme.patch
deleted file mode 100644
index a2ea1288d230b0..00000000000000
--- a/srcpkgs/dracut/patches/amd-ucode-readme.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c1a69b81f6ebd62a40054be2375cb77c040694aa Mon Sep 17 00:00:00 2001
-From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
-Date: Mon, 30 Oct 2023 14:56:39 +0100
-Subject: [PATCH] fix(dracut.sh): skip README for AMD microcode generation
-
-This file was added in https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/amd-ucode/README?id=89ec6198f13d1007563ff87aae5de209e993be07
-and it should be skipped.
-
-Fixes #2541
----
- dracut.sh | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/dracut.sh b/dracut.sh
-index 3b292910f..bd730cbe9 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -2154,6 +2154,8 @@ if [[ $early_microcode == yes ]]; then
- done
- for i in $_fwdir/$_fw/$_src; do
- [[ -e $i ]] || continue
-+ # skip README{.xz,.zst,...}
-+ str_starts "$i" "$_fwdir/$_fw/README" && continue
- # skip gpg files
- str_ends "$i" ".asc" && continue
- cat "$i" >> "$_dest_dir/${ucode_dest[$idx]}"
diff --git a/srcpkgs/dracut/patches/crypt-openssl-3.patch b/srcpkgs/dracut/patches/crypt-openssl-3.patch
deleted file mode 100644
index 39fd3dd3c65e99..00000000000000
--- a/srcpkgs/dracut/patches/crypt-openssl-3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5996f6b5d9b0bb957b4bb02c49c95a057761cba5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Mon, 13 Feb 2023 20:22:56 +0000
-Subject: [PATCH] fix(crypt): add missing libraries
-
-Add missing libraries, closes #2137
----
- modules.d/90crypt/module-setup.sh | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/modules.d/90crypt/module-setup.sh
-+++ b/modules.d/90crypt/module-setup.sh
-@@ -176,5 +176,11 @@ install() {
- systemd-ask-password systemd-tty-ask-password-agent
- fi
-
-+ # Install required libraries.
-+ _arch=${DRACUT_ARCH:-$(uname -m)}
-+ inst_libdir_file \
-+ {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/fips.so" \
-+ {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/legacy.so"
-+
- dracut_need_initqueue
- }
diff --git a/srcpkgs/dracut/patches/crypt-unlock.patch b/srcpkgs/dracut/patches/crypt-unlock.patch
new file mode 100644
index 00000000000000..3355ed88a488c1
--- /dev/null
+++ b/srcpkgs/dracut/patches/crypt-unlock.patch
@@ -0,0 +1,26 @@
+From 39eacd9223f2e8c14c76cbe885789a84df36a29b Mon Sep 17 00:00:00 2001
+From: Laszlo Gombos <laszlo.gombos@gmail.com>
+Date: Sun, 21 Jul 2024 09:04:13 -0400
+Subject: [PATCH] revert(crypt): do not unlock encrypted devices by default
+ during boot
+
+This reverts commit 2339acfaeee60d6bb26a1103db2e53bc8f9cb2d1.
+
+This change needs more test cases and more granular conditionals.
+---
+ modules.d/90crypt/parse-crypt.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/90crypt/parse-crypt.sh b/modules.d/90crypt/parse-crypt.sh
+index 9567a4a97..e46e347ac 100755
+--- a/modules.d/90crypt/parse-crypt.sh
++++ b/modules.d/90crypt/parse-crypt.sh
+@@ -174,7 +174,7 @@ else
+ } >> "$hookdir/emergency/90-crypt.sh"
+ fi
+ done
+- elif getargbool 1 rd.auto && [ -z "$(getargs rd.luks.name)" ]; then
++ elif getargbool 0 rd.auto; then
+ if [ -z "$DRACUT_SYSTEMD" ]; then
+ {
+ printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="%s ' "$(command -v initqueue)"
diff --git a/srcpkgs/dracut/patches/fix-fsck.patch b/srcpkgs/dracut/patches/fix-fsck.patch
deleted file mode 100644
index 97c72d05e5543c..00000000000000
--- a/srcpkgs/dracut/patches/fix-fsck.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/dracutdevs/dracut/pull/2262
-
-From 26990cb90bf0f516ccbd56583000d6d02ab18acd Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Sat, 4 Mar 2023 23:28:17 +0000
-Subject: [PATCH] fix(fs-lib): remove quoting form the first argument of the
- e2fsck call
-
-Fix regression.
----
- modules.d/99fs-lib/fs-lib.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh
-index dd20731f2..c4640fa8a 100755
---- a/modules.d/99fs-lib/fs-lib.sh
-+++ b/modules.d/99fs-lib/fs-lib.sh
-@@ -107,7 +107,8 @@ fsck_drv_com() {
-
- info "issuing $_drv $_fop $_dev"
- # we enforce non-interactive run, so $() is fine
-- _out=$($_drv "$_fop" "$_dev")
-+ # shellcheck disable=SC2086
-+ _out=$($_drv $_fop "$_dev")
- _ret=$?
- fsck_tail
-
diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch
deleted file mode 100644
index 9056685e32b97a..00000000000000
--- a/srcpkgs/dracut/patches/force_poweroff.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-The shutdown binary is actually provided by runit and expects the runit
-init to be running. This is not the case in the initramfs. Forcing the
-shutdown, halt or reboot is necessary to ignore this requirement.
-
----
- modules.d/99base/dracut-lib.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
---- a/modules.d/99base/dracut-lib.sh
-+++ b/modules.d/99base/dracut-lib.sh
-@@ -1004,13 +1004,13 @@ emergency_shell() {
-
- case "$_emergency_action" in
- reboot)
-- reboot || exit 1
-+ reboot -f || exit 1
- ;;
- poweroff)
-- poweroff || exit 1
-+ poweroff -f || exit 1
- ;;
- halt)
-- halt || exit 1
-+ halt -f || exit 1
- ;;
- esac
- }
---
-2.37.3
diff --git a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch b/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
deleted file mode 100644
index b80e966266b45d..00000000000000
--- a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This upstream accepted patch fixes a bug where the live images don't work when
-booted from grub loopback (void-linux/void-mklive#294).
-
-From d880d62f5f81d7ec69555f5deb60694fdb693c01 Mon Sep 17 00:00:00 2001
-From: 0x5c <dev@0x5c.io>
-Date: Thu, 9 Feb 2023 05:26:30 -0500
-Subject: [PATCH] fix: make iso-scan trigger udev events
-
-Fixes #2183
----
- modules.d/90dmsquash-live/iso-scan.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules.d/90dmsquash-live/iso-scan.sh b/modules.d/90dmsquash-live/iso-scan.sh
-index 886d23033..fa06b33cd 100755
---- a/modules.d/90dmsquash-live/iso-scan.sh
-+++ b/modules.d/90dmsquash-live/iso-scan.sh
-@@ -22,6 +22,7 @@ do_iso_scan() {
- mount -t auto -o ro "$dev" "/run/initramfs/isoscan" || continue
- if [ -f "/run/initramfs/isoscan/$isofile" ]; then
- losetup -f "/run/initramfs/isoscan/$isofile"
-+ udevadm trigger --action=add > /dev/null 2>&1
- ln -s "$dev" /run/initramfs/isoscandev
- rm -f -- "$job"
- exit 0
diff --git a/srcpkgs/dracut/patches/network.patch b/srcpkgs/dracut/patches/network.patch
deleted file mode 100644
index dce39fdc6f7a53..00000000000000
--- a/srcpkgs/dracut/patches/network.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 11a34f6b55f91610effd79ff1bf6a4bb2db760d3 Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Wed, 18 Jan 2023 19:59:24 +0000
-Subject: [PATCH] meta module should check if module exists
-
-Bug: https://github.com/dracutdevs/dracut/issues/1756
----
- modules.d/40network/module-setup.sh | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index 1ab13ef..078cb4b 100755
---- a/modules.d/40network/module-setup.sh
-+++ b/modules.d/40network/module-setup.sh
-@@ -17,15 +17,15 @@ depends() {
- done
-
- if [ -z "$network_handler" ]; then
-- if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
-+ if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]] && [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
- network_handler="network-wicked"
-- elif [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
-+ elif [[ -d "$dracutbasedir"/modules.d/35connman ]] && [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
- network_handler="connman"
-- elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
-+ elif [[ -d "$dracutbasedir"/modules.d/35network-manager ]] && ( [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] ); then
- network_handler="network-manager"
-- elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
-+ elif [[ -d "$dracutbasedir"/modules.d/01systemd-networkd ]] && [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
- network_handler="systemd-networkd"
-- else
-+ elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then
- network_handler="network-legacy"
- fi
- fi
---
-2.34.1
diff --git a/srcpkgs/dracut/patches/silence-setfont.patch b/srcpkgs/dracut/patches/silence-setfont.patch
deleted file mode 100644
index 377c0f3a8981a7..00000000000000
--- a/srcpkgs/dracut/patches/silence-setfont.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/void-linux/void-packages/issues/45216
-
-I'm tired of seeing these setfont errors. This will hopefully/eventually be upstreamed, but I'm not holding my breath.
-
----
-
-diff --git a/modules.d/10i18n/console_init.sh b/modules.d/10i18n/console_init.sh
-index 3fe3b673..0e19ae30 100755
---- a/modules.d/10i18n/console_init.sh
-+++ b/modules.d/10i18n/console_init.sh
-@@ -49,7 +49,7 @@ set_font() {
- setfont "${FONT-${DEFAULT_FONT}}" \
- -C "${1}" \
- ${FONT_MAP:+-m "${FONT_MAP}"} \
-- ${FONT_UNIMAP:+-u "${FONT_UNIMAP}"}
-+ ${FONT_UNIMAP:+-u "${FONT_UNIMAP}"} 2>/dev/null
- }
-
- dev_close() {
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 313e2d98719358..aa0414e0480820 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
# Template file for 'dracut'
pkgname=dracut
-version=059
-revision=7
+version=103
+revision=1
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc"
conf_files="/etc/dracut.conf"
@@ -11,10 +11,10 @@ depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
short_desc="Low-level tool for generating an initramfs/initrd image"
maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="https://github.com/dracutdevs/dracut/wiki"
-changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
-distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
-checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
+homepage="https://github.com/dracut-ng/dracut-ng/wiki"
+changelog="https://raw.githubusercontent.com/dracut-ng/dracut-ng/master/NEWS.md"
+distfiles="https://github.com/dracut-ng/dracut-ng/archive/refs/tags/${version}.tar.gz"
+checksum=9a92b4f0643926a65162171d68b9525fc93e6e82f455a4b3938db385a841bda8
alternatives="
initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/dracut/kernel-hook-postinst
initramfs:/etc/kernel.d/post-remove/20-initramfs:/usr/libexec/dracut/kernel-hook-postrm
@@ -32,7 +32,7 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
fi
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) # archs supported by dracut for EFI bundle
+ i686*|x86_64*|aarch64*) # archs supported by dracut for EFI bundle
subpackages+=" dracut-uefi"
;;
esac
@@ -52,15 +52,14 @@ post_install() {
# systemd dependent additional dracut modules
for f in 06rngd 06dbus-broker 06dbus-daemon 09dbus \
- 35connman 35network-manager 35network-wicked 80lvmmerge \
+ 35connman 35network-manager 80lvmmerge \
99memstrack 99squash; do
rm -r ${DESTDIR}/usr/lib/dracut/modules.d/${f}
done
# don't need s390x architecture dependent dracut modules
for f in 80cms 81cio_ignore 91zipl 95dasd 95dasd_mod \
- 95dasd_rules 95dcssblk 95qeth_rules 95zfcp \
- 95zfcp_rules 95znet; do
+ 95dcssblk 95zfcp 95znet; do
rm -r ${DESTDIR}/usr/lib/dracut/modules.d/${f}
done
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 103, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (3 preceding siblings ...)
2024-07-22 20:42 ` [PR PATCH] [Updated] " classabbyamp
@ 2024-08-07 1:47 ` jozzsi
2024-08-07 21:28 ` [PR PATCH] [Updated] " classabbyamp
` (43 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: jozzsi @ 2024-08-07 1:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 390 bytes --]
New comment by jozzsi on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2272463001
Comment:
I think the following function can be removed as part of this PR as now upstream tarball has `dracut-version.sh`.
```
pre_build() {
# Upstream tarball is missing version information
DRACUT_VERSION="${version}" make dracut-version.sh
}
```
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: [PR PATCH] [Updated] dracut: update to 103, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (4 preceding siblings ...)
2024-08-07 1:47 ` jozzsi
@ 2024-08-07 21:28 ` classabbyamp
2024-09-08 22:59 ` jozzsi
` (42 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: classabbyamp @ 2024-08-07 21:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 531 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages star-dracut-the-next-generation
https://github.com/void-linux/void-packages/pull/51344
dracut: update to 103, switch to dracut-ng
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
@zdykstra
A patch file from https://github.com/void-linux/void-packages/pull/51344.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-star-dracut-the-next-generation-51344.patch --]
[-- Type: text/x-diff, Size: 16741 bytes --]
From f53e7c983534a6c9f0f599eec29364e13b6e5345 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 19 Jul 2024 16:50:28 -0400
Subject: [PATCH] dracut: update to 103, switch to dracut-ng
---
...408c8644a0add1907b0593eb83f90d6247b1.patch | 45 -------------------
srcpkgs/dracut/patches/amd-ucode-readme.patch | 26 -----------
srcpkgs/dracut/patches/crypt-openssl-3.patch | 24 ----------
srcpkgs/dracut/patches/crypt-unlock.patch | 26 +++++++++++
srcpkgs/dracut/patches/fix-fsck.patch | 27 -----------
srcpkgs/dracut/patches/force_poweroff.patch | 30 -------------
.../dracut/patches/isoscan-udev-trigger.patch | 25 -----------
srcpkgs/dracut/patches/network.patch | 37 ---------------
srcpkgs/dracut/patches/silence-setfont.patch | 19 --------
srcpkgs/dracut/template | 24 ++++------
10 files changed, 35 insertions(+), 248 deletions(-)
delete mode 100644 srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch
delete mode 100644 srcpkgs/dracut/patches/amd-ucode-readme.patch
delete mode 100644 srcpkgs/dracut/patches/crypt-openssl-3.patch
create mode 100644 srcpkgs/dracut/patches/crypt-unlock.patch
delete mode 100644 srcpkgs/dracut/patches/fix-fsck.patch
delete mode 100644 srcpkgs/dracut/patches/force_poweroff.patch
delete mode 100644 srcpkgs/dracut/patches/isoscan-udev-trigger.patch
delete mode 100644 srcpkgs/dracut/patches/network.patch
delete mode 100644 srcpkgs/dracut/patches/silence-setfont.patch
diff --git a/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch b/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch
deleted file mode 100644
index 6d3295c8e26c1a..00000000000000
--- a/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 6c80408c8644a0add1907b0593eb83f90d6247b1 Mon Sep 17 00:00:00 2001
-From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
-Date: Mon, 14 Aug 2023 12:28:11 +0200
-Subject: [PATCH] fix(dracut.sh): remove microcode check based on
- CONFIG_MICROCODE_[AMD|INTEL]
-
-`CONFIG_MICROCODE_AMD` and `CONFIG_MICROCODE_INTEL` are hidden since
-https://lore.kernel.org/all/20230810160805.081212701@linutronix.de/, therefore
-this check is wrong and early microcode is always disabled.
----
- dracut.sh | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index e0abdb3b0..3b292910f 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1561,23 +1561,20 @@ fi
-
- if [[ $early_microcode == yes ]]; then
- if [[ $hostonly ]]; then
-- if [[ $(get_cpu_vendor) == "AMD" ]]; then
-- check_kernel_config CONFIG_MICROCODE_AMD || unset early_microcode
-- elif [[ $(get_cpu_vendor) == "Intel" ]]; then
-- check_kernel_config CONFIG_MICROCODE_INTEL || unset early_microcode
-+ if [[ $(get_cpu_vendor) == "AMD" || $(get_cpu_vendor) == "Intel" ]]; then
-+ check_kernel_config CONFIG_MICROCODE || unset early_microcode
- else
- unset early_microcode
- fi
- else
-- ! check_kernel_config CONFIG_MICROCODE_AMD \
-- && ! check_kernel_config CONFIG_MICROCODE_INTEL \
-+ ! check_kernel_config CONFIG_MICROCODE \
- && unset early_microcode
- fi
- # Do not complain on non-x86 architectures as it makes no sense
- case "${DRACUT_ARCH:-$(uname -m)}" in
- x86_64 | i?86)
- [[ $early_microcode != yes ]] \
-- && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y"
-+ && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE!=y"
- ;;
- *) ;;
- esac
diff --git a/srcpkgs/dracut/patches/amd-ucode-readme.patch b/srcpkgs/dracut/patches/amd-ucode-readme.patch
deleted file mode 100644
index a2ea1288d230b0..00000000000000
--- a/srcpkgs/dracut/patches/amd-ucode-readme.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c1a69b81f6ebd62a40054be2375cb77c040694aa Mon Sep 17 00:00:00 2001
-From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
-Date: Mon, 30 Oct 2023 14:56:39 +0100
-Subject: [PATCH] fix(dracut.sh): skip README for AMD microcode generation
-
-This file was added in https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/amd-ucode/README?id=89ec6198f13d1007563ff87aae5de209e993be07
-and it should be skipped.
-
-Fixes #2541
----
- dracut.sh | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/dracut.sh b/dracut.sh
-index 3b292910f..bd730cbe9 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -2154,6 +2154,8 @@ if [[ $early_microcode == yes ]]; then
- done
- for i in $_fwdir/$_fw/$_src; do
- [[ -e $i ]] || continue
-+ # skip README{.xz,.zst,...}
-+ str_starts "$i" "$_fwdir/$_fw/README" && continue
- # skip gpg files
- str_ends "$i" ".asc" && continue
- cat "$i" >> "$_dest_dir/${ucode_dest[$idx]}"
diff --git a/srcpkgs/dracut/patches/crypt-openssl-3.patch b/srcpkgs/dracut/patches/crypt-openssl-3.patch
deleted file mode 100644
index 39fd3dd3c65e99..00000000000000
--- a/srcpkgs/dracut/patches/crypt-openssl-3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5996f6b5d9b0bb957b4bb02c49c95a057761cba5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Mon, 13 Feb 2023 20:22:56 +0000
-Subject: [PATCH] fix(crypt): add missing libraries
-
-Add missing libraries, closes #2137
----
- modules.d/90crypt/module-setup.sh | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/modules.d/90crypt/module-setup.sh
-+++ b/modules.d/90crypt/module-setup.sh
-@@ -176,5 +176,11 @@ install() {
- systemd-ask-password systemd-tty-ask-password-agent
- fi
-
-+ # Install required libraries.
-+ _arch=${DRACUT_ARCH:-$(uname -m)}
-+ inst_libdir_file \
-+ {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/fips.so" \
-+ {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/legacy.so"
-+
- dracut_need_initqueue
- }
diff --git a/srcpkgs/dracut/patches/crypt-unlock.patch b/srcpkgs/dracut/patches/crypt-unlock.patch
new file mode 100644
index 00000000000000..3355ed88a488c1
--- /dev/null
+++ b/srcpkgs/dracut/patches/crypt-unlock.patch
@@ -0,0 +1,26 @@
+From 39eacd9223f2e8c14c76cbe885789a84df36a29b Mon Sep 17 00:00:00 2001
+From: Laszlo Gombos <laszlo.gombos@gmail.com>
+Date: Sun, 21 Jul 2024 09:04:13 -0400
+Subject: [PATCH] revert(crypt): do not unlock encrypted devices by default
+ during boot
+
+This reverts commit 2339acfaeee60d6bb26a1103db2e53bc8f9cb2d1.
+
+This change needs more test cases and more granular conditionals.
+---
+ modules.d/90crypt/parse-crypt.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/90crypt/parse-crypt.sh b/modules.d/90crypt/parse-crypt.sh
+index 9567a4a97..e46e347ac 100755
+--- a/modules.d/90crypt/parse-crypt.sh
++++ b/modules.d/90crypt/parse-crypt.sh
+@@ -174,7 +174,7 @@ else
+ } >> "$hookdir/emergency/90-crypt.sh"
+ fi
+ done
+- elif getargbool 1 rd.auto && [ -z "$(getargs rd.luks.name)" ]; then
++ elif getargbool 0 rd.auto; then
+ if [ -z "$DRACUT_SYSTEMD" ]; then
+ {
+ printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="%s ' "$(command -v initqueue)"
diff --git a/srcpkgs/dracut/patches/fix-fsck.patch b/srcpkgs/dracut/patches/fix-fsck.patch
deleted file mode 100644
index 97c72d05e5543c..00000000000000
--- a/srcpkgs/dracut/patches/fix-fsck.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/dracutdevs/dracut/pull/2262
-
-From 26990cb90bf0f516ccbd56583000d6d02ab18acd Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Sat, 4 Mar 2023 23:28:17 +0000
-Subject: [PATCH] fix(fs-lib): remove quoting form the first argument of the
- e2fsck call
-
-Fix regression.
----
- modules.d/99fs-lib/fs-lib.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh
-index dd20731f2..c4640fa8a 100755
---- a/modules.d/99fs-lib/fs-lib.sh
-+++ b/modules.d/99fs-lib/fs-lib.sh
-@@ -107,7 +107,8 @@ fsck_drv_com() {
-
- info "issuing $_drv $_fop $_dev"
- # we enforce non-interactive run, so $() is fine
-- _out=$($_drv "$_fop" "$_dev")
-+ # shellcheck disable=SC2086
-+ _out=$($_drv $_fop "$_dev")
- _ret=$?
- fsck_tail
-
diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch
deleted file mode 100644
index 9056685e32b97a..00000000000000
--- a/srcpkgs/dracut/patches/force_poweroff.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-The shutdown binary is actually provided by runit and expects the runit
-init to be running. This is not the case in the initramfs. Forcing the
-shutdown, halt or reboot is necessary to ignore this requirement.
-
----
- modules.d/99base/dracut-lib.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
---- a/modules.d/99base/dracut-lib.sh
-+++ b/modules.d/99base/dracut-lib.sh
-@@ -1004,13 +1004,13 @@ emergency_shell() {
-
- case "$_emergency_action" in
- reboot)
-- reboot || exit 1
-+ reboot -f || exit 1
- ;;
- poweroff)
-- poweroff || exit 1
-+ poweroff -f || exit 1
- ;;
- halt)
-- halt || exit 1
-+ halt -f || exit 1
- ;;
- esac
- }
---
-2.37.3
diff --git a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch b/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
deleted file mode 100644
index b80e966266b45d..00000000000000
--- a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This upstream accepted patch fixes a bug where the live images don't work when
-booted from grub loopback (void-linux/void-mklive#294).
-
-From d880d62f5f81d7ec69555f5deb60694fdb693c01 Mon Sep 17 00:00:00 2001
-From: 0x5c <dev@0x5c.io>
-Date: Thu, 9 Feb 2023 05:26:30 -0500
-Subject: [PATCH] fix: make iso-scan trigger udev events
-
-Fixes #2183
----
- modules.d/90dmsquash-live/iso-scan.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules.d/90dmsquash-live/iso-scan.sh b/modules.d/90dmsquash-live/iso-scan.sh
-index 886d23033..fa06b33cd 100755
---- a/modules.d/90dmsquash-live/iso-scan.sh
-+++ b/modules.d/90dmsquash-live/iso-scan.sh
-@@ -22,6 +22,7 @@ do_iso_scan() {
- mount -t auto -o ro "$dev" "/run/initramfs/isoscan" || continue
- if [ -f "/run/initramfs/isoscan/$isofile" ]; then
- losetup -f "/run/initramfs/isoscan/$isofile"
-+ udevadm trigger --action=add > /dev/null 2>&1
- ln -s "$dev" /run/initramfs/isoscandev
- rm -f -- "$job"
- exit 0
diff --git a/srcpkgs/dracut/patches/network.patch b/srcpkgs/dracut/patches/network.patch
deleted file mode 100644
index dce39fdc6f7a53..00000000000000
--- a/srcpkgs/dracut/patches/network.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 11a34f6b55f91610effd79ff1bf6a4bb2db760d3 Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Wed, 18 Jan 2023 19:59:24 +0000
-Subject: [PATCH] meta module should check if module exists
-
-Bug: https://github.com/dracutdevs/dracut/issues/1756
----
- modules.d/40network/module-setup.sh | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index 1ab13ef..078cb4b 100755
---- a/modules.d/40network/module-setup.sh
-+++ b/modules.d/40network/module-setup.sh
-@@ -17,15 +17,15 @@ depends() {
- done
-
- if [ -z "$network_handler" ]; then
-- if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
-+ if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]] && [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
- network_handler="network-wicked"
-- elif [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
-+ elif [[ -d "$dracutbasedir"/modules.d/35connman ]] && [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
- network_handler="connman"
-- elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
-+ elif [[ -d "$dracutbasedir"/modules.d/35network-manager ]] && ( [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] ); then
- network_handler="network-manager"
-- elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
-+ elif [[ -d "$dracutbasedir"/modules.d/01systemd-networkd ]] && [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
- network_handler="systemd-networkd"
-- else
-+ elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then
- network_handler="network-legacy"
- fi
- fi
---
-2.34.1
diff --git a/srcpkgs/dracut/patches/silence-setfont.patch b/srcpkgs/dracut/patches/silence-setfont.patch
deleted file mode 100644
index 377c0f3a8981a7..00000000000000
--- a/srcpkgs/dracut/patches/silence-setfont.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/void-linux/void-packages/issues/45216
-
-I'm tired of seeing these setfont errors. This will hopefully/eventually be upstreamed, but I'm not holding my breath.
-
----
-
-diff --git a/modules.d/10i18n/console_init.sh b/modules.d/10i18n/console_init.sh
-index 3fe3b673..0e19ae30 100755
---- a/modules.d/10i18n/console_init.sh
-+++ b/modules.d/10i18n/console_init.sh
-@@ -49,7 +49,7 @@ set_font() {
- setfont "${FONT-${DEFAULT_FONT}}" \
- -C "${1}" \
- ${FONT_MAP:+-m "${FONT_MAP}"} \
-- ${FONT_UNIMAP:+-u "${FONT_UNIMAP}"}
-+ ${FONT_UNIMAP:+-u "${FONT_UNIMAP}"} 2>/dev/null
- }
-
- dev_close() {
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 313e2d98719358..d0bbe4cbc6a588 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
# Template file for 'dracut'
pkgname=dracut
-version=059
-revision=7
+version=103
+revision=1
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc"
conf_files="/etc/dracut.conf"
@@ -11,10 +11,10 @@ depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
short_desc="Low-level tool for generating an initramfs/initrd image"
maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="https://github.com/dracutdevs/dracut/wiki"
-changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
-distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
-checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
+homepage="https://github.com/dracut-ng/dracut-ng/wiki"
+changelog="https://raw.githubusercontent.com/dracut-ng/dracut-ng/master/NEWS.md"
+distfiles="https://github.com/dracut-ng/dracut-ng/archive/refs/tags/${version}.tar.gz"
+checksum=9a92b4f0643926a65162171d68b9525fc93e6e82f455a4b3938db385a841bda8
alternatives="
initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/dracut/kernel-hook-postinst
initramfs:/etc/kernel.d/post-remove/20-initramfs:/usr/libexec/dracut/kernel-hook-postrm
@@ -32,16 +32,11 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
fi
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) # archs supported by dracut for EFI bundle
+ i686*|x86_64*|aarch64*) # archs supported by dracut for EFI bundle
subpackages+=" dracut-uefi"
;;
esac
-pre_build() {
- # Upstream tarball is missing version information
- DRACUT_VERSION="${version}" make dracut-version.sh
-}
-
post_install() {
# kernel hooks.
vinstall ${FILESDIR}/kernel-hook-postinst 755 usr/libexec/dracut
@@ -52,15 +47,14 @@ post_install() {
# systemd dependent additional dracut modules
for f in 06rngd 06dbus-broker 06dbus-daemon 09dbus \
- 35connman 35network-manager 35network-wicked 80lvmmerge \
+ 35connman 35network-manager 80lvmmerge \
99memstrack 99squash; do
rm -r ${DESTDIR}/usr/lib/dracut/modules.d/${f}
done
# don't need s390x architecture dependent dracut modules
for f in 80cms 81cio_ignore 91zipl 95dasd 95dasd_mod \
- 95dasd_rules 95dcssblk 95qeth_rules 95zfcp \
- 95zfcp_rules 95znet; do
+ 95dcssblk 95zfcp 95znet; do
rm -r ${DESTDIR}/usr/lib/dracut/modules.d/${f}
done
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 103, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (5 preceding siblings ...)
2024-08-07 21:28 ` [PR PATCH] [Updated] " classabbyamp
@ 2024-09-08 22:59 ` jozzsi
2024-09-12 18:11 ` slymattz
` (41 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: jozzsi @ 2024-09-08 22:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 344 bytes --]
New comment by jozzsi on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2336852894
Comment:
@Katnjia, @Piraty (https://github.com/void-linux/void-packages/issues/50296), @manfred3000 (https://github.com/void-linux/void-packages/issues/49750) would you be able to help testing this PR ? Thanks !
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 103, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (6 preceding siblings ...)
2024-09-08 22:59 ` jozzsi
@ 2024-09-12 18:11 ` slymattz
2024-09-12 18:55 ` slymattz
` (40 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: slymattz @ 2024-09-12 18:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 713 bytes --]
New comment by slymattz on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2346941516
Comment:
Hi!
I built the package, updated dracut, ran `xbps-reconfigure -f linux6.6` and rebooted.
Here's the output of uname:
`Linux void-KC1TB 6.6.50_1 #1 SMP PREEMPT_DYNAMIC Mon Sep 9 14:47:28 UTC 2024 x86_64 GNU/Linux`
I have the default dracut configuration + this one extra configuration file.
/etc/dracut.conf.d/zol.conf
```
nofsck="yes"
add_dracutmodules+=" zfs "
omit_dracutmodules+=" btrfs resume "
```
I also use ZFSBootMenu and I don't know what else to say other than that dracut works with my setup. I hope this info is at least somewhat useful.
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 103, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (7 preceding siblings ...)
2024-09-12 18:11 ` slymattz
@ 2024-09-12 18:55 ` slymattz
2024-09-12 18:58 ` slymattz
` (39 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: slymattz @ 2024-09-12 18:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 458 bytes --]
New comment by slymattz on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2347020505
Comment:
@jozzsi / @classabbyamp, do let me know if testing the following config would be of any help (I have an encrypted ZFS on ROOT installation on another drive):
/etc/dracut.conf.d/zol.conf
```
nofsck="yes"
add_dracutmodules+=" zfs "
omit_dracutmodules+=" btrfs resume "
install_items+=" /etc/zfs/zroot.key "
```
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 103, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (8 preceding siblings ...)
2024-09-12 18:55 ` slymattz
@ 2024-09-12 18:58 ` slymattz
2024-09-12 19:03 ` jozzsi
` (38 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: slymattz @ 2024-09-12 18:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 476 bytes --]
New comment by slymattz on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2347020505
Comment:
@jozzsi / @classabbyamp, do let me know if testing the following config would be of any help (I have an encrypted ZFS on ROOT installation on another drive / another machine):
/etc/dracut.conf.d/zol.conf
```
nofsck="yes"
add_dracutmodules+=" zfs "
omit_dracutmodules+=" btrfs resume "
install_items+=" /etc/zfs/zroot.key "
```
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 103, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (9 preceding siblings ...)
2024-09-12 18:58 ` slymattz
@ 2024-09-12 19:03 ` jozzsi
2024-09-12 19:04 ` jozzsi
` (37 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: jozzsi @ 2024-09-12 19:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 646 bytes --]
New comment by jozzsi on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2347034112
Comment:
> @jozzsi / @classabbyamp, do let me know if testing the following config would be of any help (I have an encrypted ZFS on ROOT installation on another drive / another machine): /etc/dracut.conf.d/zol.conf
Given that @slymattz 's config is a fairly complex config that seems to just work and that dracut upstream has a green CI with void, I would say this PR is tested now.
(Also v103 is running fairly stable for a few month now without patches on other distributions - Arch/Gentoo/Debian/Ubuntu)
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 103, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (10 preceding siblings ...)
2024-09-12 19:03 ` jozzsi
@ 2024-09-12 19:04 ` jozzsi
2024-09-12 19:13 ` slymattz
` (36 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: jozzsi @ 2024-09-12 19:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 657 bytes --]
New comment by jozzsi on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2347034112
Comment:
> @jozzsi / @classabbyamp, do let me know if testing the following config would be of any help (I have an encrypted ZFS on ROOT installation on another drive / another machine): /etc/dracut.conf.d/zol.conf
Given that @slymattz 's config is a fairly complex config that seems to just work and that dracut upstream v103 had a green CI with Void Linux, I would say this PR is tested now.
(Also v103 is running fairly stable for a few month now without patches on other distributions - Arch/Gentoo/Debian/Ubuntu)
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 103, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (11 preceding siblings ...)
2024-09-12 19:04 ` jozzsi
@ 2024-09-12 19:13 ` slymattz
2024-09-12 19:15 ` slymattz
` (35 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: slymattz @ 2024-09-12 19:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 236 bytes --]
New comment by slymattz on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2347051416
Comment:
I think I'll test it anyway cause I just found the drive (it's in an external USB enclosure).
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 103, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (12 preceding siblings ...)
2024-09-12 19:13 ` slymattz
@ 2024-09-12 19:15 ` slymattz
2024-09-12 19:48 ` slymattz
` (34 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: slymattz @ 2024-09-12 19:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 371 bytes --]
New comment by slymattz on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2347051416
Comment:
I think I'll test it anyway cause I just found the drive (it's in an external USB enclosure). I'd rather check with this external drive first before checking the same setup on my laptop. Will probably report back within 20mins.
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 103, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (13 preceding siblings ...)
2024-09-12 19:15 ` slymattz
@ 2024-09-12 19:48 ` slymattz
2024-09-28 15:46 ` jozzsi
` (33 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: slymattz @ 2024-09-12 19:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 934 bytes --]
New comment by slymattz on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2347112171
Comment:
OK. So.
I updated the system on the aforementioned drive. Then updated dracut to v. 103 and ran `xbps-reconfigure -f linux6.6`. Then I double-checked the timestamp for the newly installed (v. 6.6.50_1) kernel initramfs and made sure it was created just then. I rebooted and when the boot menu came up, I picked ZBM that sits on the drive in question at UEFI fallback location EFI/BOOT/BOOTX64.EFI. I pressed ESC, picked the appropriate pool to boot from and got prompted for the password. It booted fine.
I attach screenshots of the ZBM help section and the password prompt just for the record.
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 103, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (14 preceding siblings ...)
2024-09-12 19:48 ` slymattz
@ 2024-09-28 15:46 ` jozzsi
2024-10-06 19:53 ` manfred3000
` (32 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: jozzsi @ 2024-09-28 15:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 249 bytes --]
New comment by jozzsi on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2380714480
Comment:
@zdykstra are you able to help with this PR ? Is there anything else you would like to see tested ? Thanks !
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 103, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (15 preceding siblings ...)
2024-09-28 15:46 ` jozzsi
@ 2024-10-06 19:53 ` manfred3000
2024-10-06 20:07 ` manfred3000
` (31 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: manfred3000 @ 2024-10-06 19:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 497 bytes --]
New comment by manfred3000 on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2395563156
Comment:
> @Katnjia, @Piraty (#50296), @manfred3000 (#49750) would you be able to help testing this PR ? Thanks !
I've switched to `mkinitcpio` a while ago, which is working perfectly fine for me on Void (and has been for many years running Arch), and it is also much simpler (and way faster - even on an old potato) compared to `dracut`s countless scripts.
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 103, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (16 preceding siblings ...)
2024-10-06 19:53 ` manfred3000
@ 2024-10-06 20:07 ` manfred3000
2024-10-06 20:22 ` jozzsi
` (30 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: manfred3000 @ 2024-10-06 20:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 501 bytes --]
New comment by manfred3000 on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2395563156
Comment:
> @Katnjia, @Piraty (#50296), @manfred3000 (#49750) would you be able to help testing this PR ? Thanks !
I've switched to `mkinitcpio` a while ago, which is working perfectly fine for me on Void (and has been for many years running Arch), and it is also much more simple (and way faster - even on an old potato) compared to `dracut`s countless scripts.
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 103, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (17 preceding siblings ...)
2024-10-06 20:07 ` manfred3000
@ 2024-10-06 20:22 ` jozzsi
2024-10-06 20:29 ` manfred3000
` (29 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: jozzsi @ 2024-10-06 20:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 576 bytes --]
New comment by jozzsi on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2395573107
Comment:
> I've switched to `mkinitcpio` a while ago, which is working perfectly fine for me on Void
Thanks for the update @manfred3000 . Not sure if the stability of `mkinitcpio` is useful for this PR, neither I think this is a good PR to compare `mkinitcpio` and `dracut`.
It does look however that most Void users are happy to use a very old version of dracut, which indeed seem to suggest that there is no interest to move forward.
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 103, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (18 preceding siblings ...)
2024-10-06 20:22 ` jozzsi
@ 2024-10-06 20:29 ` manfred3000
2024-10-06 20:30 ` manfred3000
` (28 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: manfred3000 @ 2024-10-06 20:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 344 bytes --]
New comment by manfred3000 on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2395563156
Comment:
> @Katnjia, @Piraty (#50296), @manfred3000 (#49750) would you be able to help testing this PR ? Thanks !
I've switched to `mkinitcpio` a while ago, which is working perfectly fine for me on Void.
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 103, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (19 preceding siblings ...)
2024-10-06 20:29 ` manfred3000
@ 2024-10-06 20:30 ` manfred3000
2024-10-06 20:38 ` classabbyamp
` (27 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: manfred3000 @ 2024-10-06 20:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 193 bytes --]
New comment by manfred3000 on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2395575173
Comment:
@jozzsi Got it :) I've edited my original post.
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 103, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (20 preceding siblings ...)
2024-10-06 20:30 ` manfred3000
@ 2024-10-06 20:38 ` classabbyamp
2024-10-10 0:48 ` jozzsi
` (26 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: classabbyamp @ 2024-10-06 20:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2395577672
Comment:
there is interest in moving forward, but we do have lives outside of this. I've been letting zdykstra (the package's maintainer) take his time in testing this
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 103, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (21 preceding siblings ...)
2024-10-06 20:38 ` classabbyamp
@ 2024-10-10 0:48 ` jozzsi
2024-10-12 1:26 ` [PR PATCH] [Updated] " classabbyamp
` (25 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: jozzsi @ 2024-10-10 0:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 329 bytes --]
New comment by jozzsi on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2403681162
Comment:
FYI (no intention to be pushy) - v104 is just out (this of course does not imply that v103 should be skipped), but figured I share - https://github.com/dracut-ng/dracut-ng/releases/tag/104
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: [PR PATCH] [Updated] dracut: update to 103, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (22 preceding siblings ...)
2024-10-10 0:48 ` jozzsi
@ 2024-10-12 1:26 ` classabbyamp
2024-10-12 1:31 ` classabbyamp
` (24 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: classabbyamp @ 2024-10-12 1:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 531 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages star-dracut-the-next-generation
https://github.com/void-linux/void-packages/pull/51344
dracut: update to 103, switch to dracut-ng
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
@zdykstra
A patch file from https://github.com/void-linux/void-packages/pull/51344.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-star-dracut-the-next-generation-51344.patch --]
[-- Type: text/x-diff, Size: 16669 bytes --]
From 7c90e4d6809594e70dfc58eea6de6ca9ed5add33 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 19 Jul 2024 16:50:28 -0400
Subject: [PATCH] dracut: update to 104, switch to dracut-ng
---
...408c8644a0add1907b0593eb83f90d6247b1.patch | 45 -------------------
srcpkgs/dracut/patches/amd-ucode-readme.patch | 26 -----------
srcpkgs/dracut/patches/crypt-openssl-3.patch | 24 ----------
srcpkgs/dracut/patches/fix-fsck.patch | 27 -----------
srcpkgs/dracut/patches/force_poweroff.patch | 30 -------------
.../dracut/patches/isoscan-udev-trigger.patch | 25 -----------
srcpkgs/dracut/patches/network.patch | 37 ---------------
.../dracut/patches/plymouth-udev-seat.patch | 19 +++++---
srcpkgs/dracut/patches/silence-setfont.patch | 19 --------
srcpkgs/dracut/template | 27 ++++-------
10 files changed, 21 insertions(+), 258 deletions(-)
delete mode 100644 srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch
delete mode 100644 srcpkgs/dracut/patches/amd-ucode-readme.patch
delete mode 100644 srcpkgs/dracut/patches/crypt-openssl-3.patch
delete mode 100644 srcpkgs/dracut/patches/fix-fsck.patch
delete mode 100644 srcpkgs/dracut/patches/force_poweroff.patch
delete mode 100644 srcpkgs/dracut/patches/isoscan-udev-trigger.patch
delete mode 100644 srcpkgs/dracut/patches/network.patch
delete mode 100644 srcpkgs/dracut/patches/silence-setfont.patch
diff --git a/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch b/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch
deleted file mode 100644
index 6d3295c8e26c1a..00000000000000
--- a/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 6c80408c8644a0add1907b0593eb83f90d6247b1 Mon Sep 17 00:00:00 2001
-From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
-Date: Mon, 14 Aug 2023 12:28:11 +0200
-Subject: [PATCH] fix(dracut.sh): remove microcode check based on
- CONFIG_MICROCODE_[AMD|INTEL]
-
-`CONFIG_MICROCODE_AMD` and `CONFIG_MICROCODE_INTEL` are hidden since
-https://lore.kernel.org/all/20230810160805.081212701@linutronix.de/, therefore
-this check is wrong and early microcode is always disabled.
----
- dracut.sh | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index e0abdb3b0..3b292910f 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1561,23 +1561,20 @@ fi
-
- if [[ $early_microcode == yes ]]; then
- if [[ $hostonly ]]; then
-- if [[ $(get_cpu_vendor) == "AMD" ]]; then
-- check_kernel_config CONFIG_MICROCODE_AMD || unset early_microcode
-- elif [[ $(get_cpu_vendor) == "Intel" ]]; then
-- check_kernel_config CONFIG_MICROCODE_INTEL || unset early_microcode
-+ if [[ $(get_cpu_vendor) == "AMD" || $(get_cpu_vendor) == "Intel" ]]; then
-+ check_kernel_config CONFIG_MICROCODE || unset early_microcode
- else
- unset early_microcode
- fi
- else
-- ! check_kernel_config CONFIG_MICROCODE_AMD \
-- && ! check_kernel_config CONFIG_MICROCODE_INTEL \
-+ ! check_kernel_config CONFIG_MICROCODE \
- && unset early_microcode
- fi
- # Do not complain on non-x86 architectures as it makes no sense
- case "${DRACUT_ARCH:-$(uname -m)}" in
- x86_64 | i?86)
- [[ $early_microcode != yes ]] \
-- && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y"
-+ && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE!=y"
- ;;
- *) ;;
- esac
diff --git a/srcpkgs/dracut/patches/amd-ucode-readme.patch b/srcpkgs/dracut/patches/amd-ucode-readme.patch
deleted file mode 100644
index a2ea1288d230b0..00000000000000
--- a/srcpkgs/dracut/patches/amd-ucode-readme.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c1a69b81f6ebd62a40054be2375cb77c040694aa Mon Sep 17 00:00:00 2001
-From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
-Date: Mon, 30 Oct 2023 14:56:39 +0100
-Subject: [PATCH] fix(dracut.sh): skip README for AMD microcode generation
-
-This file was added in https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/amd-ucode/README?id=89ec6198f13d1007563ff87aae5de209e993be07
-and it should be skipped.
-
-Fixes #2541
----
- dracut.sh | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/dracut.sh b/dracut.sh
-index 3b292910f..bd730cbe9 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -2154,6 +2154,8 @@ if [[ $early_microcode == yes ]]; then
- done
- for i in $_fwdir/$_fw/$_src; do
- [[ -e $i ]] || continue
-+ # skip README{.xz,.zst,...}
-+ str_starts "$i" "$_fwdir/$_fw/README" && continue
- # skip gpg files
- str_ends "$i" ".asc" && continue
- cat "$i" >> "$_dest_dir/${ucode_dest[$idx]}"
diff --git a/srcpkgs/dracut/patches/crypt-openssl-3.patch b/srcpkgs/dracut/patches/crypt-openssl-3.patch
deleted file mode 100644
index 39fd3dd3c65e99..00000000000000
--- a/srcpkgs/dracut/patches/crypt-openssl-3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5996f6b5d9b0bb957b4bb02c49c95a057761cba5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Mon, 13 Feb 2023 20:22:56 +0000
-Subject: [PATCH] fix(crypt): add missing libraries
-
-Add missing libraries, closes #2137
----
- modules.d/90crypt/module-setup.sh | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/modules.d/90crypt/module-setup.sh
-+++ b/modules.d/90crypt/module-setup.sh
-@@ -176,5 +176,11 @@ install() {
- systemd-ask-password systemd-tty-ask-password-agent
- fi
-
-+ # Install required libraries.
-+ _arch=${DRACUT_ARCH:-$(uname -m)}
-+ inst_libdir_file \
-+ {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/fips.so" \
-+ {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/legacy.so"
-+
- dracut_need_initqueue
- }
diff --git a/srcpkgs/dracut/patches/fix-fsck.patch b/srcpkgs/dracut/patches/fix-fsck.patch
deleted file mode 100644
index 97c72d05e5543c..00000000000000
--- a/srcpkgs/dracut/patches/fix-fsck.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/dracutdevs/dracut/pull/2262
-
-From 26990cb90bf0f516ccbd56583000d6d02ab18acd Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Sat, 4 Mar 2023 23:28:17 +0000
-Subject: [PATCH] fix(fs-lib): remove quoting form the first argument of the
- e2fsck call
-
-Fix regression.
----
- modules.d/99fs-lib/fs-lib.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh
-index dd20731f2..c4640fa8a 100755
---- a/modules.d/99fs-lib/fs-lib.sh
-+++ b/modules.d/99fs-lib/fs-lib.sh
-@@ -107,7 +107,8 @@ fsck_drv_com() {
-
- info "issuing $_drv $_fop $_dev"
- # we enforce non-interactive run, so $() is fine
-- _out=$($_drv "$_fop" "$_dev")
-+ # shellcheck disable=SC2086
-+ _out=$($_drv $_fop "$_dev")
- _ret=$?
- fsck_tail
-
diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch
deleted file mode 100644
index 9056685e32b97a..00000000000000
--- a/srcpkgs/dracut/patches/force_poweroff.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-The shutdown binary is actually provided by runit and expects the runit
-init to be running. This is not the case in the initramfs. Forcing the
-shutdown, halt or reboot is necessary to ignore this requirement.
-
----
- modules.d/99base/dracut-lib.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
---- a/modules.d/99base/dracut-lib.sh
-+++ b/modules.d/99base/dracut-lib.sh
-@@ -1004,13 +1004,13 @@ emergency_shell() {
-
- case "$_emergency_action" in
- reboot)
-- reboot || exit 1
-+ reboot -f || exit 1
- ;;
- poweroff)
-- poweroff || exit 1
-+ poweroff -f || exit 1
- ;;
- halt)
-- halt || exit 1
-+ halt -f || exit 1
- ;;
- esac
- }
---
-2.37.3
diff --git a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch b/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
deleted file mode 100644
index b80e966266b45d..00000000000000
--- a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This upstream accepted patch fixes a bug where the live images don't work when
-booted from grub loopback (void-linux/void-mklive#294).
-
-From d880d62f5f81d7ec69555f5deb60694fdb693c01 Mon Sep 17 00:00:00 2001
-From: 0x5c <dev@0x5c.io>
-Date: Thu, 9 Feb 2023 05:26:30 -0500
-Subject: [PATCH] fix: make iso-scan trigger udev events
-
-Fixes #2183
----
- modules.d/90dmsquash-live/iso-scan.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules.d/90dmsquash-live/iso-scan.sh b/modules.d/90dmsquash-live/iso-scan.sh
-index 886d23033..fa06b33cd 100755
---- a/modules.d/90dmsquash-live/iso-scan.sh
-+++ b/modules.d/90dmsquash-live/iso-scan.sh
-@@ -22,6 +22,7 @@ do_iso_scan() {
- mount -t auto -o ro "$dev" "/run/initramfs/isoscan" || continue
- if [ -f "/run/initramfs/isoscan/$isofile" ]; then
- losetup -f "/run/initramfs/isoscan/$isofile"
-+ udevadm trigger --action=add > /dev/null 2>&1
- ln -s "$dev" /run/initramfs/isoscandev
- rm -f -- "$job"
- exit 0
diff --git a/srcpkgs/dracut/patches/network.patch b/srcpkgs/dracut/patches/network.patch
deleted file mode 100644
index dce39fdc6f7a53..00000000000000
--- a/srcpkgs/dracut/patches/network.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 11a34f6b55f91610effd79ff1bf6a4bb2db760d3 Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Wed, 18 Jan 2023 19:59:24 +0000
-Subject: [PATCH] meta module should check if module exists
-
-Bug: https://github.com/dracutdevs/dracut/issues/1756
----
- modules.d/40network/module-setup.sh | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index 1ab13ef..078cb4b 100755
---- a/modules.d/40network/module-setup.sh
-+++ b/modules.d/40network/module-setup.sh
-@@ -17,15 +17,15 @@ depends() {
- done
-
- if [ -z "$network_handler" ]; then
-- if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
-+ if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]] && [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
- network_handler="network-wicked"
-- elif [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
-+ elif [[ -d "$dracutbasedir"/modules.d/35connman ]] && [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
- network_handler="connman"
-- elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
-+ elif [[ -d "$dracutbasedir"/modules.d/35network-manager ]] && ( [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] ); then
- network_handler="network-manager"
-- elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
-+ elif [[ -d "$dracutbasedir"/modules.d/01systemd-networkd ]] && [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
- network_handler="systemd-networkd"
-- else
-+ elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then
- network_handler="network-legacy"
- fi
- fi
---
-2.34.1
diff --git a/srcpkgs/dracut/patches/plymouth-udev-seat.patch b/srcpkgs/dracut/patches/plymouth-udev-seat.patch
index 490dd63b310a95..afc06f89917700 100644
--- a/srcpkgs/dracut/patches/plymouth-udev-seat.patch
+++ b/srcpkgs/dracut/patches/plymouth-udev-seat.patch
@@ -1,11 +1,16 @@
+reverts https://github.com/dracut-ng/dracut-ng/pull/628 and adds udev rule
+that allows plymouth to work
+
--- a/modules.d/95udev-rules/module-setup.sh 2018-02-19 06:00:33.000000000 -0300
+++ b/modules.d/95udev-rules/module-setup.sh 2018-05-02 00:27:53.710253893 -0300
-@@ -39,6 +39,8 @@
- 60-persistent-storage.rules \
- 61-persistent-storage-edd.rules \
- 70-uaccess.rules \
+@@ -48,6 +48,10 @@
+ 70-memory.rules \
+ 70-mouse.rules \
+ 70-touchpad.rules \
++ 70-uaccess.rules \
+ 71-plymouth-seat.rules \
-+ 71-udev-seat.rules \
- 71-seat.rules \
- 73-seat-late.rules \
++ 71-seat.rules \
++ 73-seat-late.rules \
75-net-description.rules \
+ 75-probe_mtd.rules \
+ 78-sound-card.rules \
diff --git a/srcpkgs/dracut/patches/silence-setfont.patch b/srcpkgs/dracut/patches/silence-setfont.patch
deleted file mode 100644
index 377c0f3a8981a7..00000000000000
--- a/srcpkgs/dracut/patches/silence-setfont.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/void-linux/void-packages/issues/45216
-
-I'm tired of seeing these setfont errors. This will hopefully/eventually be upstreamed, but I'm not holding my breath.
-
----
-
-diff --git a/modules.d/10i18n/console_init.sh b/modules.d/10i18n/console_init.sh
-index 3fe3b673..0e19ae30 100755
---- a/modules.d/10i18n/console_init.sh
-+++ b/modules.d/10i18n/console_init.sh
-@@ -49,7 +49,7 @@ set_font() {
- setfont "${FONT-${DEFAULT_FONT}}" \
- -C "${1}" \
- ${FONT_MAP:+-m "${FONT_MAP}"} \
-- ${FONT_UNIMAP:+-u "${FONT_UNIMAP}"}
-+ ${FONT_UNIMAP:+-u "${FONT_UNIMAP}"} 2>/dev/null
- }
-
- dev_close() {
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 313e2d98719358..fb3450bd384190 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
# Template file for 'dracut'
pkgname=dracut
-version=059
-revision=7
+version=104
+revision=1
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc"
conf_files="/etc/dracut.conf"
@@ -11,10 +11,10 @@ depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
short_desc="Low-level tool for generating an initramfs/initrd image"
maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="https://github.com/dracutdevs/dracut/wiki"
-changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
-distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
-checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
+homepage="https://github.com/dracut-ng/dracut-ng/wiki"
+changelog="https://raw.githubusercontent.com/dracut-ng/dracut-ng/master/NEWS.md"
+distfiles="https://github.com/dracut-ng/dracut-ng/archive/refs/tags/${version}.tar.gz"
+checksum=d5d4b8a4d8bb38bf88584937c0c487aa19849698a67caed608e893b148be9798
alternatives="
initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/dracut/kernel-hook-postinst
initramfs:/etc/kernel.d/post-remove/20-initramfs:/usr/libexec/dracut/kernel-hook-postrm
@@ -32,16 +32,11 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
fi
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) # archs supported by dracut for EFI bundle
+ i686*|x86_64*|aarch64*) # archs supported by dracut for EFI bundle
subpackages+=" dracut-uefi"
;;
esac
-pre_build() {
- # Upstream tarball is missing version information
- DRACUT_VERSION="${version}" make dracut-version.sh
-}
-
post_install() {
# kernel hooks.
vinstall ${FILESDIR}/kernel-hook-postinst 755 usr/libexec/dracut
@@ -52,21 +47,17 @@ post_install() {
# systemd dependent additional dracut modules
for f in 06rngd 06dbus-broker 06dbus-daemon 09dbus \
- 35connman 35network-manager 35network-wicked 80lvmmerge \
+ 35connman 35network-manager 80lvmmerge \
99memstrack 99squash; do
rm -r ${DESTDIR}/usr/lib/dracut/modules.d/${f}
done
# don't need s390x architecture dependent dracut modules
for f in 80cms 81cio_ignore 91zipl 95dasd 95dasd_mod \
- 95dasd_rules 95dcssblk 95qeth_rules 95zfcp \
- 95zfcp_rules 95znet; do
+ 95dcssblk 95zfcp 95znet; do
rm -r ${DESTDIR}/usr/lib/dracut/modules.d/${f}
done
- # ifcfg network-scripts dependent (RHEL-derived)
- rm -r ${DESTDIR}/usr/lib/dracut/modules.d/45ifcfg
-
rm ${DESTDIR}/usr/share/man/man8/*.service.*
rm -r ${DESTDIR}/usr/lib/kernel
}
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: [PR PATCH] [Updated] dracut: update to 103, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (23 preceding siblings ...)
2024-10-12 1:26 ` [PR PATCH] [Updated] " classabbyamp
@ 2024-10-12 1:31 ` classabbyamp
2024-10-12 1:55 ` dracut: update to 104, " classabbyamp
` (23 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: classabbyamp @ 2024-10-12 1:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 531 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages star-dracut-the-next-generation
https://github.com/void-linux/void-packages/pull/51344
dracut: update to 103, switch to dracut-ng
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
@zdykstra
A patch file from https://github.com/void-linux/void-packages/pull/51344.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-star-dracut-the-next-generation-51344.patch --]
[-- Type: text/x-diff, Size: 16741 bytes --]
From 096f23837d3b717128b6301236fb4fc8fc37ee9f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 19 Jul 2024 16:50:28 -0400
Subject: [PATCH] dracut: update to 104, switch to dracut-ng
---
...408c8644a0add1907b0593eb83f90d6247b1.patch | 45 -------------------
srcpkgs/dracut/patches/amd-ucode-readme.patch | 26 -----------
srcpkgs/dracut/patches/crypt-openssl-3.patch | 24 ----------
srcpkgs/dracut/patches/fix-fsck.patch | 27 -----------
srcpkgs/dracut/patches/force_poweroff.patch | 30 -------------
.../dracut/patches/isoscan-udev-trigger.patch | 25 -----------
srcpkgs/dracut/patches/network.patch | 37 ---------------
.../dracut/patches/plymouth-udev-seat.patch | 19 +++++---
srcpkgs/dracut/patches/silence-setfont.patch | 19 --------
srcpkgs/dracut/template | 28 +++++-------
10 files changed, 22 insertions(+), 258 deletions(-)
delete mode 100644 srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch
delete mode 100644 srcpkgs/dracut/patches/amd-ucode-readme.patch
delete mode 100644 srcpkgs/dracut/patches/crypt-openssl-3.patch
delete mode 100644 srcpkgs/dracut/patches/fix-fsck.patch
delete mode 100644 srcpkgs/dracut/patches/force_poweroff.patch
delete mode 100644 srcpkgs/dracut/patches/isoscan-udev-trigger.patch
delete mode 100644 srcpkgs/dracut/patches/network.patch
delete mode 100644 srcpkgs/dracut/patches/silence-setfont.patch
diff --git a/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch b/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch
deleted file mode 100644
index 6d3295c8e26c1a..00000000000000
--- a/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 6c80408c8644a0add1907b0593eb83f90d6247b1 Mon Sep 17 00:00:00 2001
-From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
-Date: Mon, 14 Aug 2023 12:28:11 +0200
-Subject: [PATCH] fix(dracut.sh): remove microcode check based on
- CONFIG_MICROCODE_[AMD|INTEL]
-
-`CONFIG_MICROCODE_AMD` and `CONFIG_MICROCODE_INTEL` are hidden since
-https://lore.kernel.org/all/20230810160805.081212701@linutronix.de/, therefore
-this check is wrong and early microcode is always disabled.
----
- dracut.sh | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index e0abdb3b0..3b292910f 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1561,23 +1561,20 @@ fi
-
- if [[ $early_microcode == yes ]]; then
- if [[ $hostonly ]]; then
-- if [[ $(get_cpu_vendor) == "AMD" ]]; then
-- check_kernel_config CONFIG_MICROCODE_AMD || unset early_microcode
-- elif [[ $(get_cpu_vendor) == "Intel" ]]; then
-- check_kernel_config CONFIG_MICROCODE_INTEL || unset early_microcode
-+ if [[ $(get_cpu_vendor) == "AMD" || $(get_cpu_vendor) == "Intel" ]]; then
-+ check_kernel_config CONFIG_MICROCODE || unset early_microcode
- else
- unset early_microcode
- fi
- else
-- ! check_kernel_config CONFIG_MICROCODE_AMD \
-- && ! check_kernel_config CONFIG_MICROCODE_INTEL \
-+ ! check_kernel_config CONFIG_MICROCODE \
- && unset early_microcode
- fi
- # Do not complain on non-x86 architectures as it makes no sense
- case "${DRACUT_ARCH:-$(uname -m)}" in
- x86_64 | i?86)
- [[ $early_microcode != yes ]] \
-- && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y"
-+ && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE!=y"
- ;;
- *) ;;
- esac
diff --git a/srcpkgs/dracut/patches/amd-ucode-readme.patch b/srcpkgs/dracut/patches/amd-ucode-readme.patch
deleted file mode 100644
index a2ea1288d230b0..00000000000000
--- a/srcpkgs/dracut/patches/amd-ucode-readme.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c1a69b81f6ebd62a40054be2375cb77c040694aa Mon Sep 17 00:00:00 2001
-From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
-Date: Mon, 30 Oct 2023 14:56:39 +0100
-Subject: [PATCH] fix(dracut.sh): skip README for AMD microcode generation
-
-This file was added in https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/amd-ucode/README?id=89ec6198f13d1007563ff87aae5de209e993be07
-and it should be skipped.
-
-Fixes #2541
----
- dracut.sh | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/dracut.sh b/dracut.sh
-index 3b292910f..bd730cbe9 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -2154,6 +2154,8 @@ if [[ $early_microcode == yes ]]; then
- done
- for i in $_fwdir/$_fw/$_src; do
- [[ -e $i ]] || continue
-+ # skip README{.xz,.zst,...}
-+ str_starts "$i" "$_fwdir/$_fw/README" && continue
- # skip gpg files
- str_ends "$i" ".asc" && continue
- cat "$i" >> "$_dest_dir/${ucode_dest[$idx]}"
diff --git a/srcpkgs/dracut/patches/crypt-openssl-3.patch b/srcpkgs/dracut/patches/crypt-openssl-3.patch
deleted file mode 100644
index 39fd3dd3c65e99..00000000000000
--- a/srcpkgs/dracut/patches/crypt-openssl-3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5996f6b5d9b0bb957b4bb02c49c95a057761cba5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Mon, 13 Feb 2023 20:22:56 +0000
-Subject: [PATCH] fix(crypt): add missing libraries
-
-Add missing libraries, closes #2137
----
- modules.d/90crypt/module-setup.sh | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/modules.d/90crypt/module-setup.sh
-+++ b/modules.d/90crypt/module-setup.sh
-@@ -176,5 +176,11 @@ install() {
- systemd-ask-password systemd-tty-ask-password-agent
- fi
-
-+ # Install required libraries.
-+ _arch=${DRACUT_ARCH:-$(uname -m)}
-+ inst_libdir_file \
-+ {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/fips.so" \
-+ {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/legacy.so"
-+
- dracut_need_initqueue
- }
diff --git a/srcpkgs/dracut/patches/fix-fsck.patch b/srcpkgs/dracut/patches/fix-fsck.patch
deleted file mode 100644
index 97c72d05e5543c..00000000000000
--- a/srcpkgs/dracut/patches/fix-fsck.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/dracutdevs/dracut/pull/2262
-
-From 26990cb90bf0f516ccbd56583000d6d02ab18acd Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Sat, 4 Mar 2023 23:28:17 +0000
-Subject: [PATCH] fix(fs-lib): remove quoting form the first argument of the
- e2fsck call
-
-Fix regression.
----
- modules.d/99fs-lib/fs-lib.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh
-index dd20731f2..c4640fa8a 100755
---- a/modules.d/99fs-lib/fs-lib.sh
-+++ b/modules.d/99fs-lib/fs-lib.sh
-@@ -107,7 +107,8 @@ fsck_drv_com() {
-
- info "issuing $_drv $_fop $_dev"
- # we enforce non-interactive run, so $() is fine
-- _out=$($_drv "$_fop" "$_dev")
-+ # shellcheck disable=SC2086
-+ _out=$($_drv $_fop "$_dev")
- _ret=$?
- fsck_tail
-
diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch
deleted file mode 100644
index 9056685e32b97a..00000000000000
--- a/srcpkgs/dracut/patches/force_poweroff.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-The shutdown binary is actually provided by runit and expects the runit
-init to be running. This is not the case in the initramfs. Forcing the
-shutdown, halt or reboot is necessary to ignore this requirement.
-
----
- modules.d/99base/dracut-lib.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
---- a/modules.d/99base/dracut-lib.sh
-+++ b/modules.d/99base/dracut-lib.sh
-@@ -1004,13 +1004,13 @@ emergency_shell() {
-
- case "$_emergency_action" in
- reboot)
-- reboot || exit 1
-+ reboot -f || exit 1
- ;;
- poweroff)
-- poweroff || exit 1
-+ poweroff -f || exit 1
- ;;
- halt)
-- halt || exit 1
-+ halt -f || exit 1
- ;;
- esac
- }
---
-2.37.3
diff --git a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch b/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
deleted file mode 100644
index b80e966266b45d..00000000000000
--- a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This upstream accepted patch fixes a bug where the live images don't work when
-booted from grub loopback (void-linux/void-mklive#294).
-
-From d880d62f5f81d7ec69555f5deb60694fdb693c01 Mon Sep 17 00:00:00 2001
-From: 0x5c <dev@0x5c.io>
-Date: Thu, 9 Feb 2023 05:26:30 -0500
-Subject: [PATCH] fix: make iso-scan trigger udev events
-
-Fixes #2183
----
- modules.d/90dmsquash-live/iso-scan.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules.d/90dmsquash-live/iso-scan.sh b/modules.d/90dmsquash-live/iso-scan.sh
-index 886d23033..fa06b33cd 100755
---- a/modules.d/90dmsquash-live/iso-scan.sh
-+++ b/modules.d/90dmsquash-live/iso-scan.sh
-@@ -22,6 +22,7 @@ do_iso_scan() {
- mount -t auto -o ro "$dev" "/run/initramfs/isoscan" || continue
- if [ -f "/run/initramfs/isoscan/$isofile" ]; then
- losetup -f "/run/initramfs/isoscan/$isofile"
-+ udevadm trigger --action=add > /dev/null 2>&1
- ln -s "$dev" /run/initramfs/isoscandev
- rm -f -- "$job"
- exit 0
diff --git a/srcpkgs/dracut/patches/network.patch b/srcpkgs/dracut/patches/network.patch
deleted file mode 100644
index dce39fdc6f7a53..00000000000000
--- a/srcpkgs/dracut/patches/network.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 11a34f6b55f91610effd79ff1bf6a4bb2db760d3 Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Wed, 18 Jan 2023 19:59:24 +0000
-Subject: [PATCH] meta module should check if module exists
-
-Bug: https://github.com/dracutdevs/dracut/issues/1756
----
- modules.d/40network/module-setup.sh | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index 1ab13ef..078cb4b 100755
---- a/modules.d/40network/module-setup.sh
-+++ b/modules.d/40network/module-setup.sh
-@@ -17,15 +17,15 @@ depends() {
- done
-
- if [ -z "$network_handler" ]; then
-- if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
-+ if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]] && [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
- network_handler="network-wicked"
-- elif [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
-+ elif [[ -d "$dracutbasedir"/modules.d/35connman ]] && [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
- network_handler="connman"
-- elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
-+ elif [[ -d "$dracutbasedir"/modules.d/35network-manager ]] && ( [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] ); then
- network_handler="network-manager"
-- elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
-+ elif [[ -d "$dracutbasedir"/modules.d/01systemd-networkd ]] && [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
- network_handler="systemd-networkd"
-- else
-+ elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then
- network_handler="network-legacy"
- fi
- fi
---
-2.34.1
diff --git a/srcpkgs/dracut/patches/plymouth-udev-seat.patch b/srcpkgs/dracut/patches/plymouth-udev-seat.patch
index 490dd63b310a95..afc06f89917700 100644
--- a/srcpkgs/dracut/patches/plymouth-udev-seat.patch
+++ b/srcpkgs/dracut/patches/plymouth-udev-seat.patch
@@ -1,11 +1,16 @@
+reverts https://github.com/dracut-ng/dracut-ng/pull/628 and adds udev rule
+that allows plymouth to work
+
--- a/modules.d/95udev-rules/module-setup.sh 2018-02-19 06:00:33.000000000 -0300
+++ b/modules.d/95udev-rules/module-setup.sh 2018-05-02 00:27:53.710253893 -0300
-@@ -39,6 +39,8 @@
- 60-persistent-storage.rules \
- 61-persistent-storage-edd.rules \
- 70-uaccess.rules \
+@@ -48,6 +48,10 @@
+ 70-memory.rules \
+ 70-mouse.rules \
+ 70-touchpad.rules \
++ 70-uaccess.rules \
+ 71-plymouth-seat.rules \
-+ 71-udev-seat.rules \
- 71-seat.rules \
- 73-seat-late.rules \
++ 71-seat.rules \
++ 73-seat-late.rules \
75-net-description.rules \
+ 75-probe_mtd.rules \
+ 78-sound-card.rules \
diff --git a/srcpkgs/dracut/patches/silence-setfont.patch b/srcpkgs/dracut/patches/silence-setfont.patch
deleted file mode 100644
index 377c0f3a8981a7..00000000000000
--- a/srcpkgs/dracut/patches/silence-setfont.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/void-linux/void-packages/issues/45216
-
-I'm tired of seeing these setfont errors. This will hopefully/eventually be upstreamed, but I'm not holding my breath.
-
----
-
-diff --git a/modules.d/10i18n/console_init.sh b/modules.d/10i18n/console_init.sh
-index 3fe3b673..0e19ae30 100755
---- a/modules.d/10i18n/console_init.sh
-+++ b/modules.d/10i18n/console_init.sh
-@@ -49,7 +49,7 @@ set_font() {
- setfont "${FONT-${DEFAULT_FONT}}" \
- -C "${1}" \
- ${FONT_MAP:+-m "${FONT_MAP}"} \
-- ${FONT_UNIMAP:+-u "${FONT_UNIMAP}"}
-+ ${FONT_UNIMAP:+-u "${FONT_UNIMAP}"} 2>/dev/null
- }
-
- dev_close() {
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 313e2d98719358..9475f1f2d71ceb 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
# Template file for 'dracut'
pkgname=dracut
-version=059
-revision=7
+version=104
+revision=1
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc"
conf_files="/etc/dracut.conf"
@@ -11,10 +11,10 @@ depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
short_desc="Low-level tool for generating an initramfs/initrd image"
maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="https://github.com/dracutdevs/dracut/wiki"
-changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
-distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
-checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
+homepage="https://github.com/dracut-ng/dracut-ng/wiki"
+changelog="https://raw.githubusercontent.com/dracut-ng/dracut-ng/master/NEWS.md"
+distfiles="https://github.com/dracut-ng/dracut-ng/archive/refs/tags/${version}.tar.gz"
+checksum=d5d4b8a4d8bb38bf88584937c0c487aa19849698a67caed608e893b148be9798
alternatives="
initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/dracut/kernel-hook-postinst
initramfs:/etc/kernel.d/post-remove/20-initramfs:/usr/libexec/dracut/kernel-hook-postrm
@@ -32,16 +32,11 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
fi
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) # archs supported by dracut for EFI bundle
+ i686*|x86_64*|aarch64*) # archs supported by dracut for EFI bundle
subpackages+=" dracut-uefi"
;;
esac
-pre_build() {
- # Upstream tarball is missing version information
- DRACUT_VERSION="${version}" make dracut-version.sh
-}
-
post_install() {
# kernel hooks.
vinstall ${FILESDIR}/kernel-hook-postinst 755 usr/libexec/dracut
@@ -52,23 +47,20 @@ post_install() {
# systemd dependent additional dracut modules
for f in 06rngd 06dbus-broker 06dbus-daemon 09dbus \
- 35connman 35network-manager 35network-wicked 80lvmmerge \
+ 35connman 35network-manager 80lvmmerge \
99memstrack 99squash; do
rm -r ${DESTDIR}/usr/lib/dracut/modules.d/${f}
done
# don't need s390x architecture dependent dracut modules
for f in 80cms 81cio_ignore 91zipl 95dasd 95dasd_mod \
- 95dasd_rules 95dcssblk 95qeth_rules 95zfcp \
- 95zfcp_rules 95znet; do
+ 95dcssblk 95zfcp 95znet; do
rm -r ${DESTDIR}/usr/lib/dracut/modules.d/${f}
done
- # ifcfg network-scripts dependent (RHEL-derived)
- rm -r ${DESTDIR}/usr/lib/dracut/modules.d/45ifcfg
-
rm ${DESTDIR}/usr/share/man/man8/*.service.*
rm -r ${DESTDIR}/usr/lib/kernel
+ rm -r "${DESTDIR}"/usr/lib/dracut/test
}
dracut-network_package() {
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 104, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (24 preceding siblings ...)
2024-10-12 1:31 ` classabbyamp
@ 2024-10-12 1:55 ` classabbyamp
2024-10-12 4:00 ` zdykstra
` (22 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: classabbyamp @ 2024-10-12 1:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 213 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2408298727
Comment:
@LaszloGombos @jozzsi any important patches since release for 104?
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 104, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (25 preceding siblings ...)
2024-10-12 1:55 ` dracut: update to 104, " classabbyamp
@ 2024-10-12 4:00 ` zdykstra
2024-10-12 4:27 ` classabbyamp
` (21 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: zdykstra @ 2024-10-12 4:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 340 bytes --]
New comment by zdykstra on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2408340923
Comment:
Built a copy of ZFSBootMenu on top of Dracut 104, it works as expected. Test coverage in the dracut-ng repo combined with people using this in general leaves me modestly comfortable :+1: 'ing this.
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 104, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (26 preceding siblings ...)
2024-10-12 4:00 ` zdykstra
@ 2024-10-12 4:27 ` classabbyamp
2024-10-12 12:12 ` jozzsi
` (20 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: classabbyamp @ 2024-10-12 4:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2408366895
Comment:
tested on aarch64 on a Lenovo X13s. seems to work fine.
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 104, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (27 preceding siblings ...)
2024-10-12 4:27 ` classabbyamp
@ 2024-10-12 12:12 ` jozzsi
2024-10-12 12:13 ` jozzsi
` (19 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: jozzsi @ 2024-10-12 12:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 675 bytes --]
New comment by jozzsi on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2408542135
Comment:
> @LaszloGombos @jozzsi any important patches since release for 104?
Mostly small bugfixes, like this one - https://github.com/dracut-ng/dracut-ng/commit/6611c6e4a0166bec50cc567b708ec7265dc82682
with 104 there are some other dracut modules that are probably not an interest for Void - see the alpine packaging for - https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/73326/diffs#771108dce0a731afe3a496a5d2e1b44461f0ad1d_60_61
I hope I can find a way to maintain the list of 'systemd-only' dracut modules upstream.
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 104, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (28 preceding siblings ...)
2024-10-12 12:12 ` jozzsi
@ 2024-10-12 12:13 ` jozzsi
2024-10-12 12:14 ` jozzsi
` (18 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: jozzsi @ 2024-10-12 12:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 653 bytes --]
New comment by jozzsi on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2408542135
Comment:
> any important patches since release for 104?
Mostly small bugfixes, like this one - https://github.com/dracut-ng/dracut-ng/commit/6611c6e4a0166bec50cc567b708ec7265dc82682
with 104 there are some other dracut modules that are probably not an interest for Void - see the alpine packaging for - https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/73326/diffs#771108dce0a731afe3a496a5d2e1b44461f0ad1d_60_61
I hope I can find a way to maintain the list of 'systemd-only' dracut modules upstream.
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 104, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (29 preceding siblings ...)
2024-10-12 12:13 ` jozzsi
@ 2024-10-12 12:14 ` jozzsi
2024-10-13 0:02 ` Calandracas606
` (17 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: jozzsi @ 2024-10-12 12:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 649 bytes --]
New comment by jozzsi on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2408542135
Comment:
> any important patches since release for 104?
Mostly small bugfixes, like this one - https://github.com/dracut-ng/dracut-ng/commit/6611c6e4a0166bec50cc567b708ec7265dc82682
with 104 there are some other dracut modules that are probably not an interest for Void - see the [alpine packaging](https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/73326/diffs#771108dce0a731afe3a496a5d2e1b44461f0ad1d_60_61)
I hope I can find a way to maintain the list of 'systemd-only' dracut modules upstream.
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 104, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (30 preceding siblings ...)
2024-10-12 12:14 ` jozzsi
@ 2024-10-13 0:02 ` Calandracas606
2024-10-13 0:14 ` [PR PATCH] [Updated] " classabbyamp
` (16 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: Calandracas606 @ 2024-10-13 0:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 424 bytes --]
New comment by Calandracas606 on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2408750339
Comment:
dracut fails to generated initramfs on musl-1.1.24 with a bunch of dracut-install errors
```
dracut-install: ERROR: failed to create directory '/var/tmp/dracut.gz9SxV/initramfs/bin'
dracut-install: ERROR: failed to install '/bin/sh'
```
works with musl 1.2.5 though.
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: [PR PATCH] [Updated] dracut: update to 104, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (31 preceding siblings ...)
2024-10-13 0:02 ` Calandracas606
@ 2024-10-13 0:14 ` classabbyamp
2024-10-13 0:28 ` classabbyamp
` (15 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: classabbyamp @ 2024-10-13 0:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 531 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages star-dracut-the-next-generation
https://github.com/void-linux/void-packages/pull/51344
dracut: update to 104, switch to dracut-ng
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
@zdykstra
A patch file from https://github.com/void-linux/void-packages/pull/51344.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-star-dracut-the-next-generation-51344.patch --]
[-- Type: text/x-diff, Size: 21595 bytes --]
From 7b80606d56fd00a87df67eadfa25163d7cea1282 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 19 Jul 2024 16:50:28 -0400
Subject: [PATCH] dracut: update to 104, switch to dracut-ng
---
...408c8644a0add1907b0593eb83f90d6247b1.patch | 45 ---------
srcpkgs/dracut/patches/amd-ucode-readme.patch | 26 -----
srcpkgs/dracut/patches/crypt-openssl-3.patch | 24 -----
srcpkgs/dracut/patches/fix-fsck.patch | 27 ------
srcpkgs/dracut/patches/force_poweroff.patch | 30 ------
.../dracut/patches/isoscan-udev-trigger.patch | 25 -----
srcpkgs/dracut/patches/musl-1.1.patch | 97 +++++++++++++++++++
srcpkgs/dracut/patches/network.patch | 37 -------
.../dracut/patches/plymouth-udev-seat.patch | 19 ++--
srcpkgs/dracut/patches/silence-setfont.patch | 19 ----
srcpkgs/dracut/template | 33 +++----
11 files changed, 122 insertions(+), 260 deletions(-)
delete mode 100644 srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch
delete mode 100644 srcpkgs/dracut/patches/amd-ucode-readme.patch
delete mode 100644 srcpkgs/dracut/patches/crypt-openssl-3.patch
delete mode 100644 srcpkgs/dracut/patches/fix-fsck.patch
delete mode 100644 srcpkgs/dracut/patches/force_poweroff.patch
delete mode 100644 srcpkgs/dracut/patches/isoscan-udev-trigger.patch
create mode 100644 srcpkgs/dracut/patches/musl-1.1.patch
delete mode 100644 srcpkgs/dracut/patches/network.patch
delete mode 100644 srcpkgs/dracut/patches/silence-setfont.patch
diff --git a/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch b/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch
deleted file mode 100644
index 6d3295c8e26c1a..00000000000000
--- a/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 6c80408c8644a0add1907b0593eb83f90d6247b1 Mon Sep 17 00:00:00 2001
-From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
-Date: Mon, 14 Aug 2023 12:28:11 +0200
-Subject: [PATCH] fix(dracut.sh): remove microcode check based on
- CONFIG_MICROCODE_[AMD|INTEL]
-
-`CONFIG_MICROCODE_AMD` and `CONFIG_MICROCODE_INTEL` are hidden since
-https://lore.kernel.org/all/20230810160805.081212701@linutronix.de/, therefore
-this check is wrong and early microcode is always disabled.
----
- dracut.sh | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index e0abdb3b0..3b292910f 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1561,23 +1561,20 @@ fi
-
- if [[ $early_microcode == yes ]]; then
- if [[ $hostonly ]]; then
-- if [[ $(get_cpu_vendor) == "AMD" ]]; then
-- check_kernel_config CONFIG_MICROCODE_AMD || unset early_microcode
-- elif [[ $(get_cpu_vendor) == "Intel" ]]; then
-- check_kernel_config CONFIG_MICROCODE_INTEL || unset early_microcode
-+ if [[ $(get_cpu_vendor) == "AMD" || $(get_cpu_vendor) == "Intel" ]]; then
-+ check_kernel_config CONFIG_MICROCODE || unset early_microcode
- else
- unset early_microcode
- fi
- else
-- ! check_kernel_config CONFIG_MICROCODE_AMD \
-- && ! check_kernel_config CONFIG_MICROCODE_INTEL \
-+ ! check_kernel_config CONFIG_MICROCODE \
- && unset early_microcode
- fi
- # Do not complain on non-x86 architectures as it makes no sense
- case "${DRACUT_ARCH:-$(uname -m)}" in
- x86_64 | i?86)
- [[ $early_microcode != yes ]] \
-- && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y"
-+ && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE!=y"
- ;;
- *) ;;
- esac
diff --git a/srcpkgs/dracut/patches/amd-ucode-readme.patch b/srcpkgs/dracut/patches/amd-ucode-readme.patch
deleted file mode 100644
index a2ea1288d230b0..00000000000000
--- a/srcpkgs/dracut/patches/amd-ucode-readme.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c1a69b81f6ebd62a40054be2375cb77c040694aa Mon Sep 17 00:00:00 2001
-From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
-Date: Mon, 30 Oct 2023 14:56:39 +0100
-Subject: [PATCH] fix(dracut.sh): skip README for AMD microcode generation
-
-This file was added in https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/amd-ucode/README?id=89ec6198f13d1007563ff87aae5de209e993be07
-and it should be skipped.
-
-Fixes #2541
----
- dracut.sh | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/dracut.sh b/dracut.sh
-index 3b292910f..bd730cbe9 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -2154,6 +2154,8 @@ if [[ $early_microcode == yes ]]; then
- done
- for i in $_fwdir/$_fw/$_src; do
- [[ -e $i ]] || continue
-+ # skip README{.xz,.zst,...}
-+ str_starts "$i" "$_fwdir/$_fw/README" && continue
- # skip gpg files
- str_ends "$i" ".asc" && continue
- cat "$i" >> "$_dest_dir/${ucode_dest[$idx]}"
diff --git a/srcpkgs/dracut/patches/crypt-openssl-3.patch b/srcpkgs/dracut/patches/crypt-openssl-3.patch
deleted file mode 100644
index 39fd3dd3c65e99..00000000000000
--- a/srcpkgs/dracut/patches/crypt-openssl-3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5996f6b5d9b0bb957b4bb02c49c95a057761cba5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Mon, 13 Feb 2023 20:22:56 +0000
-Subject: [PATCH] fix(crypt): add missing libraries
-
-Add missing libraries, closes #2137
----
- modules.d/90crypt/module-setup.sh | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/modules.d/90crypt/module-setup.sh
-+++ b/modules.d/90crypt/module-setup.sh
-@@ -176,5 +176,11 @@ install() {
- systemd-ask-password systemd-tty-ask-password-agent
- fi
-
-+ # Install required libraries.
-+ _arch=${DRACUT_ARCH:-$(uname -m)}
-+ inst_libdir_file \
-+ {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/fips.so" \
-+ {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/legacy.so"
-+
- dracut_need_initqueue
- }
diff --git a/srcpkgs/dracut/patches/fix-fsck.patch b/srcpkgs/dracut/patches/fix-fsck.patch
deleted file mode 100644
index 97c72d05e5543c..00000000000000
--- a/srcpkgs/dracut/patches/fix-fsck.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/dracutdevs/dracut/pull/2262
-
-From 26990cb90bf0f516ccbd56583000d6d02ab18acd Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Sat, 4 Mar 2023 23:28:17 +0000
-Subject: [PATCH] fix(fs-lib): remove quoting form the first argument of the
- e2fsck call
-
-Fix regression.
----
- modules.d/99fs-lib/fs-lib.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh
-index dd20731f2..c4640fa8a 100755
---- a/modules.d/99fs-lib/fs-lib.sh
-+++ b/modules.d/99fs-lib/fs-lib.sh
-@@ -107,7 +107,8 @@ fsck_drv_com() {
-
- info "issuing $_drv $_fop $_dev"
- # we enforce non-interactive run, so $() is fine
-- _out=$($_drv "$_fop" "$_dev")
-+ # shellcheck disable=SC2086
-+ _out=$($_drv $_fop "$_dev")
- _ret=$?
- fsck_tail
-
diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch
deleted file mode 100644
index 9056685e32b97a..00000000000000
--- a/srcpkgs/dracut/patches/force_poweroff.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-The shutdown binary is actually provided by runit and expects the runit
-init to be running. This is not the case in the initramfs. Forcing the
-shutdown, halt or reboot is necessary to ignore this requirement.
-
----
- modules.d/99base/dracut-lib.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
---- a/modules.d/99base/dracut-lib.sh
-+++ b/modules.d/99base/dracut-lib.sh
-@@ -1004,13 +1004,13 @@ emergency_shell() {
-
- case "$_emergency_action" in
- reboot)
-- reboot || exit 1
-+ reboot -f || exit 1
- ;;
- poweroff)
-- poweroff || exit 1
-+ poweroff -f || exit 1
- ;;
- halt)
-- halt || exit 1
-+ halt -f || exit 1
- ;;
- esac
- }
---
-2.37.3
diff --git a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch b/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
deleted file mode 100644
index b80e966266b45d..00000000000000
--- a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This upstream accepted patch fixes a bug where the live images don't work when
-booted from grub loopback (void-linux/void-mklive#294).
-
-From d880d62f5f81d7ec69555f5deb60694fdb693c01 Mon Sep 17 00:00:00 2001
-From: 0x5c <dev@0x5c.io>
-Date: Thu, 9 Feb 2023 05:26:30 -0500
-Subject: [PATCH] fix: make iso-scan trigger udev events
-
-Fixes #2183
----
- modules.d/90dmsquash-live/iso-scan.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules.d/90dmsquash-live/iso-scan.sh b/modules.d/90dmsquash-live/iso-scan.sh
-index 886d23033..fa06b33cd 100755
---- a/modules.d/90dmsquash-live/iso-scan.sh
-+++ b/modules.d/90dmsquash-live/iso-scan.sh
-@@ -22,6 +22,7 @@ do_iso_scan() {
- mount -t auto -o ro "$dev" "/run/initramfs/isoscan" || continue
- if [ -f "/run/initramfs/isoscan/$isofile" ]; then
- losetup -f "/run/initramfs/isoscan/$isofile"
-+ udevadm trigger --action=add > /dev/null 2>&1
- ln -s "$dev" /run/initramfs/isoscandev
- rm -f -- "$job"
- exit 0
diff --git a/srcpkgs/dracut/patches/musl-1.1.patch b/srcpkgs/dracut/patches/musl-1.1.patch
new file mode 100644
index 00000000000000..2c73d1c5bf0b57
--- /dev/null
+++ b/srcpkgs/dracut/patches/musl-1.1.patch
@@ -0,0 +1,97 @@
+From c52069f7a0adab4b5c5b911a44d65d3ba0989d7e Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Sat, 12 Oct 2024 20:06:12 -0400
+Subject: [PATCH] Revert "perf(dracut-install): stat() w/unused buf ->
+ access(F_OK) in dracut-install"
+
+This reverts commit e7ed8337bb9fec0283af5dc745450394ba649a03.
+
+This commit broke compatibility with musl 1.1.
+---
+ src/install/dracut-install.c | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/src/install/dracut-install.c b/src/install/dracut-install.c
+index 96bc2eb6..30c51a30 100644
+--- a/src/install/dracut-install.c
++++ b/src/install/dracut-install.c
+@@ -812,7 +812,7 @@ static int dracut_mkdir(const char *src)
+
+ static int dracut_install(const char *orig_src, const char *orig_dst, bool isdir, bool resolvedeps, bool hashdst)
+ {
+- struct stat sb;
++ struct stat sb, db;
+ _cleanup_free_ char *fullsrcpath = NULL;
+ _cleanup_free_ char *fulldstpath = NULL;
+ _cleanup_free_ char *fulldstdir = NULL;
+@@ -898,7 +898,7 @@ static int dracut_install(const char *orig_src, const char *orig_dst, bool isdir
+ return 1;
+ }
+
+- ret = access(fulldstdir, F_OK);
++ ret = stat(fulldstdir, &db);
+
+ if (ret < 0) {
+ _cleanup_free_ char *dname = NULL;
+@@ -958,12 +958,12 @@ static int dracut_install(const char *orig_src, const char *orig_dst, bool isdir
+ return 1;
+ }
+
+- if (faccessat(AT_FDCWD, abspath, F_OK, AT_SYMLINK_NOFOLLOW) != 0) {
++ if (lstat(abspath, &sb) != 0) {
+ log_debug("lstat '%s': %m", abspath);
+ return 1;
+ }
+
+- if (faccessat(AT_FDCWD, fulldstpath, F_OK, AT_SYMLINK_NOFOLLOW) != 0) {
++ if (lstat(fulldstpath, &sb) != 0) {
+ _cleanup_free_ char *absdestpath = NULL;
+
+ _asprintf(&absdestpath, "%s/%s", destrootdir,
+@@ -1313,6 +1313,7 @@ static char **find_binary(const char *src)
+ char *newsrc = NULL;
+
+ STRV_FOREACH(q, pathdirs) {
++ struct stat sb;
+ char *fullsrcpath;
+
+ _asprintf(&newsrc, "%s/%s", *q, src);
+@@ -1325,8 +1326,8 @@ static char **find_binary(const char *src)
+ continue;
+ }
+
+- if (faccessat(AT_FDCWD, fullsrcpath, F_OK, AT_SYMLINK_NOFOLLOW) != 0) {
+- log_debug("lstat(%s) != 0", fullsrcpath);
++ if (lstat(fullsrcpath, &sb) != 0) {
++ log_debug("stat(%s) != 0", fullsrcpath);
+ free(newsrc);
+ newsrc = NULL;
+ free(fullsrcpath);
+@@ -1441,8 +1442,9 @@ static int install_firmware_fullpath(const char *fwpath)
+ {
+ const char *fw = fwpath;
+ _cleanup_free_ char *fwpath_compressed = NULL;
++ struct stat sb;
+ int ret;
+- if (access(fwpath, F_OK) != 0) {
++ if (stat(fwpath, &sb) != 0) {
+ _asprintf(&fwpath_compressed, "%s.zst", fwpath);
+ if (access(fwpath_compressed, F_OK) != 0) {
+ strcpy(fwpath_compressed + strlen(fwpath) + 1, "xz");
+@@ -1485,11 +1487,12 @@ static int install_firmware(struct kmod_module *mod)
+ ret = -1;
+ STRV_FOREACH(q, firmwaredirs) {
+ _cleanup_free_ char *fwpath = NULL;
++ struct stat sb;
+
+ _asprintf(&fwpath, "%s/%s", *q, value);
+
+ if (strpbrk(value, "*?[") != NULL
+- && access(fwpath, F_OK) != 0) {
++ && stat(fwpath, &sb) != 0) {
+ size_t i;
+ _cleanup_globfree_ glob_t globbuf;
+
+--
+2.46.0
+
diff --git a/srcpkgs/dracut/patches/network.patch b/srcpkgs/dracut/patches/network.patch
deleted file mode 100644
index dce39fdc6f7a53..00000000000000
--- a/srcpkgs/dracut/patches/network.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 11a34f6b55f91610effd79ff1bf6a4bb2db760d3 Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Wed, 18 Jan 2023 19:59:24 +0000
-Subject: [PATCH] meta module should check if module exists
-
-Bug: https://github.com/dracutdevs/dracut/issues/1756
----
- modules.d/40network/module-setup.sh | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index 1ab13ef..078cb4b 100755
---- a/modules.d/40network/module-setup.sh
-+++ b/modules.d/40network/module-setup.sh
-@@ -17,15 +17,15 @@ depends() {
- done
-
- if [ -z "$network_handler" ]; then
-- if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
-+ if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]] && [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
- network_handler="network-wicked"
-- elif [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
-+ elif [[ -d "$dracutbasedir"/modules.d/35connman ]] && [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
- network_handler="connman"
-- elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
-+ elif [[ -d "$dracutbasedir"/modules.d/35network-manager ]] && ( [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] ); then
- network_handler="network-manager"
-- elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
-+ elif [[ -d "$dracutbasedir"/modules.d/01systemd-networkd ]] && [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
- network_handler="systemd-networkd"
-- else
-+ elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then
- network_handler="network-legacy"
- fi
- fi
---
-2.34.1
diff --git a/srcpkgs/dracut/patches/plymouth-udev-seat.patch b/srcpkgs/dracut/patches/plymouth-udev-seat.patch
index 490dd63b310a95..afc06f89917700 100644
--- a/srcpkgs/dracut/patches/plymouth-udev-seat.patch
+++ b/srcpkgs/dracut/patches/plymouth-udev-seat.patch
@@ -1,11 +1,16 @@
+reverts https://github.com/dracut-ng/dracut-ng/pull/628 and adds udev rule
+that allows plymouth to work
+
--- a/modules.d/95udev-rules/module-setup.sh 2018-02-19 06:00:33.000000000 -0300
+++ b/modules.d/95udev-rules/module-setup.sh 2018-05-02 00:27:53.710253893 -0300
-@@ -39,6 +39,8 @@
- 60-persistent-storage.rules \
- 61-persistent-storage-edd.rules \
- 70-uaccess.rules \
+@@ -48,6 +48,10 @@
+ 70-memory.rules \
+ 70-mouse.rules \
+ 70-touchpad.rules \
++ 70-uaccess.rules \
+ 71-plymouth-seat.rules \
-+ 71-udev-seat.rules \
- 71-seat.rules \
- 73-seat-late.rules \
++ 71-seat.rules \
++ 73-seat-late.rules \
75-net-description.rules \
+ 75-probe_mtd.rules \
+ 78-sound-card.rules \
diff --git a/srcpkgs/dracut/patches/silence-setfont.patch b/srcpkgs/dracut/patches/silence-setfont.patch
deleted file mode 100644
index 377c0f3a8981a7..00000000000000
--- a/srcpkgs/dracut/patches/silence-setfont.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/void-linux/void-packages/issues/45216
-
-I'm tired of seeing these setfont errors. This will hopefully/eventually be upstreamed, but I'm not holding my breath.
-
----
-
-diff --git a/modules.d/10i18n/console_init.sh b/modules.d/10i18n/console_init.sh
-index 3fe3b673..0e19ae30 100755
---- a/modules.d/10i18n/console_init.sh
-+++ b/modules.d/10i18n/console_init.sh
-@@ -49,7 +49,7 @@ set_font() {
- setfont "${FONT-${DEFAULT_FONT}}" \
- -C "${1}" \
- ${FONT_MAP:+-m "${FONT_MAP}"} \
-- ${FONT_UNIMAP:+-u "${FONT_UNIMAP}"}
-+ ${FONT_UNIMAP:+-u "${FONT_UNIMAP}"} 2>/dev/null
- }
-
- dev_close() {
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 313e2d98719358..e37236ec1243c6 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
# Template file for 'dracut'
pkgname=dracut
-version=059
-revision=7
+version=104
+revision=1
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc"
conf_files="/etc/dracut.conf"
@@ -11,10 +11,10 @@ depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
short_desc="Low-level tool for generating an initramfs/initrd image"
maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="https://github.com/dracutdevs/dracut/wiki"
-changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
-distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
-checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
+homepage="https://github.com/dracut-ng/dracut-ng/wiki"
+changelog="https://raw.githubusercontent.com/dracut-ng/dracut-ng/master/NEWS.md"
+distfiles="https://github.com/dracut-ng/dracut-ng/archive/refs/tags/${version}.tar.gz"
+checksum=d5d4b8a4d8bb38bf88584937c0c487aa19849698a67caed608e893b148be9798
alternatives="
initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/dracut/kernel-hook-postinst
initramfs:/etc/kernel.d/post-remove/20-initramfs:/usr/libexec/dracut/kernel-hook-postrm
@@ -32,16 +32,11 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
fi
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) # archs supported by dracut for EFI bundle
+ i686*|x86_64*|aarch64*) # archs supported by dracut for EFI bundle
subpackages+=" dracut-uefi"
;;
esac
-pre_build() {
- # Upstream tarball is missing version information
- DRACUT_VERSION="${version}" make dracut-version.sh
-}
-
post_install() {
# kernel hooks.
vinstall ${FILESDIR}/kernel-hook-postinst 755 usr/libexec/dracut
@@ -52,23 +47,21 @@ post_install() {
# systemd dependent additional dracut modules
for f in 06rngd 06dbus-broker 06dbus-daemon 09dbus \
- 35connman 35network-manager 35network-wicked 80lvmmerge \
- 99memstrack 99squash; do
+ 35connman 35network-manager 80lvmmerge \
+ 91fido2 91pcsc 91pkcs11 91tpm2-tss 95squash* \
+ 99memstrack 99squash*; do
rm -r ${DESTDIR}/usr/lib/dracut/modules.d/${f}
done
# don't need s390x architecture dependent dracut modules
for f in 80cms 81cio_ignore 91zipl 95dasd 95dasd_mod \
- 95dasd_rules 95dcssblk 95qeth_rules 95zfcp \
- 95zfcp_rules 95znet; do
+ 95dcssblk 95zfcp 95znet; do
rm -r ${DESTDIR}/usr/lib/dracut/modules.d/${f}
done
- # ifcfg network-scripts dependent (RHEL-derived)
- rm -r ${DESTDIR}/usr/lib/dracut/modules.d/45ifcfg
-
rm ${DESTDIR}/usr/share/man/man8/*.service.*
rm -r ${DESTDIR}/usr/lib/kernel
+ rm -r "${DESTDIR}"/usr/lib/dracut/test
}
dracut-network_package() {
@@ -84,7 +77,7 @@ dracut-network_package() {
}
dracut-uefi_package() {
- depends="binutils gummiboot-efistub ${sourcepkg}>=${version}_${revision}"
+ depends="binutils systemd-boot-efistub ${sourcepkg}>=${version}_${revision}"
short_desc+=" - UEFI bundle hook"
conf_files="/etc/default/dracut-uefi-hook"
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 104, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (32 preceding siblings ...)
2024-10-13 0:14 ` [PR PATCH] [Updated] " classabbyamp
@ 2024-10-13 0:28 ` classabbyamp
2024-10-13 0:30 ` classabbyamp
` (14 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: classabbyamp @ 2024-10-13 0:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 287 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2408758642
Comment:
try the latest push please, i added a patch to revert https://github.com/dracut-ng/dracut-ng/commit/e7ed8337bb9fec0283af5dc745450394ba649a03
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 104, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (33 preceding siblings ...)
2024-10-13 0:28 ` classabbyamp
@ 2024-10-13 0:30 ` classabbyamp
2024-10-13 13:12 ` jozzsi
` (13 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: classabbyamp @ 2024-10-13 0:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 207 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2408760161
Comment:
tested with mklive on x86_64 and x86_64-musl, seems to work.
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 104, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (34 preceding siblings ...)
2024-10-13 0:30 ` classabbyamp
@ 2024-10-13 13:12 ` jozzsi
2024-10-15 18:02 ` classabbyamp
` (12 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: jozzsi @ 2024-10-13 13:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 390 bytes --]
New comment by jozzsi on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2408975123
Comment:
FYI - v105 is just out (to fix a systemd related regression). Not much of a difference from v104 for Void.
@classabbyamp - thanks for https://github.com/dracut-ng/dracut-ng/pull/628#issuecomment-2408282208 - fix for this is also included in v105
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 104, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (35 preceding siblings ...)
2024-10-13 13:12 ` jozzsi
@ 2024-10-15 18:02 ` classabbyamp
2024-10-15 18:05 ` classabbyamp
` (11 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: classabbyamp @ 2024-10-15 18:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 41828 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2414677959
Comment:
@jozzsi has anything significant changed in how `force_drivers` works since 059? I rely on that on an arm64 laptop to load [some essential modules](https://github.com/void-linux/void-packages/blob/master/srcpkgs/x13s-base/files/dracut.conf). on 059, everything works fine, but on 105, there are a lot of deferred hardware probes and it looks like a lot of things only kick off once reaching void's userspace.
<details><summary><code>lsinitrd</code> diff between 059 and 105</summary>
<p>
```diff
--- initrd059.txt 2024-10-15 13:48:47.989996304 -0400
+++ initrd105.txt 2024-10-15 13:48:45.694148800 -0400
@@ -1,16 +1,19 @@
-Image: /boot/initramfs-6.11.3_1.img: 85M
+Image: /boot/initramfs-6.11.3_1.img.bak: 74M
========================================================================
-Version: dracut-059
+Version: dracut-105
Arguments: -q --force
dracut modules:
+dash
+shell-interpreter
i18n
drm
kernel-modules
kernel-modules-extra
nvdimm
qemu
+hwdb
lunmask
resume
rootfs-block
@@ -36,7 +39,7 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 0 etc/fstab.empty
-rw-r--r-- 1 root root 162 etc/group
lrwxrwxrwx 1 root root 25 etc/initrd-release -> ../usr/lib/initrd-release
--rw-r--r-- 1 root root 1963 etc/ld.so.cache
+-rw-r--r-- 1 root root 2203 etc/ld.so.cache
-rw-r--r-- 1 root root 33 etc/ld.so.conf
drwxr-xr-x 2 root root 0 etc/ld.so.conf.d
-rw-r--r-- 1 root root 11 etc/ld.so.conf.d/lib32.conf
@@ -49,22 +52,20 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 168 etc/udev/rules.d/10-console.rules
-rw-r--r-- 1 root root 297 etc/udev/rules.d/59-persistent-storage.rules
-rw-r--r-- 1 root root 1030 etc/udev/rules.d/61-persistent-storage.rules
--rw-r--r-- 1 root root 215 etc/udev/udev.conf
--rwxr-xr-x 1 root root 11939 init
+-rwxr-xr-x 1 root root 11983 init
lrwxrwxrwx 1 root root 7 lib -> usr/lib
lrwxrwxrwx 1 root root 7 lib64 -> usr/lib
drwxr-xr-x 2 root root 0 proc
drwxr-xr-x 2 root root 0 root
drwxr-xr-x 2 root root 0 run
lrwxrwxrwx 1 root root 7 sbin -> usr/bin
--rwxr-xr-x 1 root root 4778 shutdown
+-rwxr-xr-x 1 root root 4780 shutdown
drwxr-xr-x 2 root root 0 sys
drwxr-xr-x 2 root root 0 sysroot
lrwxrwxrwx 1 root root 11 systemd-udevd -> /sbin/udevd
drwxr-xr-x 2 root root 0 tmp
drwxr-xr-x 6 root root 0 usr
drwxr-xr-x 2 root root 0 usr/bin
--rwxr-xr-x 1 root root 1478192 usr/bin/bash
-rwxr-xr-x 1 root root 198752 usr/bin/blkid
-rwxr-xr-x 1 root root 1126288 usr/bin/btrfs
lrwxrwxrwx 1 root root 5 usr/bin/btrfsck -> btrfs
@@ -72,10 +73,11 @@ lrwxrwxrwx 1 root root
-rwxr-xr-x 1 root root 67872 usr/bin/chmod
-rwxr-xr-x 1 root root 133400 usr/bin/chown
-rwxr-xr-x 1 root root 133424 usr/bin/cp
+-rwxr-xr-x 1 root root 133720 usr/bin/dash
-rwxr-xr-x 1 root root 135552 usr/bin/dmesg
lrwxrwxrwx 1 root root 11 usr/bin/dracut-getarg -> dracut-util
lrwxrwxrwx 1 root root 11 usr/bin/dracut-getargs -> dracut-util
--rwxr-xr-x 1 root root 67664 usr/bin/dracut-util
+-rwxr-xr-x 1 root root 67568 usr/bin/dracut-util
-rwxr-xr-x 1 root root 348088 usr/bin/e2fsck
-rwxr-xr-x 1 root root 134672 usr/bin/findmnt
-rwxr-xr-x 1 root root 67712 usr/bin/flock
@@ -94,14 +96,14 @@ lrwxrwxrwx 1 root root
-rwxr-xr-x 1 root root 134104 usr/bin/gzip
-rwxr-xr-x 1 root root 67568 usr/bin/halt
-rwxr-xr-x 1 root root 1341 usr/bin/initqueue
--rwxr-xr-x 1 root root 195 usr/bin/insmodpost.sh
+-rwxr-xr-x 1 root root 178 usr/bin/insmodpost.sh
-rwxr-xr-x 1 root root 67936 usr/bin/kbd_mode
-rwxr-xr-x 1 root root 198824 usr/bin/kmod
-rwxr-xr-x 1 root root 282280 usr/bin/less
-rwxr-xr-x 1 root root 133416 usr/bin/ln
-rwxr-xr-x 1 root root 265024 usr/bin/loadkeys
-rwxr-xr-x 1 root root 67736 usr/bin/loginctl
--rwxr-xr-x 1 root root 528 usr/bin/loginit
+-rwxr-xr-x 1 root root 533 usr/bin/loginit
-rwxr-xr-x 1 root root 198856 usr/bin/losetup
-rwxr-xr-x 1 root root 199408 usr/bin/ls
-rwxr-xr-x 1 root root 67864 usr/bin/mkdir
@@ -111,7 +113,7 @@ lrwxrwxrwx 1 root root
-rwsr-xr-x 1 root root 67648 usr/bin/mount
-rwxr-xr-x 1 root root 198960 usr/bin/mv
lrwxrwxrwx 1 root root 4 usr/bin/poweroff -> halt
--rwxr-xr-x 1 root root 1450 usr/bin/rdsosreport
+-rwxr-xr-x 1 root root 1508 usr/bin/rdsosreport
-rwxr-xr-x 1 root root 67872 usr/bin/readlink
lrwxrwxrwx 1 root root 4 usr/bin/reboot -> halt
-rwxr-xr-x 1 root root 133408 usr/bin/rm
@@ -119,7 +121,7 @@ lrwxrwxrwx 1 root root
-rwxr-xr-x 1 root root 199040 usr/bin/sed
-rwxr-xr-x 1 root root 67720 usr/bin/setfont
-rwxr-xr-x 1 root root 67640 usr/bin/setsid
-lrwxrwxrwx 1 root root 4 usr/bin/sh -> bash
+lrwxrwxrwx 1 root root 4 usr/bin/sh -> dash
-rwxr-xr-x 1 root root 67864 usr/bin/sleep
-rwxr-xr-x 1 root root 133416 usr/bin/stat
-rwxr-xr-x 1 root root 133416 usr/bin/stty
@@ -137,44 +139,15 @@ lrwxrwxrwx 1 root root
drwxr-xr-x 9 root root 0 usr/lib
drwxr-xr-x 2 root root 0 usr/lib/depmod.d
-rw-r--r-- 1 root root 70 usr/lib/depmod.d/search.conf
-drwxr-xr-x 3 root root 0 usr/lib/dracut
--rwxr-xr-x 1 root root 4065 usr/lib/dracut-dev-lib.sh
--rwxr-xr-x 1 root root 28747 usr/lib/dracut-lib.sh
+drwxr-xr-x 2 root root 0 usr/lib/dracut
+-rwxr-xr-x 1 root root 4078 usr/lib/dracut-dev-lib.sh
+-rwxr-xr-x 1 root root 29236 usr/lib/dracut-lib.sh
-rw-r--r-- 1 root root 12 usr/lib/dracut/build-parameter.txt
--rw-r--r-- 1 root root 11 usr/lib/dracut/dracut-059
-drwxr-xr-x 15 root root 0 usr/lib/dracut/hooks
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/cleanup
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/cmdline
--rwxr-xr-x 1 root root 917 usr/lib/dracut/hooks/cmdline/01-parse-kernel.sh
--rwxr-xr-x 1 root root 3413 usr/lib/dracut/hooks/cmdline/10-parse-resume.sh
--rwxr-xr-x 1 root root 273 usr/lib/dracut/hooks/cmdline/10-parse-root-opts.sh
--rwxr-xr-x 1 root root 1088 usr/lib/dracut/hooks/cmdline/20-parse-i18n.sh
--rwxr-xr-x 1 root root 1243 usr/lib/dracut/hooks/cmdline/30-parse-lunmask.sh
--rwxr-xr-x 1 root root 342 usr/lib/dracut/hooks/cmdline/95-parse-block.sh
--rwxr-xr-x 1 root root 204 usr/lib/dracut/hooks/cmdline/95-parse-virtiofs.sh
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/emergency
-drwxr-xr-x 6 root root 0 usr/lib/dracut/hooks/initqueue
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/initqueue/finished
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/initqueue/online
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/initqueue/settled
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/initqueue/timeout
--rwxr-xr-x 1 root root 459 usr/lib/dracut/hooks/initqueue/timeout/99-rootfallback.sh
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/mount
--rwxr-xr-x 1 root root 4449 usr/lib/dracut/hooks/mount/99-mount-root.sh
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/netroot
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/pre-mount
--rwxr-xr-x 1 root root 642 usr/lib/dracut/hooks/pre-mount/99-mount-virtiofs.sh
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/pre-pivot
--rwxr-xr-x 1 root root 3533 usr/lib/dracut/hooks/pre-pivot/50-mount-usr.sh
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/pre-shutdown
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/pre-trigger
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/pre-udev
--rwxr-xr-x 1 root root 567 usr/lib/dracut/hooks/pre-udev/30-block-genrules.sh
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/shutdown
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/shutdown-emergency
--rw-r--r-- 1 root root 144 usr/lib/dracut/modules.txt
+-rw-r--r-- 1 root root 11 usr/lib/dracut/dracut-105
+lrwxrwxrwx 1 root root 29 usr/lib/dracut/hooks -> ../../../var/lib/dracut/hooks
+-rw-r--r-- 1 root root 172 usr/lib/dracut/modules.txt
-rw-r--r-- 1 root root 0 usr/lib/dracut/need-initqueue
--rwxr-xr-x 1 root root 434 usr/lib/dracut/resume.sh
+-rwxr-xr-x 1 root root 438 usr/lib/dracut/resume.sh
drwxr-xr-x 2 root root 0 usr/lib/elogind
-rwxr-xr-x 1 root root 1250792 usr/lib/elogind/libelogind-shared-252.9.so
drwxr-xr-x 21 root root 0 usr/lib/firmware
@@ -1107,7 +1080,7 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 63 usr/lib/firmware/rp2.fw
drwxr-xr-x 2 root root 0 usr/lib/firmware/xe
-rw-r--r-- 1 root root 316160 usr/lib/firmware/xe/lnl_guc_70.bin
--rwxr-xr-x 1 root root 6552 usr/lib/fs-lib.sh
+-rwxr-xr-x 1 root root 6392 usr/lib/fs-lib.sh
-rw-r--r-- 1 root root 260 usr/lib/initrd-release
-rwxr-xr-x 1 root root 231656 usr/lib/ld-linux-aarch64.so.1
lrwxrwxrwx 1 root root 18 usr/lib/libacl.so.1 -> libacl.so.1.1.2302
@@ -1137,6 +1110,10 @@ lrwxrwxrwx 1 root root 1
-rwxr-xr-x 1 root root 133048 usr/lib/libf2fs.so.10.0.0
-rw-r--r-- 1 root root 132 usr/lib/libgcc_s.so
-rw-r--r-- 1 root root 133544 usr/lib/libgcc_s.so.1
+lrwxrwxrwx 1 root root 19 usr/lib/libgcrypt.so.20 -> libgcrypt.so.20.4.3
+-rwxr-xr-x 1 root root 1000528 usr/lib/libgcrypt.so.20.4.3
+lrwxrwxrwx 1 root root 22 usr/lib/libgpg-error.so.0 -> libgpg-error.so.0.36.0
+-rwxr-xr-x 1 root root 198720 usr/lib/libgpg-error.so.0.36.0
lrwxrwxrwx 1 root root 16 usr/lib/libkmod.so.2 -> libkmod.so.2.4.1
-rwxr-xr-x 1 root root 133112 usr/lib/libkmod.so.2.4.1
lrwxrwxrwx 1 root root 16 usr/lib/liblzma.so -> liblzma.so.5.6.2
@@ -1150,6 +1127,8 @@ lrwxrwxrwx 1 root root 1
lrwxrwxrwx 1 root root 17 usr/lib/libmount.so -> libmount.so.1.1.0
lrwxrwxrwx 1 root root 17 usr/lib/libmount.so.1 -> libmount.so.1.1.0
-rwxr-xr-x 1 root root 527008 usr/lib/libmount.so.1.1.0
+lrwxrwxrwx 1 root root 15 usr/lib/libmtp.so.9 -> libmtp.so.9.4.0
+-rwxr-xr-x 1 root root 583056 usr/lib/libmtp.so.9.4.0
lrwxrwxrwx 1 root root 18 usr/lib/libncursesw.so.6 -> libncursesw.so.6.5
-rwxr-xr-x 1 root root 527464 usr/lib/libncursesw.so.6.5
-rwxr-xr-x 1 root root 69456 usr/lib/libnss_files.so.2
@@ -1165,6 +1144,9 @@ lrwxrwxrwx 1 root root 1
-rwxr-xr-x 1 root root 198872 usr/lib/libudev.so.1.6.3
lrwxrwxrwx 1 root root 16 usr/lib/liburcu.so.8 -> liburcu.so.8.1.0
-rwxr-xr-x 1 root root 67800 usr/lib/liburcu.so.8.1.0
+lrwxrwxrwx 1 root root 19 usr/lib/libusb-1.0.so -> libusb-1.0.so.0.4.0
+lrwxrwxrwx 1 root root 19 usr/lib/libusb-1.0.so.0 -> libusb-1.0.so.0.4.0
+-rwxr-xr-x 1 root root 133136 usr/lib/libusb-1.0.so.0.4.0
lrwxrwxrwx 1 root root 16 usr/lib/libuuid.so -> libuuid.so.1.3.0
lrwxrwxrwx 1 root root 16 usr/lib/libuuid.so.1 -> libuuid.so.1.3.0
-rwxr-xr-x 1 root root 67640 usr/lib/libuuid.so.1.3.0
@@ -1289,7 +1271,7 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 3092 usr/lib/modules/6.11.3_1/kernel/crypto/xctr.ko.zst
-rw-r--r-- 1 root root 5258 usr/lib/modules/6.11.3_1/kernel/crypto/xor.ko.zst
-rw-r--r-- 1 root root 2687 usr/lib/modules/6.11.3_1/kernel/crypto/xxhash_generic.ko.zst
-drwxr-xr-x 73 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers
+drwxr-xr-x 75 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers
drwxr-xr-x 3 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/acpi
-rw-r--r-- 1 root root 12702 usr/lib/modules/6.11.3_1/kernel/drivers/acpi/battery.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/acpi/nfit
@@ -1372,20 +1354,29 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 3863 usr/lib/modules/6.11.3_1/kernel/drivers/base/regmap/regmap-w1.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/bcma
-rw-r--r-- 1 root root 37778 usr/lib/modules/6.11.3_1/kernel/drivers/bcma/bcma.ko.zst
-drwxr-xr-x 6 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/block
+drwxr-xr-x 8 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/block
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/block/aoe
-rw-r--r-- 1 root root 35144 usr/lib/modules/6.11.3_1/kernel/drivers/block/aoe/aoe.ko.zst
+-rw-r--r-- 1 root root 6776 usr/lib/modules/6.11.3_1/kernel/drivers/block/brd.ko.zst
+drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/block/drbd
+-rw-r--r-- 1 root root 224150 usr/lib/modules/6.11.3_1/kernel/drivers/block/drbd/drbd.ko.zst
-rw-r--r-- 1 root root 21460 usr/lib/modules/6.11.3_1/kernel/drivers/block/loop.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/block/mtip32xx
-rw-r--r-- 1 root root 32976 usr/lib/modules/6.11.3_1/kernel/drivers/block/mtip32xx/mtip32xx.ko.zst
-rw-r--r-- 1 root root 31226 usr/lib/modules/6.11.3_1/kernel/drivers/block/nbd.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/block/null_blk
-rw-r--r-- 1 root root 32272 usr/lib/modules/6.11.3_1/kernel/drivers/block/null_blk/null_blk.ko.zst
+-rw-r--r-- 1 root root 29539 usr/lib/modules/6.11.3_1/kernel/drivers/block/pktcdvd.ko.zst
-rw-r--r-- 1 root root 78975 usr/lib/modules/6.11.3_1/kernel/drivers/block/rbd.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/block/rnbd
-rw-r--r-- 1 root root 25856 usr/lib/modules/6.11.3_1/kernel/drivers/block/rnbd/rnbd-client.ko.zst
-rw-r--r-- 1 root root 16589 usr/lib/modules/6.11.3_1/kernel/drivers/block/virtio_blk.ko.zst
-drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/bus
+drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/block/zram
+-rw-r--r-- 1 root root 22129 usr/lib/modules/6.11.3_1/kernel/drivers/block/zram/zram.ko.zst
+drwxr-xr-x 3 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/bus
+drwxr-xr-x 3 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/bus/mhi
+drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/bus/mhi/host
+-rw-r--r-- 1 root root 57598 usr/lib/modules/6.11.3_1/kernel/drivers/bus/mhi/host/mhi.ko.zst
-rw-r--r-- 1 root root 12101 usr/lib/modules/6.11.3_1/kernel/drivers/bus/moxtet.ko.zst
-rw-r--r-- 1 root root 10060 usr/lib/modules/6.11.3_1/kernel/drivers/bus/sunxi-rsb.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/cdrom
@@ -2584,8 +2575,18 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 6700 usr/lib/modules/6.11.3_1/kernel/drivers/input/serio/serio_raw.ko.zst
-rw-r--r-- 1 root root 4824 usr/lib/modules/6.11.3_1/kernel/drivers/input/serio/serport.ko.zst
-rw-r--r-- 1 root root 5022 usr/lib/modules/6.11.3_1/kernel/drivers/input/serio/userio.ko.zst
-drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/interconnect
+drwxr-xr-x 5 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/interconnect
-rw-r--r-- 1 root root 3889 usr/lib/modules/6.11.3_1/kernel/drivers/interconnect/icc-clk.ko.zst
+drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/interconnect/imx
+-rw-r--r-- 1 root root 5996 usr/lib/modules/6.11.3_1/kernel/drivers/interconnect/imx/imx-interconnect.ko.zst
+-rw-r--r-- 1 root root 3071 usr/lib/modules/6.11.3_1/kernel/drivers/interconnect/imx/imx8mm-interconnect.ko.zst
+-rw-r--r-- 1 root root 2993 usr/lib/modules/6.11.3_1/kernel/drivers/interconnect/imx/imx8mn-interconnect.ko.zst
+-rw-r--r-- 1 root root 3254 usr/lib/modules/6.11.3_1/kernel/drivers/interconnect/imx/imx8mp-interconnect.ko.zst
+-rw-r--r-- 1 root root 3092 usr/lib/modules/6.11.3_1/kernel/drivers/interconnect/imx/imx8mq-interconnect.ko.zst
+drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/interconnect/qcom
+-rw-r--r-- 1 root root 4884 usr/lib/modules/6.11.3_1/kernel/drivers/interconnect/qcom/icc-osm-l3.ko.zst
+drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/interconnect/samsung
+-rw-r--r-- 1 root root 4036 usr/lib/modules/6.11.3_1/kernel/drivers/interconnect/samsung/exynos-interconnect.ko.zst
drwxr-xr-x 3 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/leds
-rw-r--r-- 1 root root 4333 usr/lib/modules/6.11.3_1/kernel/drivers/leds/led-class-multicolor.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/leds/rgb
@@ -2605,9 +2606,12 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 4307 usr/lib/modules/6.11.3_1/kernel/drivers/mailbox/qcom-apcs-ipc-mailbox.ko.zst
-rw-r--r-- 1 root root 5911 usr/lib/modules/6.11.3_1/kernel/drivers/mailbox/sprd-mailbox.ko.zst
-rw-r--r-- 1 root root 5839 usr/lib/modules/6.11.3_1/kernel/drivers/mailbox/sun6i-msgbox.ko.zst
-drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/md
+drwxr-xr-x 3 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/md
+drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/md/bcache
+-rw-r--r-- 1 root root 156839 usr/lib/modules/6.11.3_1/kernel/drivers/md/bcache/bcache.ko.zst
-rw-r--r-- 1 root root 97547 usr/lib/modules/6.11.3_1/kernel/drivers/md/dm-mod.ko.zst
-rw-r--r-- 1 root root 23835 usr/lib/modules/6.11.3_1/kernel/drivers/md/dm-multipath.ko.zst
+-rw-r--r-- 1 root root 107938 usr/lib/modules/6.11.3_1/kernel/drivers/md/md-mod.ko.zst
drwxr-xr-x 7 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/media
drwxr-xr-x 3 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/media/cec
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/media/cec/core
@@ -2810,6 +2814,8 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 18947 usr/lib/modules/6.11.3_1/kernel/drivers/net/wireless/marvell/libertas/libertas_sdio.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/nvdimm
-rw-r--r-- 1 root root 103308 usr/lib/modules/6.11.3_1/kernel/drivers/nvdimm/libnvdimm.ko.zst
+-rw-r--r-- 1 root root 17518 usr/lib/modules/6.11.3_1/kernel/drivers/nvdimm/nd_btt.ko.zst
+-rw-r--r-- 1 root root 12110 usr/lib/modules/6.11.3_1/kernel/drivers/nvdimm/nd_pmem.ko.zst
-rw-r--r-- 1 root root 5326 usr/lib/modules/6.11.3_1/kernel/drivers/nvdimm/nd_virtio.ko.zst
-rw-r--r-- 1 root root 4522 usr/lib/modules/6.11.3_1/kernel/drivers/nvdimm/of_pmem.ko.zst
-rw-r--r-- 1 root root 6023 usr/lib/modules/6.11.3_1/kernel/drivers/nvdimm/virtio_pmem.ko.zst
@@ -2864,11 +2870,9 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 10981 usr/lib/modules/6.11.3_1/kernel/drivers/pci/controller/pcie-mediatek-gen3.ko.zst
-rw-r--r-- 1 root root 11144 usr/lib/modules/6.11.3_1/kernel/drivers/pci/controller/pcie-rockchip-host.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/pcmcia
--rw-r--r-- 1 root root 9225 usr/lib/modules/6.11.3_1/kernel/drivers/pcmcia/i82092.ko.zst
-rw-r--r-- 1 root root 40090 usr/lib/modules/6.11.3_1/kernel/drivers/pcmcia/pcmcia.ko.zst
-rw-r--r-- 1 root root 15283 usr/lib/modules/6.11.3_1/kernel/drivers/pcmcia/pcmcia_core.ko.zst
-rw-r--r-- 1 root root 11030 usr/lib/modules/6.11.3_1/kernel/drivers/pcmcia/pcmcia_rsrc.ko.zst
--rw-r--r-- 1 root root 10591 usr/lib/modules/6.11.3_1/kernel/drivers/pcmcia/pd6729.ko.zst
-rw-r--r-- 1 root root 28777 usr/lib/modules/6.11.3_1/kernel/drivers/pcmcia/yenta_socket.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/peci
-rw-r--r-- 1 root root 4862 usr/lib/modules/6.11.3_1/kernel/drivers/peci/peci-cpu.ko.zst
@@ -3047,12 +3051,31 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 9151 usr/lib/modules/6.11.3_1/kernel/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.ko.zst
drwxr-xr-x 5 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/platform
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome
+-rw-r--r-- 1 root root 6322 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/chromeos_acpi.ko.zst
+-rw-r--r-- 1 root root 3505 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/chromeos_privacy_screen.ko.zst
+-rw-r--r-- 1 root root 3356 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/chromeos_tbmc.ko.zst
+-rw-r--r-- 1 root root 17672 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros-ec-sensorhub.ko.zst
+-rw-r--r-- 1 root root 19401 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros-ec-typec.ko.zst
+-rw-r--r-- 1 root root 6797 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_ec.ko.zst
+-rw-r--r-- 1 root root 7054 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_ec_chardev.ko.zst
+-rw-r--r-- 1 root root 5205 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_ec_i2c.ko.zst
+-rw-r--r-- 1 root root 8534 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_ec_lightbar.ko.zst
+-rw-r--r-- 1 root root 5566 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_ec_rpmsg.ko.zst
+-rw-r--r-- 1 root root 8197 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_ec_spi.ko.zst
+-rw-r--r-- 1 root root 5485 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_ec_sysfs.ko.zst
+-rw-r--r-- 1 root root 5861 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_ec_uart.ko.zst
+-rw-r--r-- 1 root root 3454 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_ec_vbc.ko.zst
+-rw-r--r-- 1 root root 3631 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_hps_i2c.ko.zst
+-rw-r--r-- 1 root root 4265 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_kbd_led_backlight.ko.zst
+-rw-r--r-- 1 root root 6597 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_typec_switch.ko.zst
+-rw-r--r-- 1 root root 5774 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_usbpd_logger.ko.zst
-rw-r--r-- 1 root root 4529 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_usbpd_notify.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/platform/mellanox
-rw-r--r-- 1 root root 11618 usr/lib/modules/6.11.3_1/kernel/drivers/platform/mellanox/mlxbf-tmfifo.ko.zst
drwxr-xr-x 3 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/platform/surface
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/platform/surface/aggregator
-rw-r--r-- 1 root root 63567 usr/lib/modules/6.11.3_1/kernel/drivers/platform/surface/aggregator/surface_aggregator.ko.zst
+-rw-r--r-- 1 root root 4636 usr/lib/modules/6.11.3_1/kernel/drivers/platform/surface/surface_aggregator_registry.ko.zst
drwxr-xr-x 5 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/power
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/power/reset
-rw-r--r-- 1 root root 4030 usr/lib/modules/6.11.3_1/kernel/drivers/power/reset/atc260x-poweroff.ko.zst
@@ -3235,6 +3258,12 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 3188 usr/lib/modules/6.11.3_1/kernel/drivers/regulator/vexpress-regulator.ko.zst
-rw-r--r-- 1 root root 3137 usr/lib/modules/6.11.3_1/kernel/drivers/regulator/vqmmc-ipq4019-regulator.ko.zst
-rw-r--r-- 1 root root 5114 usr/lib/modules/6.11.3_1/kernel/drivers/regulator/wm8994-regulator.ko.zst
+drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/remoteproc
+-rw-r--r-- 1 root root 7230 usr/lib/modules/6.11.3_1/kernel/drivers/remoteproc/qcom_common.ko.zst
+-rw-r--r-- 1 root root 3368 usr/lib/modules/6.11.3_1/kernel/drivers/remoteproc/qcom_pil_info.ko.zst
+-rw-r--r-- 1 root root 5346 usr/lib/modules/6.11.3_1/kernel/drivers/remoteproc/qcom_q6v5.ko.zst
+-rw-r--r-- 1 root root 13554 usr/lib/modules/6.11.3_1/kernel/drivers/remoteproc/qcom_q6v5_pas.ko.zst
+-rw-r--r-- 1 root root 10018 usr/lib/modules/6.11.3_1/kernel/drivers/remoteproc/qcom_sysmon.ko.zst
drwxr-xr-x 3 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/reset
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/reset/hisilicon
-rw-r--r-- 1 root root 3192 usr/lib/modules/6.11.3_1/kernel/drivers/reset/hisilicon/hi6220_reset.ko.zst
@@ -3535,6 +3564,10 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 5076 usr/lib/modules/6.11.3_1/kernel/drivers/spi/spi-xlp.ko.zst
-rw-r--r-- 1 root root 9887 usr/lib/modules/6.11.3_1/kernel/drivers/spi/spi-zynqmp-gqspi.ko.zst
-rw-r--r-- 1 root root 10240 usr/lib/modules/6.11.3_1/kernel/drivers/spi/spidev.ko.zst
+drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/spmi
+-rw-r--r-- 1 root root 5591 usr/lib/modules/6.11.3_1/kernel/drivers/spmi/hisi-spmi-controller.ko.zst
+-rw-r--r-- 1 root root 6494 usr/lib/modules/6.11.3_1/kernel/drivers/spmi/spmi-mtk-pmif.ko.zst
+-rw-r--r-- 1 root root 16857 usr/lib/modules/6.11.3_1/kernel/drivers/spmi/spmi-pmic-arb.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/ssb
-rw-r--r-- 1 root root 48567 usr/lib/modules/6.11.3_1/kernel/drivers/ssb/ssb.ko.zst
drwxr-xr-x 3 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/staging
@@ -3560,11 +3593,21 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 3238 usr/lib/modules/6.11.3_1/kernel/drivers/tty/serial/sc16is7xx_i2c.ko.zst
-rw-r--r-- 1 root root 3375 usr/lib/modules/6.11.3_1/kernel/drivers/tty/serial/sc16is7xx_spi.ko.zst
-rw-r--r-- 1 root root 4379 usr/lib/modules/6.11.3_1/kernel/drivers/tty/serial/tegra-tcu.ko.zst
-drwxr-xr-x 3 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/ufs
+drwxr-xr-x 4 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/ufs
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/ufs/core
-rw-r--r-- 1 root root 132725 usr/lib/modules/6.11.3_1/kernel/drivers/ufs/core/ufshcd-core.ko.zst
+drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/ufs/host
+-rw-r--r-- 1 root root 10785 usr/lib/modules/6.11.3_1/kernel/drivers/ufs/host/cdns-pltfrm.ko.zst
+-rw-r--r-- 1 root root 25234 usr/lib/modules/6.11.3_1/kernel/drivers/ufs/host/ufs-exynos.ko.zst
+-rw-r--r-- 1 root root 14356 usr/lib/modules/6.11.3_1/kernel/drivers/ufs/host/ufs-hisi.ko.zst
+-rw-r--r-- 1 root root 29105 usr/lib/modules/6.11.3_1/kernel/drivers/ufs/host/ufs-mediatek.ko.zst
+-rw-r--r-- 1 root root 23695 usr/lib/modules/6.11.3_1/kernel/drivers/ufs/host/ufs-qcom.ko.zst
+-rw-r--r-- 1 root root 14159 usr/lib/modules/6.11.3_1/kernel/drivers/ufs/host/ufs-sprd.ko.zst
+-rw-r--r-- 1 root root 15932 usr/lib/modules/6.11.3_1/kernel/drivers/ufs/host/ufshcd-pci.ko.zst
+-rw-r--r-- 1 root root 13814 usr/lib/modules/6.11.3_1/kernel/drivers/ufs/host/ufshcd-pltfrm.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/uio
-rw-r--r-- 1 root root 11468 usr/lib/modules/6.11.3_1/kernel/drivers/uio/uio.ko.zst
+-rw-r--r-- 1 root root 5546 usr/lib/modules/6.11.3_1/kernel/drivers/uio/uio_pdrv_genirq.ko.zst
drwxr-xr-x 17 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/usb
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/usb/chipidea
-rw-r--r-- 1 root root 38302 usr/lib/modules/6.11.3_1/kernel/drivers/usb/chipidea/ci_hdrc.ko.zst
@@ -3964,6 +4007,7 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 10510 usr/lib/modules/6.11.3_1/kernel/lib/crypto/libdes.ko.zst
-rw-r--r-- 1 root root 4199 usr/lib/modules/6.11.3_1/kernel/lib/crypto/libpoly1305.ko.zst
-rw-r--r-- 1 root root 2665 usr/lib/modules/6.11.3_1/kernel/lib/libcrc32c.ko.zst
+-rw-r--r-- 1 root root 7196 usr/lib/modules/6.11.3_1/kernel/lib/lru_cache.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/lib/lz4
-rw-r--r-- 1 root root 11996 usr/lib/modules/6.11.3_1/kernel/lib/lz4/lz4_compress.ko.zst
-rw-r--r-- 1 root root 8679 usr/lib/modules/6.11.3_1/kernel/lib/lz4/lz4hc_compress.ko.zst
@@ -3979,6 +4023,9 @@ drwxr-xr-x 2 root root
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/net/dns_resolver
-rw-r--r-- 1 root root 7646 usr/lib/modules/6.11.3_1/kernel/net/dns_resolver/dns_resolver.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/net/qrtr
+-rw-r--r-- 1 root root 6195 usr/lib/modules/6.11.3_1/kernel/net/qrtr/qrtr-mhi.ko.zst
+-rw-r--r-- 1 root root 3765 usr/lib/modules/6.11.3_1/kernel/net/qrtr/qrtr-smd.ko.zst
+-rw-r--r-- 1 root root 4127 usr/lib/modules/6.11.3_1/kernel/net/qrtr/qrtr-tun.ko.zst
-rw-r--r-- 1 root root 22832 usr/lib/modules/6.11.3_1/kernel/net/qrtr/qrtr.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/net/rfkill
-rw-r--r-- 1 root root 17615 usr/lib/modules/6.11.3_1/kernel/net/rfkill/rfkill.ko.zst
@@ -4003,39 +4050,62 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 10290 usr/lib/modules/6.11.3_1/kernel/sound/soc/codecs/snd-soc-hdmi-codec.ko.zst
-rw-r--r-- 1 root root 155888 usr/lib/modules/6.11.3_1/kernel/sound/soc/snd-soc-core.ko.zst
-rw-r--r-- 1 root root 6414 usr/lib/modules/6.11.3_1/kernel/sound/soundcore.ko.zst
--rw-r--r-- 1 root root 727480 usr/lib/modules/6.11.3_1/modules.alias
--rw-r--r-- 1 root root 693062 usr/lib/modules/6.11.3_1/modules.alias.bin
+-rw-r--r-- 1 root root 739723 usr/lib/modules/6.11.3_1/modules.alias
+-rw-r--r-- 1 root root 704997 usr/lib/modules/6.11.3_1/modules.alias.bin
-rw-r--r-- 1 root root 21560 usr/lib/modules/6.11.3_1/modules.builtin
-rw-r--r-- 1 root root 9727 usr/lib/modules/6.11.3_1/modules.builtin.alias.bin
-rw-r--r-- 1 root root 23684 usr/lib/modules/6.11.3_1/modules.builtin.bin
-rw-r--r-- 1 root root 127369 usr/lib/modules/6.11.3_1/modules.builtin.modinfo
--rw-r--r-- 1 root root 192081 usr/lib/modules/6.11.3_1/modules.dep
--rw-r--r-- 1 root root 292674 usr/lib/modules/6.11.3_1/modules.dep.bin
+-rw-r--r-- 1 root root 197296 usr/lib/modules/6.11.3_1/modules.dep
+-rw-r--r-- 1 root root 299447 usr/lib/modules/6.11.3_1/modules.dep.bin
-rw-r--r-- 1 root root 262 usr/lib/modules/6.11.3_1/modules.devname
-rw-r--r-- 1 root root 261776 usr/lib/modules/6.11.3_1/modules.order
-rw-r--r-- 1 root root 1149 usr/lib/modules/6.11.3_1/modules.softdep
--rw-r--r-- 1 root root 304815 usr/lib/modules/6.11.3_1/modules.symbols
--rw-r--r-- 1 root root 362618 usr/lib/modules/6.11.3_1/modules.symbols.bin
+-rw-r--r-- 1 root root 316345 usr/lib/modules/6.11.3_1/modules.symbols
+-rw-r--r-- 1 root root 374863 usr/lib/modules/6.11.3_1/modules.symbols.bin
lrwxrwxrwx 1 root root 14 usr/lib/os-release -> initrd-release
drwxr-xr-x 3 root root 0 usr/lib/udev
-rwxr-xr-x 1 root root 133336 usr/lib/udev/ata_id
-rwxr-xr-x 1 root root 133344 usr/lib/udev/cdrom_id
--rwxr-xr-x 1 root root 1546 usr/lib/udev/console_init
--rwxr-xr-x 1 root root 573 usr/lib/udev/fc_transport_scan_lun.sh
+-rwxr-xr-x 1 root root 1551 usr/lib/udev/console_init
+-rwxr-xr-x 1 root root 133344 usr/lib/udev/dmi_memory_id
+-rwxr-xr-x 1 root root 571 usr/lib/udev/fc_transport_scan_lun.sh
+-rwxr-xr-x 1 root root 133336 usr/lib/udev/fido_id
+-rwxr-xr-x 1 root root 133344 usr/lib/udev/mtd_probe
+-rwxr-xr-x 1 root root 67568 usr/lib/udev/mtp-probe
drwxr-xr-x 2 root root 0 usr/lib/udev/rules.d
-rw-r--r-- 1 root root 4980 usr/lib/udev/rules.d/50-udev-default.rules
+-rw-r--r-- 1 root root 532 usr/lib/udev/rules.d/60-autosuspend.rules
-rw-r--r-- 1 root root 703 usr/lib/udev/rules.d/60-block.rules
-rw-r--r-- 1 root root 1071 usr/lib/udev/rules.d/60-cdrom_id.rules
+-rw-r--r-- 1 root root 413 usr/lib/udev/rules.d/60-drm.rules
+-rw-r--r-- 1 root root 982 usr/lib/udev/rules.d/60-evdev.rules
+-rw-r--r-- 1 root root 491 usr/lib/udev/rules.d/60-fido-id.rules
+-rw-r--r-- 1 root root 282 usr/lib/udev/rules.d/60-input-id.rules
+-rw-r--r-- 1 root root 616 usr/lib/udev/rules.d/60-persistent-alsa.rules
+-rw-r--r-- 1 root root 2719 usr/lib/udev/rules.d/60-persistent-input.rules
+-rw-r--r-- 1 root root 2204 usr/lib/udev/rules.d/60-persistent-storage-tape.rules
-rw-r--r-- 1 root root 8346 usr/lib/udev/rules.d/60-persistent-storage.rules
+-rw-r--r-- 1 root root 769 usr/lib/udev/rules.d/60-persistent-v4l.rules
+-rw-r--r-- 1 root root 1618 usr/lib/udev/rules.d/60-sensor.rules
+-rw-r--r-- 1 root root 1190 usr/lib/udev/rules.d/60-serial.rules
-rw-r--r-- 1 root root 616 usr/lib/udev/rules.d/64-btrfs.rules
+-rw-r--r-- 1 root root 432 usr/lib/udev/rules.d/70-joystick.rules
+-rw-r--r-- 1 root root 184 usr/lib/udev/rules.d/70-memory.rules
+-rw-r--r-- 1 root root 734 usr/lib/udev/rules.d/70-mouse.rules
+-rw-r--r-- 1 root root 473 usr/lib/udev/rules.d/70-touchpad.rules
-rw-r--r-- 1 root root 3311 usr/lib/udev/rules.d/70-uaccess.rules
-rw-r--r-- 1 root root 3818 usr/lib/udev/rules.d/71-seat.rules
-rw-r--r-- 1 root root 697 usr/lib/udev/rules.d/73-seat-late.rules
-rw-r--r-- 1 root root 452 usr/lib/udev/rules.d/75-net-description.rules
+-rw-r--r-- 1 root root 174 usr/lib/udev/rules.d/75-probe_mtd.rules
+-rw-r--r-- 1 root root 4816 usr/lib/udev/rules.d/78-sound-card.rules
-rw-r--r-- 1 root root 617 usr/lib/udev/rules.d/80-drivers.rules
-rw-r--r-- 1 root root 491 usr/lib/udev/rules.d/80-net-name-slot.rules
+-rw-r--r-- 1 root root 528 usr/lib/udev/rules.d/81-net-dhcp.rules
-rwxr-xr-x 1 root root 577 usr/lib/udev/sas_transport_scan_lun.sh
-rwxr-xr-x 1 root root 133856 usr/lib/udev/scsi_id
+-rwxr-xr-x 1 root root 133336 usr/lib/udev/v4l_id
lrwxrwxrwx 1 root root 3 usr/lib64 -> lib
drwxr-xr-x 3 root root 0 usr/libexec
drwxr-xr-x 2 root root 0 usr/libexec/elogind
@@ -4711,7 +4781,39 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 1276 usr/share/terminfo/v/vt102
-rw-r--r-- 1 root root 1391 usr/share/terminfo/v/vt220
lrwxrwxrwx 1 root root 22 usr/share/unimaps -> /usr/share/kbd/unimaps
-drwxr-xr-x 3 root root 0 var
+drwxr-xr-x 4 root root 0 var
+drwxr-xr-x 3 root root 0 var/lib
+drwxr-xr-x 3 root root 0 var/lib/dracut
+drwxr-xr-x 15 root root 0 var/lib/dracut/hooks
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/cleanup
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/cmdline
+-rwxr-xr-x 1 root root 675 var/lib/dracut/hooks/cmdline/01-parse-kernel.sh
+-rwxr-xr-x 1 root root 3412 var/lib/dracut/hooks/cmdline/10-parse-resume.sh
+-rwxr-xr-x 1 root root 273 var/lib/dracut/hooks/cmdline/10-parse-root-opts.sh
+-rwxr-xr-x 1 root root 1088 var/lib/dracut/hooks/cmdline/20-parse-i18n.sh
+-rwxr-xr-x 1 root root 1290 var/lib/dracut/hooks/cmdline/30-parse-lunmask.sh
+-rwxr-xr-x 1 root root 342 var/lib/dracut/hooks/cmdline/95-parse-block.sh
+-rwxr-xr-x 1 root root 208 var/lib/dracut/hooks/cmdline/95-parse-virtiofs.sh
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/emergency
+drwxr-xr-x 6 root root 0 var/lib/dracut/hooks/initqueue
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/initqueue/finished
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/initqueue/online
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/initqueue/settled
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/initqueue/timeout
+-rwxr-xr-x 1 root root 459 var/lib/dracut/hooks/initqueue/timeout/99-rootfallback.sh
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/mount
+-rwxr-xr-x 1 root root 4085 var/lib/dracut/hooks/mount/99-mount-root.sh
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/netroot
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/pre-mount
+-rwxr-xr-x 1 root root 631 var/lib/dracut/hooks/pre-mount/99-mount-virtiofs.sh
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/pre-pivot
+-rwxr-xr-x 1 root root 3539 var/lib/dracut/hooks/pre-pivot/50-mount-usr.sh
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/pre-shutdown
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/pre-trigger
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/pre-udev
+-rwxr-xr-x 1 root root 507 var/lib/dracut/hooks/pre-udev/30-block-genrules.sh
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/shutdown
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/shutdown-emergency
lrwxrwxrwx 1 root root 11 var/lock -> ../run/lock
lrwxrwxrwx 1 root root 6 var/run -> ../run
drwxr-xr-x 2 root root 0 var/tmp
```
</p>
</details>
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 104, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (36 preceding siblings ...)
2024-10-15 18:02 ` classabbyamp
@ 2024-10-15 18:05 ` classabbyamp
2024-10-15 18:06 ` classabbyamp
` (10 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: classabbyamp @ 2024-10-15 18:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 41836 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2414677959
Comment:
@jozzsi has anything significant changed in how `force_drivers` works since 059? I rely on that on an arm64 laptop to load [some essential modules](https://github.com/void-linux/void-packages/blob/master/srcpkgs/x13s-base/files/dracut.conf). on 059, everything works fine, but on 104 and 105, there are a lot of deferred hardware probes and it looks like a lot of things only kick off once reaching void's userspace.
<details><summary><code>lsinitrd</code> diff between 059 and 105</summary>
<p>
```diff
--- initrd059.txt 2024-10-15 13:48:47.989996304 -0400
+++ initrd105.txt 2024-10-15 13:48:45.694148800 -0400
@@ -1,16 +1,19 @@
-Image: /boot/initramfs-6.11.3_1.img: 85M
+Image: /boot/initramfs-6.11.3_1.img.bak: 74M
========================================================================
-Version: dracut-059
+Version: dracut-105
Arguments: -q --force
dracut modules:
+dash
+shell-interpreter
i18n
drm
kernel-modules
kernel-modules-extra
nvdimm
qemu
+hwdb
lunmask
resume
rootfs-block
@@ -36,7 +39,7 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 0 etc/fstab.empty
-rw-r--r-- 1 root root 162 etc/group
lrwxrwxrwx 1 root root 25 etc/initrd-release -> ../usr/lib/initrd-release
--rw-r--r-- 1 root root 1963 etc/ld.so.cache
+-rw-r--r-- 1 root root 2203 etc/ld.so.cache
-rw-r--r-- 1 root root 33 etc/ld.so.conf
drwxr-xr-x 2 root root 0 etc/ld.so.conf.d
-rw-r--r-- 1 root root 11 etc/ld.so.conf.d/lib32.conf
@@ -49,22 +52,20 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 168 etc/udev/rules.d/10-console.rules
-rw-r--r-- 1 root root 297 etc/udev/rules.d/59-persistent-storage.rules
-rw-r--r-- 1 root root 1030 etc/udev/rules.d/61-persistent-storage.rules
--rw-r--r-- 1 root root 215 etc/udev/udev.conf
--rwxr-xr-x 1 root root 11939 init
+-rwxr-xr-x 1 root root 11983 init
lrwxrwxrwx 1 root root 7 lib -> usr/lib
lrwxrwxrwx 1 root root 7 lib64 -> usr/lib
drwxr-xr-x 2 root root 0 proc
drwxr-xr-x 2 root root 0 root
drwxr-xr-x 2 root root 0 run
lrwxrwxrwx 1 root root 7 sbin -> usr/bin
--rwxr-xr-x 1 root root 4778 shutdown
+-rwxr-xr-x 1 root root 4780 shutdown
drwxr-xr-x 2 root root 0 sys
drwxr-xr-x 2 root root 0 sysroot
lrwxrwxrwx 1 root root 11 systemd-udevd -> /sbin/udevd
drwxr-xr-x 2 root root 0 tmp
drwxr-xr-x 6 root root 0 usr
drwxr-xr-x 2 root root 0 usr/bin
--rwxr-xr-x 1 root root 1478192 usr/bin/bash
-rwxr-xr-x 1 root root 198752 usr/bin/blkid
-rwxr-xr-x 1 root root 1126288 usr/bin/btrfs
lrwxrwxrwx 1 root root 5 usr/bin/btrfsck -> btrfs
@@ -72,10 +73,11 @@ lrwxrwxrwx 1 root root
-rwxr-xr-x 1 root root 67872 usr/bin/chmod
-rwxr-xr-x 1 root root 133400 usr/bin/chown
-rwxr-xr-x 1 root root 133424 usr/bin/cp
+-rwxr-xr-x 1 root root 133720 usr/bin/dash
-rwxr-xr-x 1 root root 135552 usr/bin/dmesg
lrwxrwxrwx 1 root root 11 usr/bin/dracut-getarg -> dracut-util
lrwxrwxrwx 1 root root 11 usr/bin/dracut-getargs -> dracut-util
--rwxr-xr-x 1 root root 67664 usr/bin/dracut-util
+-rwxr-xr-x 1 root root 67568 usr/bin/dracut-util
-rwxr-xr-x 1 root root 348088 usr/bin/e2fsck
-rwxr-xr-x 1 root root 134672 usr/bin/findmnt
-rwxr-xr-x 1 root root 67712 usr/bin/flock
@@ -94,14 +96,14 @@ lrwxrwxrwx 1 root root
-rwxr-xr-x 1 root root 134104 usr/bin/gzip
-rwxr-xr-x 1 root root 67568 usr/bin/halt
-rwxr-xr-x 1 root root 1341 usr/bin/initqueue
--rwxr-xr-x 1 root root 195 usr/bin/insmodpost.sh
+-rwxr-xr-x 1 root root 178 usr/bin/insmodpost.sh
-rwxr-xr-x 1 root root 67936 usr/bin/kbd_mode
-rwxr-xr-x 1 root root 198824 usr/bin/kmod
-rwxr-xr-x 1 root root 282280 usr/bin/less
-rwxr-xr-x 1 root root 133416 usr/bin/ln
-rwxr-xr-x 1 root root 265024 usr/bin/loadkeys
-rwxr-xr-x 1 root root 67736 usr/bin/loginctl
--rwxr-xr-x 1 root root 528 usr/bin/loginit
+-rwxr-xr-x 1 root root 533 usr/bin/loginit
-rwxr-xr-x 1 root root 198856 usr/bin/losetup
-rwxr-xr-x 1 root root 199408 usr/bin/ls
-rwxr-xr-x 1 root root 67864 usr/bin/mkdir
@@ -111,7 +113,7 @@ lrwxrwxrwx 1 root root
-rwsr-xr-x 1 root root 67648 usr/bin/mount
-rwxr-xr-x 1 root root 198960 usr/bin/mv
lrwxrwxrwx 1 root root 4 usr/bin/poweroff -> halt
--rwxr-xr-x 1 root root 1450 usr/bin/rdsosreport
+-rwxr-xr-x 1 root root 1508 usr/bin/rdsosreport
-rwxr-xr-x 1 root root 67872 usr/bin/readlink
lrwxrwxrwx 1 root root 4 usr/bin/reboot -> halt
-rwxr-xr-x 1 root root 133408 usr/bin/rm
@@ -119,7 +121,7 @@ lrwxrwxrwx 1 root root
-rwxr-xr-x 1 root root 199040 usr/bin/sed
-rwxr-xr-x 1 root root 67720 usr/bin/setfont
-rwxr-xr-x 1 root root 67640 usr/bin/setsid
-lrwxrwxrwx 1 root root 4 usr/bin/sh -> bash
+lrwxrwxrwx 1 root root 4 usr/bin/sh -> dash
-rwxr-xr-x 1 root root 67864 usr/bin/sleep
-rwxr-xr-x 1 root root 133416 usr/bin/stat
-rwxr-xr-x 1 root root 133416 usr/bin/stty
@@ -137,44 +139,15 @@ lrwxrwxrwx 1 root root
drwxr-xr-x 9 root root 0 usr/lib
drwxr-xr-x 2 root root 0 usr/lib/depmod.d
-rw-r--r-- 1 root root 70 usr/lib/depmod.d/search.conf
-drwxr-xr-x 3 root root 0 usr/lib/dracut
--rwxr-xr-x 1 root root 4065 usr/lib/dracut-dev-lib.sh
--rwxr-xr-x 1 root root 28747 usr/lib/dracut-lib.sh
+drwxr-xr-x 2 root root 0 usr/lib/dracut
+-rwxr-xr-x 1 root root 4078 usr/lib/dracut-dev-lib.sh
+-rwxr-xr-x 1 root root 29236 usr/lib/dracut-lib.sh
-rw-r--r-- 1 root root 12 usr/lib/dracut/build-parameter.txt
--rw-r--r-- 1 root root 11 usr/lib/dracut/dracut-059
-drwxr-xr-x 15 root root 0 usr/lib/dracut/hooks
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/cleanup
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/cmdline
--rwxr-xr-x 1 root root 917 usr/lib/dracut/hooks/cmdline/01-parse-kernel.sh
--rwxr-xr-x 1 root root 3413 usr/lib/dracut/hooks/cmdline/10-parse-resume.sh
--rwxr-xr-x 1 root root 273 usr/lib/dracut/hooks/cmdline/10-parse-root-opts.sh
--rwxr-xr-x 1 root root 1088 usr/lib/dracut/hooks/cmdline/20-parse-i18n.sh
--rwxr-xr-x 1 root root 1243 usr/lib/dracut/hooks/cmdline/30-parse-lunmask.sh
--rwxr-xr-x 1 root root 342 usr/lib/dracut/hooks/cmdline/95-parse-block.sh
--rwxr-xr-x 1 root root 204 usr/lib/dracut/hooks/cmdline/95-parse-virtiofs.sh
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/emergency
-drwxr-xr-x 6 root root 0 usr/lib/dracut/hooks/initqueue
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/initqueue/finished
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/initqueue/online
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/initqueue/settled
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/initqueue/timeout
--rwxr-xr-x 1 root root 459 usr/lib/dracut/hooks/initqueue/timeout/99-rootfallback.sh
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/mount
--rwxr-xr-x 1 root root 4449 usr/lib/dracut/hooks/mount/99-mount-root.sh
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/netroot
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/pre-mount
--rwxr-xr-x 1 root root 642 usr/lib/dracut/hooks/pre-mount/99-mount-virtiofs.sh
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/pre-pivot
--rwxr-xr-x 1 root root 3533 usr/lib/dracut/hooks/pre-pivot/50-mount-usr.sh
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/pre-shutdown
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/pre-trigger
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/pre-udev
--rwxr-xr-x 1 root root 567 usr/lib/dracut/hooks/pre-udev/30-block-genrules.sh
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/shutdown
-drwxr-xr-x 2 root root 0 usr/lib/dracut/hooks/shutdown-emergency
--rw-r--r-- 1 root root 144 usr/lib/dracut/modules.txt
+-rw-r--r-- 1 root root 11 usr/lib/dracut/dracut-105
+lrwxrwxrwx 1 root root 29 usr/lib/dracut/hooks -> ../../../var/lib/dracut/hooks
+-rw-r--r-- 1 root root 172 usr/lib/dracut/modules.txt
-rw-r--r-- 1 root root 0 usr/lib/dracut/need-initqueue
--rwxr-xr-x 1 root root 434 usr/lib/dracut/resume.sh
+-rwxr-xr-x 1 root root 438 usr/lib/dracut/resume.sh
drwxr-xr-x 2 root root 0 usr/lib/elogind
-rwxr-xr-x 1 root root 1250792 usr/lib/elogind/libelogind-shared-252.9.so
drwxr-xr-x 21 root root 0 usr/lib/firmware
@@ -1107,7 +1080,7 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 63 usr/lib/firmware/rp2.fw
drwxr-xr-x 2 root root 0 usr/lib/firmware/xe
-rw-r--r-- 1 root root 316160 usr/lib/firmware/xe/lnl_guc_70.bin
--rwxr-xr-x 1 root root 6552 usr/lib/fs-lib.sh
+-rwxr-xr-x 1 root root 6392 usr/lib/fs-lib.sh
-rw-r--r-- 1 root root 260 usr/lib/initrd-release
-rwxr-xr-x 1 root root 231656 usr/lib/ld-linux-aarch64.so.1
lrwxrwxrwx 1 root root 18 usr/lib/libacl.so.1 -> libacl.so.1.1.2302
@@ -1137,6 +1110,10 @@ lrwxrwxrwx 1 root root 1
-rwxr-xr-x 1 root root 133048 usr/lib/libf2fs.so.10.0.0
-rw-r--r-- 1 root root 132 usr/lib/libgcc_s.so
-rw-r--r-- 1 root root 133544 usr/lib/libgcc_s.so.1
+lrwxrwxrwx 1 root root 19 usr/lib/libgcrypt.so.20 -> libgcrypt.so.20.4.3
+-rwxr-xr-x 1 root root 1000528 usr/lib/libgcrypt.so.20.4.3
+lrwxrwxrwx 1 root root 22 usr/lib/libgpg-error.so.0 -> libgpg-error.so.0.36.0
+-rwxr-xr-x 1 root root 198720 usr/lib/libgpg-error.so.0.36.0
lrwxrwxrwx 1 root root 16 usr/lib/libkmod.so.2 -> libkmod.so.2.4.1
-rwxr-xr-x 1 root root 133112 usr/lib/libkmod.so.2.4.1
lrwxrwxrwx 1 root root 16 usr/lib/liblzma.so -> liblzma.so.5.6.2
@@ -1150,6 +1127,8 @@ lrwxrwxrwx 1 root root 1
lrwxrwxrwx 1 root root 17 usr/lib/libmount.so -> libmount.so.1.1.0
lrwxrwxrwx 1 root root 17 usr/lib/libmount.so.1 -> libmount.so.1.1.0
-rwxr-xr-x 1 root root 527008 usr/lib/libmount.so.1.1.0
+lrwxrwxrwx 1 root root 15 usr/lib/libmtp.so.9 -> libmtp.so.9.4.0
+-rwxr-xr-x 1 root root 583056 usr/lib/libmtp.so.9.4.0
lrwxrwxrwx 1 root root 18 usr/lib/libncursesw.so.6 -> libncursesw.so.6.5
-rwxr-xr-x 1 root root 527464 usr/lib/libncursesw.so.6.5
-rwxr-xr-x 1 root root 69456 usr/lib/libnss_files.so.2
@@ -1165,6 +1144,9 @@ lrwxrwxrwx 1 root root 1
-rwxr-xr-x 1 root root 198872 usr/lib/libudev.so.1.6.3
lrwxrwxrwx 1 root root 16 usr/lib/liburcu.so.8 -> liburcu.so.8.1.0
-rwxr-xr-x 1 root root 67800 usr/lib/liburcu.so.8.1.0
+lrwxrwxrwx 1 root root 19 usr/lib/libusb-1.0.so -> libusb-1.0.so.0.4.0
+lrwxrwxrwx 1 root root 19 usr/lib/libusb-1.0.so.0 -> libusb-1.0.so.0.4.0
+-rwxr-xr-x 1 root root 133136 usr/lib/libusb-1.0.so.0.4.0
lrwxrwxrwx 1 root root 16 usr/lib/libuuid.so -> libuuid.so.1.3.0
lrwxrwxrwx 1 root root 16 usr/lib/libuuid.so.1 -> libuuid.so.1.3.0
-rwxr-xr-x 1 root root 67640 usr/lib/libuuid.so.1.3.0
@@ -1289,7 +1271,7 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 3092 usr/lib/modules/6.11.3_1/kernel/crypto/xctr.ko.zst
-rw-r--r-- 1 root root 5258 usr/lib/modules/6.11.3_1/kernel/crypto/xor.ko.zst
-rw-r--r-- 1 root root 2687 usr/lib/modules/6.11.3_1/kernel/crypto/xxhash_generic.ko.zst
-drwxr-xr-x 73 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers
+drwxr-xr-x 75 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers
drwxr-xr-x 3 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/acpi
-rw-r--r-- 1 root root 12702 usr/lib/modules/6.11.3_1/kernel/drivers/acpi/battery.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/acpi/nfit
@@ -1372,20 +1354,29 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 3863 usr/lib/modules/6.11.3_1/kernel/drivers/base/regmap/regmap-w1.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/bcma
-rw-r--r-- 1 root root 37778 usr/lib/modules/6.11.3_1/kernel/drivers/bcma/bcma.ko.zst
-drwxr-xr-x 6 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/block
+drwxr-xr-x 8 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/block
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/block/aoe
-rw-r--r-- 1 root root 35144 usr/lib/modules/6.11.3_1/kernel/drivers/block/aoe/aoe.ko.zst
+-rw-r--r-- 1 root root 6776 usr/lib/modules/6.11.3_1/kernel/drivers/block/brd.ko.zst
+drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/block/drbd
+-rw-r--r-- 1 root root 224150 usr/lib/modules/6.11.3_1/kernel/drivers/block/drbd/drbd.ko.zst
-rw-r--r-- 1 root root 21460 usr/lib/modules/6.11.3_1/kernel/drivers/block/loop.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/block/mtip32xx
-rw-r--r-- 1 root root 32976 usr/lib/modules/6.11.3_1/kernel/drivers/block/mtip32xx/mtip32xx.ko.zst
-rw-r--r-- 1 root root 31226 usr/lib/modules/6.11.3_1/kernel/drivers/block/nbd.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/block/null_blk
-rw-r--r-- 1 root root 32272 usr/lib/modules/6.11.3_1/kernel/drivers/block/null_blk/null_blk.ko.zst
+-rw-r--r-- 1 root root 29539 usr/lib/modules/6.11.3_1/kernel/drivers/block/pktcdvd.ko.zst
-rw-r--r-- 1 root root 78975 usr/lib/modules/6.11.3_1/kernel/drivers/block/rbd.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/block/rnbd
-rw-r--r-- 1 root root 25856 usr/lib/modules/6.11.3_1/kernel/drivers/block/rnbd/rnbd-client.ko.zst
-rw-r--r-- 1 root root 16589 usr/lib/modules/6.11.3_1/kernel/drivers/block/virtio_blk.ko.zst
-drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/bus
+drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/block/zram
+-rw-r--r-- 1 root root 22129 usr/lib/modules/6.11.3_1/kernel/drivers/block/zram/zram.ko.zst
+drwxr-xr-x 3 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/bus
+drwxr-xr-x 3 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/bus/mhi
+drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/bus/mhi/host
+-rw-r--r-- 1 root root 57598 usr/lib/modules/6.11.3_1/kernel/drivers/bus/mhi/host/mhi.ko.zst
-rw-r--r-- 1 root root 12101 usr/lib/modules/6.11.3_1/kernel/drivers/bus/moxtet.ko.zst
-rw-r--r-- 1 root root 10060 usr/lib/modules/6.11.3_1/kernel/drivers/bus/sunxi-rsb.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/cdrom
@@ -2584,8 +2575,18 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 6700 usr/lib/modules/6.11.3_1/kernel/drivers/input/serio/serio_raw.ko.zst
-rw-r--r-- 1 root root 4824 usr/lib/modules/6.11.3_1/kernel/drivers/input/serio/serport.ko.zst
-rw-r--r-- 1 root root 5022 usr/lib/modules/6.11.3_1/kernel/drivers/input/serio/userio.ko.zst
-drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/interconnect
+drwxr-xr-x 5 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/interconnect
-rw-r--r-- 1 root root 3889 usr/lib/modules/6.11.3_1/kernel/drivers/interconnect/icc-clk.ko.zst
+drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/interconnect/imx
+-rw-r--r-- 1 root root 5996 usr/lib/modules/6.11.3_1/kernel/drivers/interconnect/imx/imx-interconnect.ko.zst
+-rw-r--r-- 1 root root 3071 usr/lib/modules/6.11.3_1/kernel/drivers/interconnect/imx/imx8mm-interconnect.ko.zst
+-rw-r--r-- 1 root root 2993 usr/lib/modules/6.11.3_1/kernel/drivers/interconnect/imx/imx8mn-interconnect.ko.zst
+-rw-r--r-- 1 root root 3254 usr/lib/modules/6.11.3_1/kernel/drivers/interconnect/imx/imx8mp-interconnect.ko.zst
+-rw-r--r-- 1 root root 3092 usr/lib/modules/6.11.3_1/kernel/drivers/interconnect/imx/imx8mq-interconnect.ko.zst
+drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/interconnect/qcom
+-rw-r--r-- 1 root root 4884 usr/lib/modules/6.11.3_1/kernel/drivers/interconnect/qcom/icc-osm-l3.ko.zst
+drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/interconnect/samsung
+-rw-r--r-- 1 root root 4036 usr/lib/modules/6.11.3_1/kernel/drivers/interconnect/samsung/exynos-interconnect.ko.zst
drwxr-xr-x 3 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/leds
-rw-r--r-- 1 root root 4333 usr/lib/modules/6.11.3_1/kernel/drivers/leds/led-class-multicolor.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/leds/rgb
@@ -2605,9 +2606,12 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 4307 usr/lib/modules/6.11.3_1/kernel/drivers/mailbox/qcom-apcs-ipc-mailbox.ko.zst
-rw-r--r-- 1 root root 5911 usr/lib/modules/6.11.3_1/kernel/drivers/mailbox/sprd-mailbox.ko.zst
-rw-r--r-- 1 root root 5839 usr/lib/modules/6.11.3_1/kernel/drivers/mailbox/sun6i-msgbox.ko.zst
-drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/md
+drwxr-xr-x 3 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/md
+drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/md/bcache
+-rw-r--r-- 1 root root 156839 usr/lib/modules/6.11.3_1/kernel/drivers/md/bcache/bcache.ko.zst
-rw-r--r-- 1 root root 97547 usr/lib/modules/6.11.3_1/kernel/drivers/md/dm-mod.ko.zst
-rw-r--r-- 1 root root 23835 usr/lib/modules/6.11.3_1/kernel/drivers/md/dm-multipath.ko.zst
+-rw-r--r-- 1 root root 107938 usr/lib/modules/6.11.3_1/kernel/drivers/md/md-mod.ko.zst
drwxr-xr-x 7 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/media
drwxr-xr-x 3 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/media/cec
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/media/cec/core
@@ -2810,6 +2814,8 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 18947 usr/lib/modules/6.11.3_1/kernel/drivers/net/wireless/marvell/libertas/libertas_sdio.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/nvdimm
-rw-r--r-- 1 root root 103308 usr/lib/modules/6.11.3_1/kernel/drivers/nvdimm/libnvdimm.ko.zst
+-rw-r--r-- 1 root root 17518 usr/lib/modules/6.11.3_1/kernel/drivers/nvdimm/nd_btt.ko.zst
+-rw-r--r-- 1 root root 12110 usr/lib/modules/6.11.3_1/kernel/drivers/nvdimm/nd_pmem.ko.zst
-rw-r--r-- 1 root root 5326 usr/lib/modules/6.11.3_1/kernel/drivers/nvdimm/nd_virtio.ko.zst
-rw-r--r-- 1 root root 4522 usr/lib/modules/6.11.3_1/kernel/drivers/nvdimm/of_pmem.ko.zst
-rw-r--r-- 1 root root 6023 usr/lib/modules/6.11.3_1/kernel/drivers/nvdimm/virtio_pmem.ko.zst
@@ -2864,11 +2870,9 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 10981 usr/lib/modules/6.11.3_1/kernel/drivers/pci/controller/pcie-mediatek-gen3.ko.zst
-rw-r--r-- 1 root root 11144 usr/lib/modules/6.11.3_1/kernel/drivers/pci/controller/pcie-rockchip-host.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/pcmcia
--rw-r--r-- 1 root root 9225 usr/lib/modules/6.11.3_1/kernel/drivers/pcmcia/i82092.ko.zst
-rw-r--r-- 1 root root 40090 usr/lib/modules/6.11.3_1/kernel/drivers/pcmcia/pcmcia.ko.zst
-rw-r--r-- 1 root root 15283 usr/lib/modules/6.11.3_1/kernel/drivers/pcmcia/pcmcia_core.ko.zst
-rw-r--r-- 1 root root 11030 usr/lib/modules/6.11.3_1/kernel/drivers/pcmcia/pcmcia_rsrc.ko.zst
--rw-r--r-- 1 root root 10591 usr/lib/modules/6.11.3_1/kernel/drivers/pcmcia/pd6729.ko.zst
-rw-r--r-- 1 root root 28777 usr/lib/modules/6.11.3_1/kernel/drivers/pcmcia/yenta_socket.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/peci
-rw-r--r-- 1 root root 4862 usr/lib/modules/6.11.3_1/kernel/drivers/peci/peci-cpu.ko.zst
@@ -3047,12 +3051,31 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 9151 usr/lib/modules/6.11.3_1/kernel/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.ko.zst
drwxr-xr-x 5 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/platform
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome
+-rw-r--r-- 1 root root 6322 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/chromeos_acpi.ko.zst
+-rw-r--r-- 1 root root 3505 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/chromeos_privacy_screen.ko.zst
+-rw-r--r-- 1 root root 3356 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/chromeos_tbmc.ko.zst
+-rw-r--r-- 1 root root 17672 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros-ec-sensorhub.ko.zst
+-rw-r--r-- 1 root root 19401 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros-ec-typec.ko.zst
+-rw-r--r-- 1 root root 6797 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_ec.ko.zst
+-rw-r--r-- 1 root root 7054 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_ec_chardev.ko.zst
+-rw-r--r-- 1 root root 5205 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_ec_i2c.ko.zst
+-rw-r--r-- 1 root root 8534 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_ec_lightbar.ko.zst
+-rw-r--r-- 1 root root 5566 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_ec_rpmsg.ko.zst
+-rw-r--r-- 1 root root 8197 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_ec_spi.ko.zst
+-rw-r--r-- 1 root root 5485 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_ec_sysfs.ko.zst
+-rw-r--r-- 1 root root 5861 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_ec_uart.ko.zst
+-rw-r--r-- 1 root root 3454 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_ec_vbc.ko.zst
+-rw-r--r-- 1 root root 3631 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_hps_i2c.ko.zst
+-rw-r--r-- 1 root root 4265 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_kbd_led_backlight.ko.zst
+-rw-r--r-- 1 root root 6597 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_typec_switch.ko.zst
+-rw-r--r-- 1 root root 5774 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_usbpd_logger.ko.zst
-rw-r--r-- 1 root root 4529 usr/lib/modules/6.11.3_1/kernel/drivers/platform/chrome/cros_usbpd_notify.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/platform/mellanox
-rw-r--r-- 1 root root 11618 usr/lib/modules/6.11.3_1/kernel/drivers/platform/mellanox/mlxbf-tmfifo.ko.zst
drwxr-xr-x 3 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/platform/surface
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/platform/surface/aggregator
-rw-r--r-- 1 root root 63567 usr/lib/modules/6.11.3_1/kernel/drivers/platform/surface/aggregator/surface_aggregator.ko.zst
+-rw-r--r-- 1 root root 4636 usr/lib/modules/6.11.3_1/kernel/drivers/platform/surface/surface_aggregator_registry.ko.zst
drwxr-xr-x 5 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/power
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/power/reset
-rw-r--r-- 1 root root 4030 usr/lib/modules/6.11.3_1/kernel/drivers/power/reset/atc260x-poweroff.ko.zst
@@ -3235,6 +3258,12 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 3188 usr/lib/modules/6.11.3_1/kernel/drivers/regulator/vexpress-regulator.ko.zst
-rw-r--r-- 1 root root 3137 usr/lib/modules/6.11.3_1/kernel/drivers/regulator/vqmmc-ipq4019-regulator.ko.zst
-rw-r--r-- 1 root root 5114 usr/lib/modules/6.11.3_1/kernel/drivers/regulator/wm8994-regulator.ko.zst
+drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/remoteproc
+-rw-r--r-- 1 root root 7230 usr/lib/modules/6.11.3_1/kernel/drivers/remoteproc/qcom_common.ko.zst
+-rw-r--r-- 1 root root 3368 usr/lib/modules/6.11.3_1/kernel/drivers/remoteproc/qcom_pil_info.ko.zst
+-rw-r--r-- 1 root root 5346 usr/lib/modules/6.11.3_1/kernel/drivers/remoteproc/qcom_q6v5.ko.zst
+-rw-r--r-- 1 root root 13554 usr/lib/modules/6.11.3_1/kernel/drivers/remoteproc/qcom_q6v5_pas.ko.zst
+-rw-r--r-- 1 root root 10018 usr/lib/modules/6.11.3_1/kernel/drivers/remoteproc/qcom_sysmon.ko.zst
drwxr-xr-x 3 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/reset
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/reset/hisilicon
-rw-r--r-- 1 root root 3192 usr/lib/modules/6.11.3_1/kernel/drivers/reset/hisilicon/hi6220_reset.ko.zst
@@ -3535,6 +3564,10 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 5076 usr/lib/modules/6.11.3_1/kernel/drivers/spi/spi-xlp.ko.zst
-rw-r--r-- 1 root root 9887 usr/lib/modules/6.11.3_1/kernel/drivers/spi/spi-zynqmp-gqspi.ko.zst
-rw-r--r-- 1 root root 10240 usr/lib/modules/6.11.3_1/kernel/drivers/spi/spidev.ko.zst
+drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/spmi
+-rw-r--r-- 1 root root 5591 usr/lib/modules/6.11.3_1/kernel/drivers/spmi/hisi-spmi-controller.ko.zst
+-rw-r--r-- 1 root root 6494 usr/lib/modules/6.11.3_1/kernel/drivers/spmi/spmi-mtk-pmif.ko.zst
+-rw-r--r-- 1 root root 16857 usr/lib/modules/6.11.3_1/kernel/drivers/spmi/spmi-pmic-arb.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/ssb
-rw-r--r-- 1 root root 48567 usr/lib/modules/6.11.3_1/kernel/drivers/ssb/ssb.ko.zst
drwxr-xr-x 3 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/staging
@@ -3560,11 +3593,21 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 3238 usr/lib/modules/6.11.3_1/kernel/drivers/tty/serial/sc16is7xx_i2c.ko.zst
-rw-r--r-- 1 root root 3375 usr/lib/modules/6.11.3_1/kernel/drivers/tty/serial/sc16is7xx_spi.ko.zst
-rw-r--r-- 1 root root 4379 usr/lib/modules/6.11.3_1/kernel/drivers/tty/serial/tegra-tcu.ko.zst
-drwxr-xr-x 3 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/ufs
+drwxr-xr-x 4 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/ufs
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/ufs/core
-rw-r--r-- 1 root root 132725 usr/lib/modules/6.11.3_1/kernel/drivers/ufs/core/ufshcd-core.ko.zst
+drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/ufs/host
+-rw-r--r-- 1 root root 10785 usr/lib/modules/6.11.3_1/kernel/drivers/ufs/host/cdns-pltfrm.ko.zst
+-rw-r--r-- 1 root root 25234 usr/lib/modules/6.11.3_1/kernel/drivers/ufs/host/ufs-exynos.ko.zst
+-rw-r--r-- 1 root root 14356 usr/lib/modules/6.11.3_1/kernel/drivers/ufs/host/ufs-hisi.ko.zst
+-rw-r--r-- 1 root root 29105 usr/lib/modules/6.11.3_1/kernel/drivers/ufs/host/ufs-mediatek.ko.zst
+-rw-r--r-- 1 root root 23695 usr/lib/modules/6.11.3_1/kernel/drivers/ufs/host/ufs-qcom.ko.zst
+-rw-r--r-- 1 root root 14159 usr/lib/modules/6.11.3_1/kernel/drivers/ufs/host/ufs-sprd.ko.zst
+-rw-r--r-- 1 root root 15932 usr/lib/modules/6.11.3_1/kernel/drivers/ufs/host/ufshcd-pci.ko.zst
+-rw-r--r-- 1 root root 13814 usr/lib/modules/6.11.3_1/kernel/drivers/ufs/host/ufshcd-pltfrm.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/uio
-rw-r--r-- 1 root root 11468 usr/lib/modules/6.11.3_1/kernel/drivers/uio/uio.ko.zst
+-rw-r--r-- 1 root root 5546 usr/lib/modules/6.11.3_1/kernel/drivers/uio/uio_pdrv_genirq.ko.zst
drwxr-xr-x 17 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/usb
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/drivers/usb/chipidea
-rw-r--r-- 1 root root 38302 usr/lib/modules/6.11.3_1/kernel/drivers/usb/chipidea/ci_hdrc.ko.zst
@@ -3964,6 +4007,7 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 10510 usr/lib/modules/6.11.3_1/kernel/lib/crypto/libdes.ko.zst
-rw-r--r-- 1 root root 4199 usr/lib/modules/6.11.3_1/kernel/lib/crypto/libpoly1305.ko.zst
-rw-r--r-- 1 root root 2665 usr/lib/modules/6.11.3_1/kernel/lib/libcrc32c.ko.zst
+-rw-r--r-- 1 root root 7196 usr/lib/modules/6.11.3_1/kernel/lib/lru_cache.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/lib/lz4
-rw-r--r-- 1 root root 11996 usr/lib/modules/6.11.3_1/kernel/lib/lz4/lz4_compress.ko.zst
-rw-r--r-- 1 root root 8679 usr/lib/modules/6.11.3_1/kernel/lib/lz4/lz4hc_compress.ko.zst
@@ -3979,6 +4023,9 @@ drwxr-xr-x 2 root root
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/net/dns_resolver
-rw-r--r-- 1 root root 7646 usr/lib/modules/6.11.3_1/kernel/net/dns_resolver/dns_resolver.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/net/qrtr
+-rw-r--r-- 1 root root 6195 usr/lib/modules/6.11.3_1/kernel/net/qrtr/qrtr-mhi.ko.zst
+-rw-r--r-- 1 root root 3765 usr/lib/modules/6.11.3_1/kernel/net/qrtr/qrtr-smd.ko.zst
+-rw-r--r-- 1 root root 4127 usr/lib/modules/6.11.3_1/kernel/net/qrtr/qrtr-tun.ko.zst
-rw-r--r-- 1 root root 22832 usr/lib/modules/6.11.3_1/kernel/net/qrtr/qrtr.ko.zst
drwxr-xr-x 2 root root 0 usr/lib/modules/6.11.3_1/kernel/net/rfkill
-rw-r--r-- 1 root root 17615 usr/lib/modules/6.11.3_1/kernel/net/rfkill/rfkill.ko.zst
@@ -4003,39 +4050,62 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 10290 usr/lib/modules/6.11.3_1/kernel/sound/soc/codecs/snd-soc-hdmi-codec.ko.zst
-rw-r--r-- 1 root root 155888 usr/lib/modules/6.11.3_1/kernel/sound/soc/snd-soc-core.ko.zst
-rw-r--r-- 1 root root 6414 usr/lib/modules/6.11.3_1/kernel/sound/soundcore.ko.zst
--rw-r--r-- 1 root root 727480 usr/lib/modules/6.11.3_1/modules.alias
--rw-r--r-- 1 root root 693062 usr/lib/modules/6.11.3_1/modules.alias.bin
+-rw-r--r-- 1 root root 739723 usr/lib/modules/6.11.3_1/modules.alias
+-rw-r--r-- 1 root root 704997 usr/lib/modules/6.11.3_1/modules.alias.bin
-rw-r--r-- 1 root root 21560 usr/lib/modules/6.11.3_1/modules.builtin
-rw-r--r-- 1 root root 9727 usr/lib/modules/6.11.3_1/modules.builtin.alias.bin
-rw-r--r-- 1 root root 23684 usr/lib/modules/6.11.3_1/modules.builtin.bin
-rw-r--r-- 1 root root 127369 usr/lib/modules/6.11.3_1/modules.builtin.modinfo
--rw-r--r-- 1 root root 192081 usr/lib/modules/6.11.3_1/modules.dep
--rw-r--r-- 1 root root 292674 usr/lib/modules/6.11.3_1/modules.dep.bin
+-rw-r--r-- 1 root root 197296 usr/lib/modules/6.11.3_1/modules.dep
+-rw-r--r-- 1 root root 299447 usr/lib/modules/6.11.3_1/modules.dep.bin
-rw-r--r-- 1 root root 262 usr/lib/modules/6.11.3_1/modules.devname
-rw-r--r-- 1 root root 261776 usr/lib/modules/6.11.3_1/modules.order
-rw-r--r-- 1 root root 1149 usr/lib/modules/6.11.3_1/modules.softdep
--rw-r--r-- 1 root root 304815 usr/lib/modules/6.11.3_1/modules.symbols
--rw-r--r-- 1 root root 362618 usr/lib/modules/6.11.3_1/modules.symbols.bin
+-rw-r--r-- 1 root root 316345 usr/lib/modules/6.11.3_1/modules.symbols
+-rw-r--r-- 1 root root 374863 usr/lib/modules/6.11.3_1/modules.symbols.bin
lrwxrwxrwx 1 root root 14 usr/lib/os-release -> initrd-release
drwxr-xr-x 3 root root 0 usr/lib/udev
-rwxr-xr-x 1 root root 133336 usr/lib/udev/ata_id
-rwxr-xr-x 1 root root 133344 usr/lib/udev/cdrom_id
--rwxr-xr-x 1 root root 1546 usr/lib/udev/console_init
--rwxr-xr-x 1 root root 573 usr/lib/udev/fc_transport_scan_lun.sh
+-rwxr-xr-x 1 root root 1551 usr/lib/udev/console_init
+-rwxr-xr-x 1 root root 133344 usr/lib/udev/dmi_memory_id
+-rwxr-xr-x 1 root root 571 usr/lib/udev/fc_transport_scan_lun.sh
+-rwxr-xr-x 1 root root 133336 usr/lib/udev/fido_id
+-rwxr-xr-x 1 root root 133344 usr/lib/udev/mtd_probe
+-rwxr-xr-x 1 root root 67568 usr/lib/udev/mtp-probe
drwxr-xr-x 2 root root 0 usr/lib/udev/rules.d
-rw-r--r-- 1 root root 4980 usr/lib/udev/rules.d/50-udev-default.rules
+-rw-r--r-- 1 root root 532 usr/lib/udev/rules.d/60-autosuspend.rules
-rw-r--r-- 1 root root 703 usr/lib/udev/rules.d/60-block.rules
-rw-r--r-- 1 root root 1071 usr/lib/udev/rules.d/60-cdrom_id.rules
+-rw-r--r-- 1 root root 413 usr/lib/udev/rules.d/60-drm.rules
+-rw-r--r-- 1 root root 982 usr/lib/udev/rules.d/60-evdev.rules
+-rw-r--r-- 1 root root 491 usr/lib/udev/rules.d/60-fido-id.rules
+-rw-r--r-- 1 root root 282 usr/lib/udev/rules.d/60-input-id.rules
+-rw-r--r-- 1 root root 616 usr/lib/udev/rules.d/60-persistent-alsa.rules
+-rw-r--r-- 1 root root 2719 usr/lib/udev/rules.d/60-persistent-input.rules
+-rw-r--r-- 1 root root 2204 usr/lib/udev/rules.d/60-persistent-storage-tape.rules
-rw-r--r-- 1 root root 8346 usr/lib/udev/rules.d/60-persistent-storage.rules
+-rw-r--r-- 1 root root 769 usr/lib/udev/rules.d/60-persistent-v4l.rules
+-rw-r--r-- 1 root root 1618 usr/lib/udev/rules.d/60-sensor.rules
+-rw-r--r-- 1 root root 1190 usr/lib/udev/rules.d/60-serial.rules
-rw-r--r-- 1 root root 616 usr/lib/udev/rules.d/64-btrfs.rules
+-rw-r--r-- 1 root root 432 usr/lib/udev/rules.d/70-joystick.rules
+-rw-r--r-- 1 root root 184 usr/lib/udev/rules.d/70-memory.rules
+-rw-r--r-- 1 root root 734 usr/lib/udev/rules.d/70-mouse.rules
+-rw-r--r-- 1 root root 473 usr/lib/udev/rules.d/70-touchpad.rules
-rw-r--r-- 1 root root 3311 usr/lib/udev/rules.d/70-uaccess.rules
-rw-r--r-- 1 root root 3818 usr/lib/udev/rules.d/71-seat.rules
-rw-r--r-- 1 root root 697 usr/lib/udev/rules.d/73-seat-late.rules
-rw-r--r-- 1 root root 452 usr/lib/udev/rules.d/75-net-description.rules
+-rw-r--r-- 1 root root 174 usr/lib/udev/rules.d/75-probe_mtd.rules
+-rw-r--r-- 1 root root 4816 usr/lib/udev/rules.d/78-sound-card.rules
-rw-r--r-- 1 root root 617 usr/lib/udev/rules.d/80-drivers.rules
-rw-r--r-- 1 root root 491 usr/lib/udev/rules.d/80-net-name-slot.rules
+-rw-r--r-- 1 root root 528 usr/lib/udev/rules.d/81-net-dhcp.rules
-rwxr-xr-x 1 root root 577 usr/lib/udev/sas_transport_scan_lun.sh
-rwxr-xr-x 1 root root 133856 usr/lib/udev/scsi_id
+-rwxr-xr-x 1 root root 133336 usr/lib/udev/v4l_id
lrwxrwxrwx 1 root root 3 usr/lib64 -> lib
drwxr-xr-x 3 root root 0 usr/libexec
drwxr-xr-x 2 root root 0 usr/libexec/elogind
@@ -4711,7 +4781,39 @@ drwxr-xr-x 2 root root
-rw-r--r-- 1 root root 1276 usr/share/terminfo/v/vt102
-rw-r--r-- 1 root root 1391 usr/share/terminfo/v/vt220
lrwxrwxrwx 1 root root 22 usr/share/unimaps -> /usr/share/kbd/unimaps
-drwxr-xr-x 3 root root 0 var
+drwxr-xr-x 4 root root 0 var
+drwxr-xr-x 3 root root 0 var/lib
+drwxr-xr-x 3 root root 0 var/lib/dracut
+drwxr-xr-x 15 root root 0 var/lib/dracut/hooks
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/cleanup
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/cmdline
+-rwxr-xr-x 1 root root 675 var/lib/dracut/hooks/cmdline/01-parse-kernel.sh
+-rwxr-xr-x 1 root root 3412 var/lib/dracut/hooks/cmdline/10-parse-resume.sh
+-rwxr-xr-x 1 root root 273 var/lib/dracut/hooks/cmdline/10-parse-root-opts.sh
+-rwxr-xr-x 1 root root 1088 var/lib/dracut/hooks/cmdline/20-parse-i18n.sh
+-rwxr-xr-x 1 root root 1290 var/lib/dracut/hooks/cmdline/30-parse-lunmask.sh
+-rwxr-xr-x 1 root root 342 var/lib/dracut/hooks/cmdline/95-parse-block.sh
+-rwxr-xr-x 1 root root 208 var/lib/dracut/hooks/cmdline/95-parse-virtiofs.sh
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/emergency
+drwxr-xr-x 6 root root 0 var/lib/dracut/hooks/initqueue
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/initqueue/finished
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/initqueue/online
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/initqueue/settled
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/initqueue/timeout
+-rwxr-xr-x 1 root root 459 var/lib/dracut/hooks/initqueue/timeout/99-rootfallback.sh
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/mount
+-rwxr-xr-x 1 root root 4085 var/lib/dracut/hooks/mount/99-mount-root.sh
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/netroot
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/pre-mount
+-rwxr-xr-x 1 root root 631 var/lib/dracut/hooks/pre-mount/99-mount-virtiofs.sh
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/pre-pivot
+-rwxr-xr-x 1 root root 3539 var/lib/dracut/hooks/pre-pivot/50-mount-usr.sh
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/pre-shutdown
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/pre-trigger
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/pre-udev
+-rwxr-xr-x 1 root root 507 var/lib/dracut/hooks/pre-udev/30-block-genrules.sh
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/shutdown
+drwxr-xr-x 2 root root 0 var/lib/dracut/hooks/shutdown-emergency
lrwxrwxrwx 1 root root 11 var/lock -> ../run/lock
lrwxrwxrwx 1 root root 6 var/run -> ../run
drwxr-xr-x 2 root root 0 var/tmp
```
</p>
</details>
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 104, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (37 preceding siblings ...)
2024-10-15 18:05 ` classabbyamp
@ 2024-10-15 18:06 ` classabbyamp
2024-10-15 18:07 ` [PR PATCH] [Updated] " classabbyamp
` (9 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: classabbyamp @ 2024-10-15 18:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 208 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2414684271
Comment:
it might also be a difference with udev or firmware, not sure
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: [PR PATCH] [Updated] dracut: update to 104, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (38 preceding siblings ...)
2024-10-15 18:06 ` classabbyamp
@ 2024-10-15 18:07 ` classabbyamp
2024-10-15 18:37 ` dracut: update to 105, " jozzsi
` (8 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: classabbyamp @ 2024-10-15 18:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 531 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages star-dracut-the-next-generation
https://github.com/void-linux/void-packages/pull/51344
dracut: update to 104, switch to dracut-ng
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
@zdykstra
A patch file from https://github.com/void-linux/void-packages/pull/51344.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-star-dracut-the-next-generation-51344.patch --]
[-- Type: text/x-diff, Size: 21354 bytes --]
From de612b33eb0cb6313036d2dd7c59d409e321a849 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 19 Jul 2024 16:50:28 -0400
Subject: [PATCH] dracut: update to 105, switch to dracut-ng
---
...408c8644a0add1907b0593eb83f90d6247b1.patch | 45 ---------
srcpkgs/dracut/patches/amd-ucode-readme.patch | 26 -----
srcpkgs/dracut/patches/crypt-openssl-3.patch | 24 -----
srcpkgs/dracut/patches/fix-fsck.patch | 27 ------
srcpkgs/dracut/patches/force_poweroff.patch | 30 ------
.../dracut/patches/isoscan-udev-trigger.patch | 25 -----
srcpkgs/dracut/patches/musl-1.1.patch | 97 +++++++++++++++++++
srcpkgs/dracut/patches/network.patch | 37 -------
.../dracut/patches/plymouth-udev-seat.patch | 9 +-
srcpkgs/dracut/patches/silence-setfont.patch | 19 ----
srcpkgs/dracut/template | 33 +++----
11 files changed, 115 insertions(+), 257 deletions(-)
delete mode 100644 srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch
delete mode 100644 srcpkgs/dracut/patches/amd-ucode-readme.patch
delete mode 100644 srcpkgs/dracut/patches/crypt-openssl-3.patch
delete mode 100644 srcpkgs/dracut/patches/fix-fsck.patch
delete mode 100644 srcpkgs/dracut/patches/force_poweroff.patch
delete mode 100644 srcpkgs/dracut/patches/isoscan-udev-trigger.patch
create mode 100644 srcpkgs/dracut/patches/musl-1.1.patch
delete mode 100644 srcpkgs/dracut/patches/network.patch
delete mode 100644 srcpkgs/dracut/patches/silence-setfont.patch
diff --git a/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch b/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch
deleted file mode 100644
index 6d3295c8e26c1a..00000000000000
--- a/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 6c80408c8644a0add1907b0593eb83f90d6247b1 Mon Sep 17 00:00:00 2001
-From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
-Date: Mon, 14 Aug 2023 12:28:11 +0200
-Subject: [PATCH] fix(dracut.sh): remove microcode check based on
- CONFIG_MICROCODE_[AMD|INTEL]
-
-`CONFIG_MICROCODE_AMD` and `CONFIG_MICROCODE_INTEL` are hidden since
-https://lore.kernel.org/all/20230810160805.081212701@linutronix.de/, therefore
-this check is wrong and early microcode is always disabled.
----
- dracut.sh | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index e0abdb3b0..3b292910f 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1561,23 +1561,20 @@ fi
-
- if [[ $early_microcode == yes ]]; then
- if [[ $hostonly ]]; then
-- if [[ $(get_cpu_vendor) == "AMD" ]]; then
-- check_kernel_config CONFIG_MICROCODE_AMD || unset early_microcode
-- elif [[ $(get_cpu_vendor) == "Intel" ]]; then
-- check_kernel_config CONFIG_MICROCODE_INTEL || unset early_microcode
-+ if [[ $(get_cpu_vendor) == "AMD" || $(get_cpu_vendor) == "Intel" ]]; then
-+ check_kernel_config CONFIG_MICROCODE || unset early_microcode
- else
- unset early_microcode
- fi
- else
-- ! check_kernel_config CONFIG_MICROCODE_AMD \
-- && ! check_kernel_config CONFIG_MICROCODE_INTEL \
-+ ! check_kernel_config CONFIG_MICROCODE \
- && unset early_microcode
- fi
- # Do not complain on non-x86 architectures as it makes no sense
- case "${DRACUT_ARCH:-$(uname -m)}" in
- x86_64 | i?86)
- [[ $early_microcode != yes ]] \
-- && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y"
-+ && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE!=y"
- ;;
- *) ;;
- esac
diff --git a/srcpkgs/dracut/patches/amd-ucode-readme.patch b/srcpkgs/dracut/patches/amd-ucode-readme.patch
deleted file mode 100644
index a2ea1288d230b0..00000000000000
--- a/srcpkgs/dracut/patches/amd-ucode-readme.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c1a69b81f6ebd62a40054be2375cb77c040694aa Mon Sep 17 00:00:00 2001
-From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
-Date: Mon, 30 Oct 2023 14:56:39 +0100
-Subject: [PATCH] fix(dracut.sh): skip README for AMD microcode generation
-
-This file was added in https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/amd-ucode/README?id=89ec6198f13d1007563ff87aae5de209e993be07
-and it should be skipped.
-
-Fixes #2541
----
- dracut.sh | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/dracut.sh b/dracut.sh
-index 3b292910f..bd730cbe9 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -2154,6 +2154,8 @@ if [[ $early_microcode == yes ]]; then
- done
- for i in $_fwdir/$_fw/$_src; do
- [[ -e $i ]] || continue
-+ # skip README{.xz,.zst,...}
-+ str_starts "$i" "$_fwdir/$_fw/README" && continue
- # skip gpg files
- str_ends "$i" ".asc" && continue
- cat "$i" >> "$_dest_dir/${ucode_dest[$idx]}"
diff --git a/srcpkgs/dracut/patches/crypt-openssl-3.patch b/srcpkgs/dracut/patches/crypt-openssl-3.patch
deleted file mode 100644
index 39fd3dd3c65e99..00000000000000
--- a/srcpkgs/dracut/patches/crypt-openssl-3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5996f6b5d9b0bb957b4bb02c49c95a057761cba5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Mon, 13 Feb 2023 20:22:56 +0000
-Subject: [PATCH] fix(crypt): add missing libraries
-
-Add missing libraries, closes #2137
----
- modules.d/90crypt/module-setup.sh | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/modules.d/90crypt/module-setup.sh
-+++ b/modules.d/90crypt/module-setup.sh
-@@ -176,5 +176,11 @@ install() {
- systemd-ask-password systemd-tty-ask-password-agent
- fi
-
-+ # Install required libraries.
-+ _arch=${DRACUT_ARCH:-$(uname -m)}
-+ inst_libdir_file \
-+ {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/fips.so" \
-+ {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/legacy.so"
-+
- dracut_need_initqueue
- }
diff --git a/srcpkgs/dracut/patches/fix-fsck.patch b/srcpkgs/dracut/patches/fix-fsck.patch
deleted file mode 100644
index 97c72d05e5543c..00000000000000
--- a/srcpkgs/dracut/patches/fix-fsck.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/dracutdevs/dracut/pull/2262
-
-From 26990cb90bf0f516ccbd56583000d6d02ab18acd Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Sat, 4 Mar 2023 23:28:17 +0000
-Subject: [PATCH] fix(fs-lib): remove quoting form the first argument of the
- e2fsck call
-
-Fix regression.
----
- modules.d/99fs-lib/fs-lib.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh
-index dd20731f2..c4640fa8a 100755
---- a/modules.d/99fs-lib/fs-lib.sh
-+++ b/modules.d/99fs-lib/fs-lib.sh
-@@ -107,7 +107,8 @@ fsck_drv_com() {
-
- info "issuing $_drv $_fop $_dev"
- # we enforce non-interactive run, so $() is fine
-- _out=$($_drv "$_fop" "$_dev")
-+ # shellcheck disable=SC2086
-+ _out=$($_drv $_fop "$_dev")
- _ret=$?
- fsck_tail
-
diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch
deleted file mode 100644
index 9056685e32b97a..00000000000000
--- a/srcpkgs/dracut/patches/force_poweroff.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-The shutdown binary is actually provided by runit and expects the runit
-init to be running. This is not the case in the initramfs. Forcing the
-shutdown, halt or reboot is necessary to ignore this requirement.
-
----
- modules.d/99base/dracut-lib.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
---- a/modules.d/99base/dracut-lib.sh
-+++ b/modules.d/99base/dracut-lib.sh
-@@ -1004,13 +1004,13 @@ emergency_shell() {
-
- case "$_emergency_action" in
- reboot)
-- reboot || exit 1
-+ reboot -f || exit 1
- ;;
- poweroff)
-- poweroff || exit 1
-+ poweroff -f || exit 1
- ;;
- halt)
-- halt || exit 1
-+ halt -f || exit 1
- ;;
- esac
- }
---
-2.37.3
diff --git a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch b/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
deleted file mode 100644
index b80e966266b45d..00000000000000
--- a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This upstream accepted patch fixes a bug where the live images don't work when
-booted from grub loopback (void-linux/void-mklive#294).
-
-From d880d62f5f81d7ec69555f5deb60694fdb693c01 Mon Sep 17 00:00:00 2001
-From: 0x5c <dev@0x5c.io>
-Date: Thu, 9 Feb 2023 05:26:30 -0500
-Subject: [PATCH] fix: make iso-scan trigger udev events
-
-Fixes #2183
----
- modules.d/90dmsquash-live/iso-scan.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules.d/90dmsquash-live/iso-scan.sh b/modules.d/90dmsquash-live/iso-scan.sh
-index 886d23033..fa06b33cd 100755
---- a/modules.d/90dmsquash-live/iso-scan.sh
-+++ b/modules.d/90dmsquash-live/iso-scan.sh
-@@ -22,6 +22,7 @@ do_iso_scan() {
- mount -t auto -o ro "$dev" "/run/initramfs/isoscan" || continue
- if [ -f "/run/initramfs/isoscan/$isofile" ]; then
- losetup -f "/run/initramfs/isoscan/$isofile"
-+ udevadm trigger --action=add > /dev/null 2>&1
- ln -s "$dev" /run/initramfs/isoscandev
- rm -f -- "$job"
- exit 0
diff --git a/srcpkgs/dracut/patches/musl-1.1.patch b/srcpkgs/dracut/patches/musl-1.1.patch
new file mode 100644
index 00000000000000..2c73d1c5bf0b57
--- /dev/null
+++ b/srcpkgs/dracut/patches/musl-1.1.patch
@@ -0,0 +1,97 @@
+From c52069f7a0adab4b5c5b911a44d65d3ba0989d7e Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Sat, 12 Oct 2024 20:06:12 -0400
+Subject: [PATCH] Revert "perf(dracut-install): stat() w/unused buf ->
+ access(F_OK) in dracut-install"
+
+This reverts commit e7ed8337bb9fec0283af5dc745450394ba649a03.
+
+This commit broke compatibility with musl 1.1.
+---
+ src/install/dracut-install.c | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/src/install/dracut-install.c b/src/install/dracut-install.c
+index 96bc2eb6..30c51a30 100644
+--- a/src/install/dracut-install.c
++++ b/src/install/dracut-install.c
+@@ -812,7 +812,7 @@ static int dracut_mkdir(const char *src)
+
+ static int dracut_install(const char *orig_src, const char *orig_dst, bool isdir, bool resolvedeps, bool hashdst)
+ {
+- struct stat sb;
++ struct stat sb, db;
+ _cleanup_free_ char *fullsrcpath = NULL;
+ _cleanup_free_ char *fulldstpath = NULL;
+ _cleanup_free_ char *fulldstdir = NULL;
+@@ -898,7 +898,7 @@ static int dracut_install(const char *orig_src, const char *orig_dst, bool isdir
+ return 1;
+ }
+
+- ret = access(fulldstdir, F_OK);
++ ret = stat(fulldstdir, &db);
+
+ if (ret < 0) {
+ _cleanup_free_ char *dname = NULL;
+@@ -958,12 +958,12 @@ static int dracut_install(const char *orig_src, const char *orig_dst, bool isdir
+ return 1;
+ }
+
+- if (faccessat(AT_FDCWD, abspath, F_OK, AT_SYMLINK_NOFOLLOW) != 0) {
++ if (lstat(abspath, &sb) != 0) {
+ log_debug("lstat '%s': %m", abspath);
+ return 1;
+ }
+
+- if (faccessat(AT_FDCWD, fulldstpath, F_OK, AT_SYMLINK_NOFOLLOW) != 0) {
++ if (lstat(fulldstpath, &sb) != 0) {
+ _cleanup_free_ char *absdestpath = NULL;
+
+ _asprintf(&absdestpath, "%s/%s", destrootdir,
+@@ -1313,6 +1313,7 @@ static char **find_binary(const char *src)
+ char *newsrc = NULL;
+
+ STRV_FOREACH(q, pathdirs) {
++ struct stat sb;
+ char *fullsrcpath;
+
+ _asprintf(&newsrc, "%s/%s", *q, src);
+@@ -1325,8 +1326,8 @@ static char **find_binary(const char *src)
+ continue;
+ }
+
+- if (faccessat(AT_FDCWD, fullsrcpath, F_OK, AT_SYMLINK_NOFOLLOW) != 0) {
+- log_debug("lstat(%s) != 0", fullsrcpath);
++ if (lstat(fullsrcpath, &sb) != 0) {
++ log_debug("stat(%s) != 0", fullsrcpath);
+ free(newsrc);
+ newsrc = NULL;
+ free(fullsrcpath);
+@@ -1441,8 +1442,9 @@ static int install_firmware_fullpath(const char *fwpath)
+ {
+ const char *fw = fwpath;
+ _cleanup_free_ char *fwpath_compressed = NULL;
++ struct stat sb;
+ int ret;
+- if (access(fwpath, F_OK) != 0) {
++ if (stat(fwpath, &sb) != 0) {
+ _asprintf(&fwpath_compressed, "%s.zst", fwpath);
+ if (access(fwpath_compressed, F_OK) != 0) {
+ strcpy(fwpath_compressed + strlen(fwpath) + 1, "xz");
+@@ -1485,11 +1487,12 @@ static int install_firmware(struct kmod_module *mod)
+ ret = -1;
+ STRV_FOREACH(q, firmwaredirs) {
+ _cleanup_free_ char *fwpath = NULL;
++ struct stat sb;
+
+ _asprintf(&fwpath, "%s/%s", *q, value);
+
+ if (strpbrk(value, "*?[") != NULL
+- && access(fwpath, F_OK) != 0) {
++ && stat(fwpath, &sb) != 0) {
+ size_t i;
+ _cleanup_globfree_ glob_t globbuf;
+
+--
+2.46.0
+
diff --git a/srcpkgs/dracut/patches/network.patch b/srcpkgs/dracut/patches/network.patch
deleted file mode 100644
index dce39fdc6f7a53..00000000000000
--- a/srcpkgs/dracut/patches/network.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 11a34f6b55f91610effd79ff1bf6a4bb2db760d3 Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Wed, 18 Jan 2023 19:59:24 +0000
-Subject: [PATCH] meta module should check if module exists
-
-Bug: https://github.com/dracutdevs/dracut/issues/1756
----
- modules.d/40network/module-setup.sh | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index 1ab13ef..078cb4b 100755
---- a/modules.d/40network/module-setup.sh
-+++ b/modules.d/40network/module-setup.sh
-@@ -17,15 +17,15 @@ depends() {
- done
-
- if [ -z "$network_handler" ]; then
-- if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
-+ if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]] && [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
- network_handler="network-wicked"
-- elif [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
-+ elif [[ -d "$dracutbasedir"/modules.d/35connman ]] && [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
- network_handler="connman"
-- elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
-+ elif [[ -d "$dracutbasedir"/modules.d/35network-manager ]] && ( [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] ); then
- network_handler="network-manager"
-- elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
-+ elif [[ -d "$dracutbasedir"/modules.d/01systemd-networkd ]] && [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
- network_handler="systemd-networkd"
-- else
-+ elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then
- network_handler="network-legacy"
- fi
- fi
---
-2.34.1
diff --git a/srcpkgs/dracut/patches/plymouth-udev-seat.patch b/srcpkgs/dracut/patches/plymouth-udev-seat.patch
index 490dd63b310a95..1830b38644e536 100644
--- a/srcpkgs/dracut/patches/plymouth-udev-seat.patch
+++ b/srcpkgs/dracut/patches/plymouth-udev-seat.patch
@@ -1,11 +1,12 @@
+adds udev rule that allows plymouth to work
+
--- a/modules.d/95udev-rules/module-setup.sh 2018-02-19 06:00:33.000000000 -0300
+++ b/modules.d/95udev-rules/module-setup.sh 2018-05-02 00:27:53.710253893 -0300
-@@ -39,6 +39,8 @@
- 60-persistent-storage.rules \
- 61-persistent-storage-edd.rules \
+@@ -49,6 +49,7 @@
+ 70-mouse.rules \
+ 70-touchpad.rules \
70-uaccess.rules \
+ 71-plymouth-seat.rules \
-+ 71-udev-seat.rules \
71-seat.rules \
73-seat-late.rules \
75-net-description.rules \
diff --git a/srcpkgs/dracut/patches/silence-setfont.patch b/srcpkgs/dracut/patches/silence-setfont.patch
deleted file mode 100644
index 377c0f3a8981a7..00000000000000
--- a/srcpkgs/dracut/patches/silence-setfont.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/void-linux/void-packages/issues/45216
-
-I'm tired of seeing these setfont errors. This will hopefully/eventually be upstreamed, but I'm not holding my breath.
-
----
-
-diff --git a/modules.d/10i18n/console_init.sh b/modules.d/10i18n/console_init.sh
-index 3fe3b673..0e19ae30 100755
---- a/modules.d/10i18n/console_init.sh
-+++ b/modules.d/10i18n/console_init.sh
-@@ -49,7 +49,7 @@ set_font() {
- setfont "${FONT-${DEFAULT_FONT}}" \
- -C "${1}" \
- ${FONT_MAP:+-m "${FONT_MAP}"} \
-- ${FONT_UNIMAP:+-u "${FONT_UNIMAP}"}
-+ ${FONT_UNIMAP:+-u "${FONT_UNIMAP}"} 2>/dev/null
- }
-
- dev_close() {
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 313e2d98719358..c21b1a38a57932 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
# Template file for 'dracut'
pkgname=dracut
-version=059
-revision=7
+version=105
+revision=1
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc"
conf_files="/etc/dracut.conf"
@@ -11,10 +11,10 @@ depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
short_desc="Low-level tool for generating an initramfs/initrd image"
maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="https://github.com/dracutdevs/dracut/wiki"
-changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
-distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
-checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
+homepage="https://github.com/dracut-ng/dracut-ng/wiki"
+changelog="https://raw.githubusercontent.com/dracut-ng/dracut-ng/master/NEWS.md"
+distfiles="https://github.com/dracut-ng/dracut-ng/archive/refs/tags/${version}.tar.gz"
+checksum=a5f94012873f589e2efc3659341f5e383ec90419f5c361a6fd3561f946133f69
alternatives="
initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/dracut/kernel-hook-postinst
initramfs:/etc/kernel.d/post-remove/20-initramfs:/usr/libexec/dracut/kernel-hook-postrm
@@ -32,16 +32,11 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
fi
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) # archs supported by dracut for EFI bundle
+ i686*|x86_64*|aarch64*) # archs supported by dracut for EFI bundle
subpackages+=" dracut-uefi"
;;
esac
-pre_build() {
- # Upstream tarball is missing version information
- DRACUT_VERSION="${version}" make dracut-version.sh
-}
-
post_install() {
# kernel hooks.
vinstall ${FILESDIR}/kernel-hook-postinst 755 usr/libexec/dracut
@@ -52,23 +47,21 @@ post_install() {
# systemd dependent additional dracut modules
for f in 06rngd 06dbus-broker 06dbus-daemon 09dbus \
- 35connman 35network-manager 35network-wicked 80lvmmerge \
- 99memstrack 99squash; do
+ 35connman 35network-manager 80lvmmerge \
+ 91fido2 91pcsc 91pkcs11 91tpm2-tss 95squash* \
+ 99memstrack 99squash*; do
rm -r ${DESTDIR}/usr/lib/dracut/modules.d/${f}
done
# don't need s390x architecture dependent dracut modules
for f in 80cms 81cio_ignore 91zipl 95dasd 95dasd_mod \
- 95dasd_rules 95dcssblk 95qeth_rules 95zfcp \
- 95zfcp_rules 95znet; do
+ 95dcssblk 95zfcp 95znet; do
rm -r ${DESTDIR}/usr/lib/dracut/modules.d/${f}
done
- # ifcfg network-scripts dependent (RHEL-derived)
- rm -r ${DESTDIR}/usr/lib/dracut/modules.d/45ifcfg
-
rm ${DESTDIR}/usr/share/man/man8/*.service.*
rm -r ${DESTDIR}/usr/lib/kernel
+ rm -r "${DESTDIR}"/usr/lib/dracut/test
}
dracut-network_package() {
@@ -84,7 +77,7 @@ dracut-network_package() {
}
dracut-uefi_package() {
- depends="binutils gummiboot-efistub ${sourcepkg}>=${version}_${revision}"
+ depends="binutils systemd-boot-efistub ${sourcepkg}>=${version}_${revision}"
short_desc+=" - UEFI bundle hook"
conf_files="/etc/default/dracut-uefi-hook"
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 105, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (39 preceding siblings ...)
2024-10-15 18:07 ` [PR PATCH] [Updated] " classabbyamp
@ 2024-10-15 18:37 ` jozzsi
2024-10-15 18:44 ` classabbyamp
` (7 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: jozzsi @ 2024-10-15 18:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 358 bytes --]
New comment by jozzsi on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2414742083
Comment:
> it might also be a difference with udev or firmware, not sure
Is there perhaps anything significant inside `/etc/udev/udev.conf` ? I do not think `force_drivers` changed.
> ```diff
> etc/udev/udev.conf
> ```
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 105, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (40 preceding siblings ...)
2024-10-15 18:37 ` dracut: update to 105, " jozzsi
@ 2024-10-15 18:44 ` classabbyamp
2024-10-15 19:01 ` jozzsi
` (6 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: classabbyamp @ 2024-10-15 18:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 173 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2414760025
Comment:
only comments in that file
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 105, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (41 preceding siblings ...)
2024-10-15 18:44 ` classabbyamp
@ 2024-10-15 19:01 ` jozzsi
2024-10-16 17:58 ` [PR PATCH] [Updated] " classabbyamp
` (5 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: jozzsi @ 2024-10-15 19:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
New comment by jozzsi on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2414742083
Comment:
> it might also be a difference with udev or firmware, not sure
Is there perhaps anything significant inside `/etc/udev/udev.conf` ? I do not think `force_drivers` changed.
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: [PR PATCH] [Updated] dracut: update to 105, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (42 preceding siblings ...)
2024-10-15 19:01 ` jozzsi
@ 2024-10-16 17:58 ` classabbyamp
2024-10-16 18:00 ` classabbyamp
` (4 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: classabbyamp @ 2024-10-16 17:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 531 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages star-dracut-the-next-generation
https://github.com/void-linux/void-packages/pull/51344
dracut: update to 105, switch to dracut-ng
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
@zdykstra
A patch file from https://github.com/void-linux/void-packages/pull/51344.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-star-dracut-the-next-generation-51344.patch --]
[-- Type: text/x-diff, Size: 39682 bytes --]
From 73fc639a74db10a6bb81e799aa87be34108b489e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 19 Jul 2024 16:50:28 -0400
Subject: [PATCH] dracut: update to 105, switch to dracut-ng
---
...408c8644a0add1907b0593eb83f90d6247b1.patch | 45 ---
srcpkgs/dracut/patches/amd-ucode-readme.patch | 26 --
srcpkgs/dracut/patches/crypt-openssl-3.patch | 24 --
srcpkgs/dracut/patches/fix-fsck.patch | 27 --
srcpkgs/dracut/patches/force_poweroff.patch | 30 --
.../dracut/patches/isoscan-udev-trigger.patch | 25 --
srcpkgs/dracut/patches/musl-1.1.patch | 97 +++++
srcpkgs/dracut/patches/network.patch | 37 --
.../dracut/patches/plymouth-udev-seat.patch | 9 +-
.../dracut/patches/revert-fw_devlink.patch | 382 ++++++++++++++++++
srcpkgs/dracut/patches/silence-setfont.patch | 19 -
srcpkgs/dracut/template | 33 +-
12 files changed, 497 insertions(+), 257 deletions(-)
delete mode 100644 srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch
delete mode 100644 srcpkgs/dracut/patches/amd-ucode-readme.patch
delete mode 100644 srcpkgs/dracut/patches/crypt-openssl-3.patch
delete mode 100644 srcpkgs/dracut/patches/fix-fsck.patch
delete mode 100644 srcpkgs/dracut/patches/force_poweroff.patch
delete mode 100644 srcpkgs/dracut/patches/isoscan-udev-trigger.patch
create mode 100644 srcpkgs/dracut/patches/musl-1.1.patch
delete mode 100644 srcpkgs/dracut/patches/network.patch
create mode 100644 srcpkgs/dracut/patches/revert-fw_devlink.patch
delete mode 100644 srcpkgs/dracut/patches/silence-setfont.patch
diff --git a/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch b/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch
deleted file mode 100644
index 6d3295c8e26c1a..00000000000000
--- a/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 6c80408c8644a0add1907b0593eb83f90d6247b1 Mon Sep 17 00:00:00 2001
-From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
-Date: Mon, 14 Aug 2023 12:28:11 +0200
-Subject: [PATCH] fix(dracut.sh): remove microcode check based on
- CONFIG_MICROCODE_[AMD|INTEL]
-
-`CONFIG_MICROCODE_AMD` and `CONFIG_MICROCODE_INTEL` are hidden since
-https://lore.kernel.org/all/20230810160805.081212701@linutronix.de/, therefore
-this check is wrong and early microcode is always disabled.
----
- dracut.sh | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index e0abdb3b0..3b292910f 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1561,23 +1561,20 @@ fi
-
- if [[ $early_microcode == yes ]]; then
- if [[ $hostonly ]]; then
-- if [[ $(get_cpu_vendor) == "AMD" ]]; then
-- check_kernel_config CONFIG_MICROCODE_AMD || unset early_microcode
-- elif [[ $(get_cpu_vendor) == "Intel" ]]; then
-- check_kernel_config CONFIG_MICROCODE_INTEL || unset early_microcode
-+ if [[ $(get_cpu_vendor) == "AMD" || $(get_cpu_vendor) == "Intel" ]]; then
-+ check_kernel_config CONFIG_MICROCODE || unset early_microcode
- else
- unset early_microcode
- fi
- else
-- ! check_kernel_config CONFIG_MICROCODE_AMD \
-- && ! check_kernel_config CONFIG_MICROCODE_INTEL \
-+ ! check_kernel_config CONFIG_MICROCODE \
- && unset early_microcode
- fi
- # Do not complain on non-x86 architectures as it makes no sense
- case "${DRACUT_ARCH:-$(uname -m)}" in
- x86_64 | i?86)
- [[ $early_microcode != yes ]] \
-- && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y"
-+ && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE!=y"
- ;;
- *) ;;
- esac
diff --git a/srcpkgs/dracut/patches/amd-ucode-readme.patch b/srcpkgs/dracut/patches/amd-ucode-readme.patch
deleted file mode 100644
index a2ea1288d230b0..00000000000000
--- a/srcpkgs/dracut/patches/amd-ucode-readme.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c1a69b81f6ebd62a40054be2375cb77c040694aa Mon Sep 17 00:00:00 2001
-From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
-Date: Mon, 30 Oct 2023 14:56:39 +0100
-Subject: [PATCH] fix(dracut.sh): skip README for AMD microcode generation
-
-This file was added in https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/amd-ucode/README?id=89ec6198f13d1007563ff87aae5de209e993be07
-and it should be skipped.
-
-Fixes #2541
----
- dracut.sh | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/dracut.sh b/dracut.sh
-index 3b292910f..bd730cbe9 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -2154,6 +2154,8 @@ if [[ $early_microcode == yes ]]; then
- done
- for i in $_fwdir/$_fw/$_src; do
- [[ -e $i ]] || continue
-+ # skip README{.xz,.zst,...}
-+ str_starts "$i" "$_fwdir/$_fw/README" && continue
- # skip gpg files
- str_ends "$i" ".asc" && continue
- cat "$i" >> "$_dest_dir/${ucode_dest[$idx]}"
diff --git a/srcpkgs/dracut/patches/crypt-openssl-3.patch b/srcpkgs/dracut/patches/crypt-openssl-3.patch
deleted file mode 100644
index 39fd3dd3c65e99..00000000000000
--- a/srcpkgs/dracut/patches/crypt-openssl-3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5996f6b5d9b0bb957b4bb02c49c95a057761cba5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Mon, 13 Feb 2023 20:22:56 +0000
-Subject: [PATCH] fix(crypt): add missing libraries
-
-Add missing libraries, closes #2137
----
- modules.d/90crypt/module-setup.sh | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/modules.d/90crypt/module-setup.sh
-+++ b/modules.d/90crypt/module-setup.sh
-@@ -176,5 +176,11 @@ install() {
- systemd-ask-password systemd-tty-ask-password-agent
- fi
-
-+ # Install required libraries.
-+ _arch=${DRACUT_ARCH:-$(uname -m)}
-+ inst_libdir_file \
-+ {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/fips.so" \
-+ {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/legacy.so"
-+
- dracut_need_initqueue
- }
diff --git a/srcpkgs/dracut/patches/fix-fsck.patch b/srcpkgs/dracut/patches/fix-fsck.patch
deleted file mode 100644
index 97c72d05e5543c..00000000000000
--- a/srcpkgs/dracut/patches/fix-fsck.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/dracutdevs/dracut/pull/2262
-
-From 26990cb90bf0f516ccbd56583000d6d02ab18acd Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Sat, 4 Mar 2023 23:28:17 +0000
-Subject: [PATCH] fix(fs-lib): remove quoting form the first argument of the
- e2fsck call
-
-Fix regression.
----
- modules.d/99fs-lib/fs-lib.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh
-index dd20731f2..c4640fa8a 100755
---- a/modules.d/99fs-lib/fs-lib.sh
-+++ b/modules.d/99fs-lib/fs-lib.sh
-@@ -107,7 +107,8 @@ fsck_drv_com() {
-
- info "issuing $_drv $_fop $_dev"
- # we enforce non-interactive run, so $() is fine
-- _out=$($_drv "$_fop" "$_dev")
-+ # shellcheck disable=SC2086
-+ _out=$($_drv $_fop "$_dev")
- _ret=$?
- fsck_tail
-
diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch
deleted file mode 100644
index 9056685e32b97a..00000000000000
--- a/srcpkgs/dracut/patches/force_poweroff.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-The shutdown binary is actually provided by runit and expects the runit
-init to be running. This is not the case in the initramfs. Forcing the
-shutdown, halt or reboot is necessary to ignore this requirement.
-
----
- modules.d/99base/dracut-lib.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
---- a/modules.d/99base/dracut-lib.sh
-+++ b/modules.d/99base/dracut-lib.sh
-@@ -1004,13 +1004,13 @@ emergency_shell() {
-
- case "$_emergency_action" in
- reboot)
-- reboot || exit 1
-+ reboot -f || exit 1
- ;;
- poweroff)
-- poweroff || exit 1
-+ poweroff -f || exit 1
- ;;
- halt)
-- halt || exit 1
-+ halt -f || exit 1
- ;;
- esac
- }
---
-2.37.3
diff --git a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch b/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
deleted file mode 100644
index b80e966266b45d..00000000000000
--- a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This upstream accepted patch fixes a bug where the live images don't work when
-booted from grub loopback (void-linux/void-mklive#294).
-
-From d880d62f5f81d7ec69555f5deb60694fdb693c01 Mon Sep 17 00:00:00 2001
-From: 0x5c <dev@0x5c.io>
-Date: Thu, 9 Feb 2023 05:26:30 -0500
-Subject: [PATCH] fix: make iso-scan trigger udev events
-
-Fixes #2183
----
- modules.d/90dmsquash-live/iso-scan.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules.d/90dmsquash-live/iso-scan.sh b/modules.d/90dmsquash-live/iso-scan.sh
-index 886d23033..fa06b33cd 100755
---- a/modules.d/90dmsquash-live/iso-scan.sh
-+++ b/modules.d/90dmsquash-live/iso-scan.sh
-@@ -22,6 +22,7 @@ do_iso_scan() {
- mount -t auto -o ro "$dev" "/run/initramfs/isoscan" || continue
- if [ -f "/run/initramfs/isoscan/$isofile" ]; then
- losetup -f "/run/initramfs/isoscan/$isofile"
-+ udevadm trigger --action=add > /dev/null 2>&1
- ln -s "$dev" /run/initramfs/isoscandev
- rm -f -- "$job"
- exit 0
diff --git a/srcpkgs/dracut/patches/musl-1.1.patch b/srcpkgs/dracut/patches/musl-1.1.patch
new file mode 100644
index 00000000000000..2c73d1c5bf0b57
--- /dev/null
+++ b/srcpkgs/dracut/patches/musl-1.1.patch
@@ -0,0 +1,97 @@
+From c52069f7a0adab4b5c5b911a44d65d3ba0989d7e Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Sat, 12 Oct 2024 20:06:12 -0400
+Subject: [PATCH] Revert "perf(dracut-install): stat() w/unused buf ->
+ access(F_OK) in dracut-install"
+
+This reverts commit e7ed8337bb9fec0283af5dc745450394ba649a03.
+
+This commit broke compatibility with musl 1.1.
+---
+ src/install/dracut-install.c | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/src/install/dracut-install.c b/src/install/dracut-install.c
+index 96bc2eb6..30c51a30 100644
+--- a/src/install/dracut-install.c
++++ b/src/install/dracut-install.c
+@@ -812,7 +812,7 @@ static int dracut_mkdir(const char *src)
+
+ static int dracut_install(const char *orig_src, const char *orig_dst, bool isdir, bool resolvedeps, bool hashdst)
+ {
+- struct stat sb;
++ struct stat sb, db;
+ _cleanup_free_ char *fullsrcpath = NULL;
+ _cleanup_free_ char *fulldstpath = NULL;
+ _cleanup_free_ char *fulldstdir = NULL;
+@@ -898,7 +898,7 @@ static int dracut_install(const char *orig_src, const char *orig_dst, bool isdir
+ return 1;
+ }
+
+- ret = access(fulldstdir, F_OK);
++ ret = stat(fulldstdir, &db);
+
+ if (ret < 0) {
+ _cleanup_free_ char *dname = NULL;
+@@ -958,12 +958,12 @@ static int dracut_install(const char *orig_src, const char *orig_dst, bool isdir
+ return 1;
+ }
+
+- if (faccessat(AT_FDCWD, abspath, F_OK, AT_SYMLINK_NOFOLLOW) != 0) {
++ if (lstat(abspath, &sb) != 0) {
+ log_debug("lstat '%s': %m", abspath);
+ return 1;
+ }
+
+- if (faccessat(AT_FDCWD, fulldstpath, F_OK, AT_SYMLINK_NOFOLLOW) != 0) {
++ if (lstat(fulldstpath, &sb) != 0) {
+ _cleanup_free_ char *absdestpath = NULL;
+
+ _asprintf(&absdestpath, "%s/%s", destrootdir,
+@@ -1313,6 +1313,7 @@ static char **find_binary(const char *src)
+ char *newsrc = NULL;
+
+ STRV_FOREACH(q, pathdirs) {
++ struct stat sb;
+ char *fullsrcpath;
+
+ _asprintf(&newsrc, "%s/%s", *q, src);
+@@ -1325,8 +1326,8 @@ static char **find_binary(const char *src)
+ continue;
+ }
+
+- if (faccessat(AT_FDCWD, fullsrcpath, F_OK, AT_SYMLINK_NOFOLLOW) != 0) {
+- log_debug("lstat(%s) != 0", fullsrcpath);
++ if (lstat(fullsrcpath, &sb) != 0) {
++ log_debug("stat(%s) != 0", fullsrcpath);
+ free(newsrc);
+ newsrc = NULL;
+ free(fullsrcpath);
+@@ -1441,8 +1442,9 @@ static int install_firmware_fullpath(const char *fwpath)
+ {
+ const char *fw = fwpath;
+ _cleanup_free_ char *fwpath_compressed = NULL;
++ struct stat sb;
+ int ret;
+- if (access(fwpath, F_OK) != 0) {
++ if (stat(fwpath, &sb) != 0) {
+ _asprintf(&fwpath_compressed, "%s.zst", fwpath);
+ if (access(fwpath_compressed, F_OK) != 0) {
+ strcpy(fwpath_compressed + strlen(fwpath) + 1, "xz");
+@@ -1485,11 +1487,12 @@ static int install_firmware(struct kmod_module *mod)
+ ret = -1;
+ STRV_FOREACH(q, firmwaredirs) {
+ _cleanup_free_ char *fwpath = NULL;
++ struct stat sb;
+
+ _asprintf(&fwpath, "%s/%s", *q, value);
+
+ if (strpbrk(value, "*?[") != NULL
+- && access(fwpath, F_OK) != 0) {
++ && stat(fwpath, &sb) != 0) {
+ size_t i;
+ _cleanup_globfree_ glob_t globbuf;
+
+--
+2.46.0
+
diff --git a/srcpkgs/dracut/patches/network.patch b/srcpkgs/dracut/patches/network.patch
deleted file mode 100644
index dce39fdc6f7a53..00000000000000
--- a/srcpkgs/dracut/patches/network.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 11a34f6b55f91610effd79ff1bf6a4bb2db760d3 Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Wed, 18 Jan 2023 19:59:24 +0000
-Subject: [PATCH] meta module should check if module exists
-
-Bug: https://github.com/dracutdevs/dracut/issues/1756
----
- modules.d/40network/module-setup.sh | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index 1ab13ef..078cb4b 100755
---- a/modules.d/40network/module-setup.sh
-+++ b/modules.d/40network/module-setup.sh
-@@ -17,15 +17,15 @@ depends() {
- done
-
- if [ -z "$network_handler" ]; then
-- if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
-+ if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]] && [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
- network_handler="network-wicked"
-- elif [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
-+ elif [[ -d "$dracutbasedir"/modules.d/35connman ]] && [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
- network_handler="connman"
-- elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
-+ elif [[ -d "$dracutbasedir"/modules.d/35network-manager ]] && ( [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] ); then
- network_handler="network-manager"
-- elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
-+ elif [[ -d "$dracutbasedir"/modules.d/01systemd-networkd ]] && [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
- network_handler="systemd-networkd"
-- else
-+ elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then
- network_handler="network-legacy"
- fi
- fi
---
-2.34.1
diff --git a/srcpkgs/dracut/patches/plymouth-udev-seat.patch b/srcpkgs/dracut/patches/plymouth-udev-seat.patch
index 490dd63b310a95..1830b38644e536 100644
--- a/srcpkgs/dracut/patches/plymouth-udev-seat.patch
+++ b/srcpkgs/dracut/patches/plymouth-udev-seat.patch
@@ -1,11 +1,12 @@
+adds udev rule that allows plymouth to work
+
--- a/modules.d/95udev-rules/module-setup.sh 2018-02-19 06:00:33.000000000 -0300
+++ b/modules.d/95udev-rules/module-setup.sh 2018-05-02 00:27:53.710253893 -0300
-@@ -39,6 +39,8 @@
- 60-persistent-storage.rules \
- 61-persistent-storage-edd.rules \
+@@ -49,6 +49,7 @@
+ 70-mouse.rules \
+ 70-touchpad.rules \
70-uaccess.rules \
+ 71-plymouth-seat.rules \
-+ 71-udev-seat.rules \
71-seat.rules \
73-seat-late.rules \
75-net-description.rules \
diff --git a/srcpkgs/dracut/patches/revert-fw_devlink.patch b/srcpkgs/dracut/patches/revert-fw_devlink.patch
new file mode 100644
index 00000000000000..e05e08c5c231ae
--- /dev/null
+++ b/srcpkgs/dracut/patches/revert-fw_devlink.patch
@@ -0,0 +1,382 @@
+From daf80bbb8f8ca5c4ad56772f379110e7434cbc2c Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Wed, 16 Oct 2024 13:45:35 -0400
+Subject: [PATCH] Revert "feat(dracut-install): add fw_devlink suppliers as
+ module dependencies"
+
+...and associated later changes, as they cause serious regressions with
+aarch64 devices like the Lenovo X13s.
+
+This reverts commit 8de0258d71dc5600d715d7534471e35b2b75c7be.
+This reverts commit 07e2c4926780b672922563a6ea0bf1bd4bcfcd9f.
+This reverts commit d71bec4aa444d92820e428c0629d0e75e268c815.
+This reverts commit 6500e95494175819b382acbac8eafcdf72fabd6d.
+This reverts commit 131822e26d76a3ce2028e9a545be2af066805629.
+This reverts commit 3de4c7313260fb600507c9b87f780390b874c870.
+---
+ src/install/dracut-install.c | 245 +++--------------------------------
+ 1 file changed, 15 insertions(+), 230 deletions(-)
+
+diff --git a/src/install/dracut-install.c b/src/install/dracut-install.c
+index 96bc2eb6..96644151 100644
+--- a/src/install/dracut-install.c
++++ b/src/install/dracut-install.c
+@@ -83,9 +83,6 @@ FILE *logfile_f = NULL;
+ static Hashmap *items = NULL;
+ static Hashmap *items_failed = NULL;
+ static Hashmap *modules_loaded = NULL;
+-static Hashmap *modules_suppliers = NULL;
+-static Hashmap *processed_suppliers = NULL;
+-static Hashmap *modalias_to_kmod = NULL;
+ static regex_t mod_filter_path;
+ static regex_t mod_filter_nopath;
+ static regex_t mod_filter_symbol;
+@@ -98,7 +95,7 @@ static bool arg_mod_filter_nosymbol = false;
+ static bool arg_mod_filter_noname = false;
+
+ static int dracut_install(const char *src, const char *dst, bool isdir, bool resolvedeps, bool hashdst);
+-static int install_dependent_modules(struct kmod_ctx *ctx, struct kmod_list *modlist, Hashmap *suppliers_paths);
++static int install_dependent_modules(struct kmod_list *modlist);
+
+ static void item_free(char *i)
+ {
+@@ -1571,164 +1568,7 @@ static bool check_module_path(const char *path)
+ return true;
+ }
+
+-static int find_kmod_module_from_sysfs_driver(struct kmod_ctx *ctx, const char *sysfs_node, int sysfs_node_len,
+- struct kmod_module **module)
+-{
+- char mod_path[PATH_MAX], mod_realpath[PATH_MAX];
+- const char *mod_name;
+- if ((size_t)snprintf(mod_path, sizeof(mod_path), "%.*s/driver/module",
+- sysfs_node_len, sysfs_node) >= sizeof(mod_path))
+- return -1;
+-
+- if (realpath(mod_path, mod_realpath) == NULL)
+- return -1;
+-
+- if ((mod_name = basename(mod_realpath)) == NULL)
+- return -1;
+-
+- return kmod_module_new_from_name(ctx, mod_name, module);
+-}
+-
+-static int find_kmod_module_from_sysfs_modalias(struct kmod_ctx *ctx, const char *sysfs_node, int sysfs_node_len,
+- struct kmod_list **modules)
+-{
+- char modalias_path[PATH_MAX];
+- if ((size_t)snprintf(modalias_path, sizeof(modalias_path), "%.*s/modalias", sysfs_node_len,
+- sysfs_node) >= sizeof(modalias_path))
+- return -1;
+-
+- _cleanup_close_ int modalias_file = -1;
+- if ((modalias_file = open(modalias_path, O_RDONLY | O_CLOEXEC)) == -1)
+- return 0;
+-
+- char alias[page_size()];
+- ssize_t len = read(modalias_file, alias, sizeof(alias));
+- alias[len - 1] = '\0';
+-
+- void *list;
+-
+- if (hashmap_get_exists(modalias_to_kmod, alias, &list) == 1) {
+- *modules = list;
+- return 0;
+- }
+-
+- int ret = kmod_module_new_from_lookup(ctx, alias, modules);
+- if (!ret) {
+- hashmap_put(modalias_to_kmod, strdup(alias), *modules);
+- }
+-
+- return ret;
+-}
+-
+-static int find_modules_from_sysfs_node(struct kmod_ctx *ctx, const char *sysfs_node, Hashmap *modules)
+-{
+- _cleanup_kmod_module_unref_ struct kmod_module *drv = NULL;
+- struct kmod_list *list = NULL;
+- struct kmod_list *l = NULL;
+-
+- if (find_kmod_module_from_sysfs_driver(ctx, sysfs_node, strlen(sysfs_node), &drv) >= 0) {
+- char *module = strdup(kmod_module_get_name(drv));
+- if (hashmap_put(modules, module, module) < 0)
+- free(module);
+- return 0;
+- }
+-
+- if (find_kmod_module_from_sysfs_modalias(ctx, sysfs_node, strlen(sysfs_node), &list) >= 0) {
+- kmod_list_foreach(l, list) {
+- struct kmod_module *mod = kmod_module_get_module(l);
+- char *module = strdup(kmod_module_get_name(mod));
+- kmod_module_unref(mod);
+-
+- if (hashmap_put(modules, module, module) < 0)
+- free(module);
+- }
+- }
+-
+- return 0;
+-}
+-
+-static void find_suppliers_for_sys_node(Hashmap *suppliers, const char *node_path_raw,
+- size_t node_path_len)
+-{
+- char node_path[PATH_MAX];
+- char real_path[PATH_MAX];
+-
+- memcpy(node_path, node_path_raw, node_path_len);
+- node_path[node_path_len] = '\0';
+-
+- DIR *d;
+- struct dirent *dir;
+- while (realpath(node_path, real_path) != NULL && strcmp(real_path, "/sys/devices")) {
+- d = opendir(node_path);
+- if (d) {
+- size_t real_path_len = strlen(real_path);
+- while ((dir = readdir(d)) != NULL) {
+- if (strstr(dir->d_name, "supplier:platform") != NULL) {
+- if ((size_t)snprintf(real_path + real_path_len, sizeof(real_path) - real_path_len, "/%s/supplier",
+- dir->d_name) < sizeof(real_path) - real_path_len) {
+- char *real_supplier_path = realpath(real_path, NULL);
+- if (real_supplier_path != NULL)
+- if (hashmap_put(suppliers, real_supplier_path, real_supplier_path) < 0)
+- free(real_supplier_path);
+- }
+- }
+- }
+- closedir(d);
+- }
+- strcat(node_path, "/.."); // Also find suppliers of parents
+- }
+-}
+-
+-static void find_suppliers(struct kmod_ctx *ctx)
+-{
+- _cleanup_fts_close_ FTS *fts;
+- char *paths[] = { "/sys/devices/platform", NULL };
+- fts = fts_open(paths, FTS_NOSTAT | FTS_PHYSICAL, NULL);
+-
+- for (FTSENT *ftsent = fts_read(fts); ftsent != NULL; ftsent = fts_read(fts)) {
+- if (strcmp(ftsent->fts_name, "modalias") == 0) {
+- _cleanup_kmod_module_unref_ struct kmod_module *drv = NULL;
+- struct kmod_list *list = NULL;
+- struct kmod_list *l;
+-
+- if (find_kmod_module_from_sysfs_driver(ctx, ftsent->fts_parent->fts_path, ftsent->fts_parent->fts_pathlen, &drv) >= 0) {
+- const char *name = kmod_module_get_name(drv);
+- Hashmap *suppliers = hashmap_get(modules_suppliers, name);
+- if (suppliers == NULL) {
+- suppliers = hashmap_new(string_hash_func, string_compare_func);
+- hashmap_put(modules_suppliers, strdup(name), suppliers);
+- }
+-
+- find_suppliers_for_sys_node(suppliers, ftsent->fts_parent->fts_path, ftsent->fts_parent->fts_pathlen);
+-
+- /* Skip modalias check */
+- continue;
+- }
+-
+- if (find_kmod_module_from_sysfs_modalias(ctx, ftsent->fts_parent->fts_path, ftsent->fts_parent->fts_pathlen, &list) < 0)
+- continue;
+-
+- kmod_list_foreach(l, list) {
+- _cleanup_kmod_module_unref_ struct kmod_module *mod = kmod_module_get_module(l);
+- const char *name = kmod_module_get_name(mod);
+- Hashmap *suppliers = hashmap_get(modules_suppliers, name);
+- if (suppliers == NULL) {
+- suppliers = hashmap_new(string_hash_func, string_compare_func);
+- hashmap_put(modules_suppliers, strdup(name), suppliers);
+- }
+-
+- find_suppliers_for_sys_node(suppliers, ftsent->fts_parent->fts_path, ftsent->fts_parent->fts_pathlen);
+- }
+- }
+- }
+-}
+-
+-static Hashmap *find_suppliers_paths_for_module(const char *module)
+-{
+- return hashmap_get(modules_suppliers, module);
+-}
+-
+-static int install_dependent_module(struct kmod_ctx *ctx, struct kmod_module *mod, Hashmap *suppliers_paths, int *err)
++static int install_dependent_module(struct kmod_module *mod, int *err)
+ {
+ const char *path = NULL;
+ const char *name = NULL;
+@@ -1762,13 +1602,13 @@ static int install_dependent_module(struct kmod_ctx *ctx, struct kmod_module *mo
+ log_debug("dracut_install '%s' '%s' OK", path, &path[kerneldirlen]);
+ install_firmware(mod);
+ modlist = kmod_module_get_dependencies(mod);
+- *err = install_dependent_modules(ctx, modlist, suppliers_paths);
++ *err = install_dependent_modules(modlist);
+ if (*err == 0) {
+ *err = kmod_module_get_softdeps(mod, &modpre, &modpost);
+ if (*err == 0) {
+ int r;
+- *err = install_dependent_modules(ctx, modpre, NULL);
+- r = install_dependent_modules(ctx, modpost, NULL);
++ *err = install_dependent_modules(modpre);
++ r = install_dependent_modules(modpost);
+ *err = *err ? : r;
+ }
+ }
+@@ -1786,7 +1626,7 @@ static int install_dependent_module(struct kmod_ctx *ctx, struct kmod_module *mo
+ return 0;
+ }
+
+-static int install_dependent_modules(struct kmod_ctx *ctx, struct kmod_list *modlist, Hashmap *suppliers_paths)
++static int install_dependent_modules(struct kmod_list *modlist)
+ {
+ struct kmod_list *itr = NULL;
+ int ret = 0;
+@@ -1794,44 +1634,14 @@ static int install_dependent_modules(struct kmod_ctx *ctx, struct kmod_list *mod
+ kmod_list_foreach(itr, modlist) {
+ _cleanup_kmod_module_unref_ struct kmod_module *mod = NULL;
+ mod = kmod_module_get_module(itr);
+- if (install_dependent_module(ctx, mod, find_suppliers_paths_for_module(kmod_module_get_name(mod)), &ret))
++ if (install_dependent_module(mod, &ret))
+ return -1;
+ }
+
+- const char *supplier_path;
+- Iterator i;
+- HASHMAP_FOREACH(supplier_path, suppliers_paths, i) {
+- if (check_hashmap(processed_suppliers, supplier_path))
+- continue;
+-
+- char *path = strdup(supplier_path);
+- hashmap_put(processed_suppliers, path, path);
+-
+- _cleanup_destroy_hashmap_ Hashmap *modules = hashmap_new(string_hash_func, string_compare_func);
+- find_modules_from_sysfs_node(ctx, supplier_path, modules);
+-
+- _cleanup_destroy_hashmap_ Hashmap *suppliers = hashmap_new(string_hash_func, string_compare_func);
+- find_suppliers_for_sys_node(suppliers, supplier_path, strlen(supplier_path));
+-
+- if (!hashmap_isempty(modules)) { // Supplier is a module
+- const char *module;
+- Iterator j;
+- HASHMAP_FOREACH(module, modules, j) {
+- _cleanup_kmod_module_unref_ struct kmod_module *mod = NULL;
+- if (!kmod_module_new_from_name(ctx, module, &mod)) {
+- if (install_dependent_module(ctx, mod, suppliers, &ret))
+- return -1;
+- }
+- }
+- } else { // Supplier is builtin
+- install_dependent_modules(ctx, NULL, suppliers);
+- }
+- }
+-
+ return ret;
+ }
+
+-static int install_module(struct kmod_ctx *ctx, struct kmod_module *mod)
++static int install_module(struct kmod_module *mod)
+ {
+ int ret = 0;
+ _cleanup_kmod_module_unref_list_ struct kmod_list *modlist = NULL;
+@@ -1884,16 +1694,15 @@ static int install_module(struct kmod_ctx *ctx, struct kmod_module *mod)
+ }
+ install_firmware(mod);
+
+- Hashmap *suppliers = find_suppliers_paths_for_module(name);
+ modlist = kmod_module_get_dependencies(mod);
+- ret = install_dependent_modules(ctx, modlist, suppliers);
++ ret = install_dependent_modules(modlist);
+
+ if (ret == 0) {
+ ret = kmod_module_get_softdeps(mod, &modpre, &modpost);
+ if (ret == 0) {
+ int r;
+- ret = install_dependent_modules(ctx, modpre, NULL);
+- r = install_dependent_modules(ctx, modpost, NULL);
++ ret = install_dependent_modules(modpre);
++ r = install_dependent_modules(modpost);
+ ret = ret ? : r;
+ }
+ }
+@@ -2012,9 +1821,6 @@ static int install_modules(int argc, char **argv)
+ if (p != NULL)
+ kerneldirlen = p - abskpath;
+
+- modules_suppliers = hashmap_new(string_hash_func, string_compare_func);
+- find_suppliers(ctx);
+-
+ if (arg_hostonly) {
+ char *modalias_file;
+ modalias_file = getenv("DRACUT_KERNEL_MODALIASES");
+@@ -2102,7 +1908,7 @@ static int install_modules(int argc, char **argv)
+ }
+ kmod_list_foreach(itr, modlist) {
+ mod = kmod_module_get_module(itr);
+- r = install_module(ctx, mod);
++ r = install_module(mod);
+ kmod_module_unref(mod);
+ if ((r < 0) && !arg_optional) {
+ if (!arg_silent)
+@@ -2181,7 +1987,7 @@ static int install_modules(int argc, char **argv)
+ }
+ kmod_list_foreach(itr, modlist) {
+ mod = kmod_module_get_module(itr);
+- r = install_module(ctx, mod);
++ r = install_module(mod);
+ kmod_module_unref(mod);
+ if ((r < 0) && !arg_optional) {
+ if (!arg_silent)
+@@ -2232,7 +2038,7 @@ static int install_modules(int argc, char **argv)
+ }
+ kmod_list_foreach(itr, modlist) {
+ mod = kmod_module_get_module(itr);
+- r = install_module(ctx, mod);
++ r = install_module(mod);
+ kmod_module_unref(mod);
+ if ((r < 0) && !arg_optional) {
+ if (!arg_silent)
+@@ -2333,10 +2139,8 @@ int main(int argc, char **argv)
+
+ items = hashmap_new(string_hash_func, string_compare_func);
+ items_failed = hashmap_new(string_hash_func, string_compare_func);
+- processed_suppliers = hashmap_new(string_hash_func, string_compare_func);
+- modalias_to_kmod = hashmap_new(string_hash_func, string_compare_func);
+
+- if (!items || !items_failed || !processed_suppliers || !modules_loaded) {
++ if (!items || !items_failed || !modules_loaded) {
+ log_error("Out of memory");
+ r = EXIT_FAILURE;
+ goto finish1;
+@@ -2397,28 +2201,9 @@ finish2:
+ while ((i = hashmap_steal_first(items_failed)))
+ item_free(i);
+
+- Hashmap *h;
+- while ((h = hashmap_steal_first(modules_suppliers))) {
+- while ((i = hashmap_steal_first(h))) {
+- item_free(i);
+- }
+- hashmap_free(h);
+- }
+-
+- while ((i = hashmap_steal_first(processed_suppliers)))
+- item_free(i);
+-
+- /*
+- * Note: modalias_to_kmod's values are freed implicitly by the kmod context destruction
+- * in kmod_unref().
+- */
+-
+ hashmap_free(items);
+ hashmap_free(items_failed);
+ hashmap_free(modules_loaded);
+- hashmap_free(modules_suppliers);
+- hashmap_free(processed_suppliers);
+- hashmap_free(modalias_to_kmod);
+
+ if (arg_mod_filter_path)
+ regfree(&mod_filter_path);
+--
+2.46.0
+
diff --git a/srcpkgs/dracut/patches/silence-setfont.patch b/srcpkgs/dracut/patches/silence-setfont.patch
deleted file mode 100644
index 377c0f3a8981a7..00000000000000
--- a/srcpkgs/dracut/patches/silence-setfont.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/void-linux/void-packages/issues/45216
-
-I'm tired of seeing these setfont errors. This will hopefully/eventually be upstreamed, but I'm not holding my breath.
-
----
-
-diff --git a/modules.d/10i18n/console_init.sh b/modules.d/10i18n/console_init.sh
-index 3fe3b673..0e19ae30 100755
---- a/modules.d/10i18n/console_init.sh
-+++ b/modules.d/10i18n/console_init.sh
-@@ -49,7 +49,7 @@ set_font() {
- setfont "${FONT-${DEFAULT_FONT}}" \
- -C "${1}" \
- ${FONT_MAP:+-m "${FONT_MAP}"} \
-- ${FONT_UNIMAP:+-u "${FONT_UNIMAP}"}
-+ ${FONT_UNIMAP:+-u "${FONT_UNIMAP}"} 2>/dev/null
- }
-
- dev_close() {
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 313e2d98719358..c21b1a38a57932 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
# Template file for 'dracut'
pkgname=dracut
-version=059
-revision=7
+version=105
+revision=1
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc"
conf_files="/etc/dracut.conf"
@@ -11,10 +11,10 @@ depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
short_desc="Low-level tool for generating an initramfs/initrd image"
maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="https://github.com/dracutdevs/dracut/wiki"
-changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
-distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
-checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
+homepage="https://github.com/dracut-ng/dracut-ng/wiki"
+changelog="https://raw.githubusercontent.com/dracut-ng/dracut-ng/master/NEWS.md"
+distfiles="https://github.com/dracut-ng/dracut-ng/archive/refs/tags/${version}.tar.gz"
+checksum=a5f94012873f589e2efc3659341f5e383ec90419f5c361a6fd3561f946133f69
alternatives="
initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/dracut/kernel-hook-postinst
initramfs:/etc/kernel.d/post-remove/20-initramfs:/usr/libexec/dracut/kernel-hook-postrm
@@ -32,16 +32,11 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
fi
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) # archs supported by dracut for EFI bundle
+ i686*|x86_64*|aarch64*) # archs supported by dracut for EFI bundle
subpackages+=" dracut-uefi"
;;
esac
-pre_build() {
- # Upstream tarball is missing version information
- DRACUT_VERSION="${version}" make dracut-version.sh
-}
-
post_install() {
# kernel hooks.
vinstall ${FILESDIR}/kernel-hook-postinst 755 usr/libexec/dracut
@@ -52,23 +47,21 @@ post_install() {
# systemd dependent additional dracut modules
for f in 06rngd 06dbus-broker 06dbus-daemon 09dbus \
- 35connman 35network-manager 35network-wicked 80lvmmerge \
- 99memstrack 99squash; do
+ 35connman 35network-manager 80lvmmerge \
+ 91fido2 91pcsc 91pkcs11 91tpm2-tss 95squash* \
+ 99memstrack 99squash*; do
rm -r ${DESTDIR}/usr/lib/dracut/modules.d/${f}
done
# don't need s390x architecture dependent dracut modules
for f in 80cms 81cio_ignore 91zipl 95dasd 95dasd_mod \
- 95dasd_rules 95dcssblk 95qeth_rules 95zfcp \
- 95zfcp_rules 95znet; do
+ 95dcssblk 95zfcp 95znet; do
rm -r ${DESTDIR}/usr/lib/dracut/modules.d/${f}
done
- # ifcfg network-scripts dependent (RHEL-derived)
- rm -r ${DESTDIR}/usr/lib/dracut/modules.d/45ifcfg
-
rm ${DESTDIR}/usr/share/man/man8/*.service.*
rm -r ${DESTDIR}/usr/lib/kernel
+ rm -r "${DESTDIR}"/usr/lib/dracut/test
}
dracut-network_package() {
@@ -84,7 +77,7 @@ dracut-network_package() {
}
dracut-uefi_package() {
- depends="binutils gummiboot-efistub ${sourcepkg}>=${version}_${revision}"
+ depends="binutils systemd-boot-efistub ${sourcepkg}>=${version}_${revision}"
short_desc+=" - UEFI bundle hook"
conf_files="/etc/default/dracut-uefi-hook"
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: [PR PATCH] [Updated] dracut: update to 105, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (43 preceding siblings ...)
2024-10-16 17:58 ` [PR PATCH] [Updated] " classabbyamp
@ 2024-10-16 18:00 ` classabbyamp
2024-10-28 19:51 ` [PR PATCH] [Merged]: " classabbyamp
` (3 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: classabbyamp @ 2024-10-16 18:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 531 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages star-dracut-the-next-generation
https://github.com/void-linux/void-packages/pull/51344
dracut: update to 105, switch to dracut-ng
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
@zdykstra
A patch file from https://github.com/void-linux/void-packages/pull/51344.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-star-dracut-the-next-generation-51344.patch --]
[-- Type: text/x-diff, Size: 39743 bytes --]
From b995906e4d18987869fdef241e4264147fa281d9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 19 Jul 2024 16:50:28 -0400
Subject: [PATCH] dracut: update to 105, switch to dracut-ng
---
...408c8644a0add1907b0593eb83f90d6247b1.patch | 45 --
srcpkgs/dracut/patches/amd-ucode-readme.patch | 26 --
srcpkgs/dracut/patches/crypt-openssl-3.patch | 24 --
srcpkgs/dracut/patches/fix-fsck.patch | 27 --
srcpkgs/dracut/patches/force_poweroff.patch | 30 --
.../dracut/patches/isoscan-udev-trigger.patch | 25 --
srcpkgs/dracut/patches/musl-1.1.patch | 97 +++++
srcpkgs/dracut/patches/network.patch | 37 --
.../dracut/patches/plymouth-udev-seat.patch | 9 +-
.../dracut/patches/revert-fw_devlink.patch | 384 ++++++++++++++++++
srcpkgs/dracut/patches/silence-setfont.patch | 19 -
srcpkgs/dracut/template | 33 +-
12 files changed, 499 insertions(+), 257 deletions(-)
delete mode 100644 srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch
delete mode 100644 srcpkgs/dracut/patches/amd-ucode-readme.patch
delete mode 100644 srcpkgs/dracut/patches/crypt-openssl-3.patch
delete mode 100644 srcpkgs/dracut/patches/fix-fsck.patch
delete mode 100644 srcpkgs/dracut/patches/force_poweroff.patch
delete mode 100644 srcpkgs/dracut/patches/isoscan-udev-trigger.patch
create mode 100644 srcpkgs/dracut/patches/musl-1.1.patch
delete mode 100644 srcpkgs/dracut/patches/network.patch
create mode 100644 srcpkgs/dracut/patches/revert-fw_devlink.patch
delete mode 100644 srcpkgs/dracut/patches/silence-setfont.patch
diff --git a/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch b/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch
deleted file mode 100644
index 6d3295c8e26c1a..00000000000000
--- a/srcpkgs/dracut/patches/6c80408c8644a0add1907b0593eb83f90d6247b1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 6c80408c8644a0add1907b0593eb83f90d6247b1 Mon Sep 17 00:00:00 2001
-From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
-Date: Mon, 14 Aug 2023 12:28:11 +0200
-Subject: [PATCH] fix(dracut.sh): remove microcode check based on
- CONFIG_MICROCODE_[AMD|INTEL]
-
-`CONFIG_MICROCODE_AMD` and `CONFIG_MICROCODE_INTEL` are hidden since
-https://lore.kernel.org/all/20230810160805.081212701@linutronix.de/, therefore
-this check is wrong and early microcode is always disabled.
----
- dracut.sh | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index e0abdb3b0..3b292910f 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1561,23 +1561,20 @@ fi
-
- if [[ $early_microcode == yes ]]; then
- if [[ $hostonly ]]; then
-- if [[ $(get_cpu_vendor) == "AMD" ]]; then
-- check_kernel_config CONFIG_MICROCODE_AMD || unset early_microcode
-- elif [[ $(get_cpu_vendor) == "Intel" ]]; then
-- check_kernel_config CONFIG_MICROCODE_INTEL || unset early_microcode
-+ if [[ $(get_cpu_vendor) == "AMD" || $(get_cpu_vendor) == "Intel" ]]; then
-+ check_kernel_config CONFIG_MICROCODE || unset early_microcode
- else
- unset early_microcode
- fi
- else
-- ! check_kernel_config CONFIG_MICROCODE_AMD \
-- && ! check_kernel_config CONFIG_MICROCODE_INTEL \
-+ ! check_kernel_config CONFIG_MICROCODE \
- && unset early_microcode
- fi
- # Do not complain on non-x86 architectures as it makes no sense
- case "${DRACUT_ARCH:-$(uname -m)}" in
- x86_64 | i?86)
- [[ $early_microcode != yes ]] \
-- && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y"
-+ && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE!=y"
- ;;
- *) ;;
- esac
diff --git a/srcpkgs/dracut/patches/amd-ucode-readme.patch b/srcpkgs/dracut/patches/amd-ucode-readme.patch
deleted file mode 100644
index a2ea1288d230b0..00000000000000
--- a/srcpkgs/dracut/patches/amd-ucode-readme.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c1a69b81f6ebd62a40054be2375cb77c040694aa Mon Sep 17 00:00:00 2001
-From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
-Date: Mon, 30 Oct 2023 14:56:39 +0100
-Subject: [PATCH] fix(dracut.sh): skip README for AMD microcode generation
-
-This file was added in https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/amd-ucode/README?id=89ec6198f13d1007563ff87aae5de209e993be07
-and it should be skipped.
-
-Fixes #2541
----
- dracut.sh | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/dracut.sh b/dracut.sh
-index 3b292910f..bd730cbe9 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -2154,6 +2154,8 @@ if [[ $early_microcode == yes ]]; then
- done
- for i in $_fwdir/$_fw/$_src; do
- [[ -e $i ]] || continue
-+ # skip README{.xz,.zst,...}
-+ str_starts "$i" "$_fwdir/$_fw/README" && continue
- # skip gpg files
- str_ends "$i" ".asc" && continue
- cat "$i" >> "$_dest_dir/${ucode_dest[$idx]}"
diff --git a/srcpkgs/dracut/patches/crypt-openssl-3.patch b/srcpkgs/dracut/patches/crypt-openssl-3.patch
deleted file mode 100644
index 39fd3dd3c65e99..00000000000000
--- a/srcpkgs/dracut/patches/crypt-openssl-3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5996f6b5d9b0bb957b4bb02c49c95a057761cba5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
-Date: Mon, 13 Feb 2023 20:22:56 +0000
-Subject: [PATCH] fix(crypt): add missing libraries
-
-Add missing libraries, closes #2137
----
- modules.d/90crypt/module-setup.sh | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/modules.d/90crypt/module-setup.sh
-+++ b/modules.d/90crypt/module-setup.sh
-@@ -176,5 +176,11 @@ install() {
- systemd-ask-password systemd-tty-ask-password-agent
- fi
-
-+ # Install required libraries.
-+ _arch=${DRACUT_ARCH:-$(uname -m)}
-+ inst_libdir_file \
-+ {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/fips.so" \
-+ {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/legacy.so"
-+
- dracut_need_initqueue
- }
diff --git a/srcpkgs/dracut/patches/fix-fsck.patch b/srcpkgs/dracut/patches/fix-fsck.patch
deleted file mode 100644
index 97c72d05e5543c..00000000000000
--- a/srcpkgs/dracut/patches/fix-fsck.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/dracutdevs/dracut/pull/2262
-
-From 26990cb90bf0f516ccbd56583000d6d02ab18acd Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Sat, 4 Mar 2023 23:28:17 +0000
-Subject: [PATCH] fix(fs-lib): remove quoting form the first argument of the
- e2fsck call
-
-Fix regression.
----
- modules.d/99fs-lib/fs-lib.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh
-index dd20731f2..c4640fa8a 100755
---- a/modules.d/99fs-lib/fs-lib.sh
-+++ b/modules.d/99fs-lib/fs-lib.sh
-@@ -107,7 +107,8 @@ fsck_drv_com() {
-
- info "issuing $_drv $_fop $_dev"
- # we enforce non-interactive run, so $() is fine
-- _out=$($_drv "$_fop" "$_dev")
-+ # shellcheck disable=SC2086
-+ _out=$($_drv $_fop "$_dev")
- _ret=$?
- fsck_tail
-
diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch
deleted file mode 100644
index 9056685e32b97a..00000000000000
--- a/srcpkgs/dracut/patches/force_poweroff.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-The shutdown binary is actually provided by runit and expects the runit
-init to be running. This is not the case in the initramfs. Forcing the
-shutdown, halt or reboot is necessary to ignore this requirement.
-
----
- modules.d/99base/dracut-lib.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
---- a/modules.d/99base/dracut-lib.sh
-+++ b/modules.d/99base/dracut-lib.sh
-@@ -1004,13 +1004,13 @@ emergency_shell() {
-
- case "$_emergency_action" in
- reboot)
-- reboot || exit 1
-+ reboot -f || exit 1
- ;;
- poweroff)
-- poweroff || exit 1
-+ poweroff -f || exit 1
- ;;
- halt)
-- halt || exit 1
-+ halt -f || exit 1
- ;;
- esac
- }
---
-2.37.3
diff --git a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch b/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
deleted file mode 100644
index b80e966266b45d..00000000000000
--- a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This upstream accepted patch fixes a bug where the live images don't work when
-booted from grub loopback (void-linux/void-mklive#294).
-
-From d880d62f5f81d7ec69555f5deb60694fdb693c01 Mon Sep 17 00:00:00 2001
-From: 0x5c <dev@0x5c.io>
-Date: Thu, 9 Feb 2023 05:26:30 -0500
-Subject: [PATCH] fix: make iso-scan trigger udev events
-
-Fixes #2183
----
- modules.d/90dmsquash-live/iso-scan.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules.d/90dmsquash-live/iso-scan.sh b/modules.d/90dmsquash-live/iso-scan.sh
-index 886d23033..fa06b33cd 100755
---- a/modules.d/90dmsquash-live/iso-scan.sh
-+++ b/modules.d/90dmsquash-live/iso-scan.sh
-@@ -22,6 +22,7 @@ do_iso_scan() {
- mount -t auto -o ro "$dev" "/run/initramfs/isoscan" || continue
- if [ -f "/run/initramfs/isoscan/$isofile" ]; then
- losetup -f "/run/initramfs/isoscan/$isofile"
-+ udevadm trigger --action=add > /dev/null 2>&1
- ln -s "$dev" /run/initramfs/isoscandev
- rm -f -- "$job"
- exit 0
diff --git a/srcpkgs/dracut/patches/musl-1.1.patch b/srcpkgs/dracut/patches/musl-1.1.patch
new file mode 100644
index 00000000000000..2c73d1c5bf0b57
--- /dev/null
+++ b/srcpkgs/dracut/patches/musl-1.1.patch
@@ -0,0 +1,97 @@
+From c52069f7a0adab4b5c5b911a44d65d3ba0989d7e Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Sat, 12 Oct 2024 20:06:12 -0400
+Subject: [PATCH] Revert "perf(dracut-install): stat() w/unused buf ->
+ access(F_OK) in dracut-install"
+
+This reverts commit e7ed8337bb9fec0283af5dc745450394ba649a03.
+
+This commit broke compatibility with musl 1.1.
+---
+ src/install/dracut-install.c | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/src/install/dracut-install.c b/src/install/dracut-install.c
+index 96bc2eb6..30c51a30 100644
+--- a/src/install/dracut-install.c
++++ b/src/install/dracut-install.c
+@@ -812,7 +812,7 @@ static int dracut_mkdir(const char *src)
+
+ static int dracut_install(const char *orig_src, const char *orig_dst, bool isdir, bool resolvedeps, bool hashdst)
+ {
+- struct stat sb;
++ struct stat sb, db;
+ _cleanup_free_ char *fullsrcpath = NULL;
+ _cleanup_free_ char *fulldstpath = NULL;
+ _cleanup_free_ char *fulldstdir = NULL;
+@@ -898,7 +898,7 @@ static int dracut_install(const char *orig_src, const char *orig_dst, bool isdir
+ return 1;
+ }
+
+- ret = access(fulldstdir, F_OK);
++ ret = stat(fulldstdir, &db);
+
+ if (ret < 0) {
+ _cleanup_free_ char *dname = NULL;
+@@ -958,12 +958,12 @@ static int dracut_install(const char *orig_src, const char *orig_dst, bool isdir
+ return 1;
+ }
+
+- if (faccessat(AT_FDCWD, abspath, F_OK, AT_SYMLINK_NOFOLLOW) != 0) {
++ if (lstat(abspath, &sb) != 0) {
+ log_debug("lstat '%s': %m", abspath);
+ return 1;
+ }
+
+- if (faccessat(AT_FDCWD, fulldstpath, F_OK, AT_SYMLINK_NOFOLLOW) != 0) {
++ if (lstat(fulldstpath, &sb) != 0) {
+ _cleanup_free_ char *absdestpath = NULL;
+
+ _asprintf(&absdestpath, "%s/%s", destrootdir,
+@@ -1313,6 +1313,7 @@ static char **find_binary(const char *src)
+ char *newsrc = NULL;
+
+ STRV_FOREACH(q, pathdirs) {
++ struct stat sb;
+ char *fullsrcpath;
+
+ _asprintf(&newsrc, "%s/%s", *q, src);
+@@ -1325,8 +1326,8 @@ static char **find_binary(const char *src)
+ continue;
+ }
+
+- if (faccessat(AT_FDCWD, fullsrcpath, F_OK, AT_SYMLINK_NOFOLLOW) != 0) {
+- log_debug("lstat(%s) != 0", fullsrcpath);
++ if (lstat(fullsrcpath, &sb) != 0) {
++ log_debug("stat(%s) != 0", fullsrcpath);
+ free(newsrc);
+ newsrc = NULL;
+ free(fullsrcpath);
+@@ -1441,8 +1442,9 @@ static int install_firmware_fullpath(const char *fwpath)
+ {
+ const char *fw = fwpath;
+ _cleanup_free_ char *fwpath_compressed = NULL;
++ struct stat sb;
+ int ret;
+- if (access(fwpath, F_OK) != 0) {
++ if (stat(fwpath, &sb) != 0) {
+ _asprintf(&fwpath_compressed, "%s.zst", fwpath);
+ if (access(fwpath_compressed, F_OK) != 0) {
+ strcpy(fwpath_compressed + strlen(fwpath) + 1, "xz");
+@@ -1485,11 +1487,12 @@ static int install_firmware(struct kmod_module *mod)
+ ret = -1;
+ STRV_FOREACH(q, firmwaredirs) {
+ _cleanup_free_ char *fwpath = NULL;
++ struct stat sb;
+
+ _asprintf(&fwpath, "%s/%s", *q, value);
+
+ if (strpbrk(value, "*?[") != NULL
+- && access(fwpath, F_OK) != 0) {
++ && stat(fwpath, &sb) != 0) {
+ size_t i;
+ _cleanup_globfree_ glob_t globbuf;
+
+--
+2.46.0
+
diff --git a/srcpkgs/dracut/patches/network.patch b/srcpkgs/dracut/patches/network.patch
deleted file mode 100644
index dce39fdc6f7a53..00000000000000
--- a/srcpkgs/dracut/patches/network.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 11a34f6b55f91610effd79ff1bf6a4bb2db760d3 Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Wed, 18 Jan 2023 19:59:24 +0000
-Subject: [PATCH] meta module should check if module exists
-
-Bug: https://github.com/dracutdevs/dracut/issues/1756
----
- modules.d/40network/module-setup.sh | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index 1ab13ef..078cb4b 100755
---- a/modules.d/40network/module-setup.sh
-+++ b/modules.d/40network/module-setup.sh
-@@ -17,15 +17,15 @@ depends() {
- done
-
- if [ -z "$network_handler" ]; then
-- if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
-+ if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]] && [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
- network_handler="network-wicked"
-- elif [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
-+ elif [[ -d "$dracutbasedir"/modules.d/35connman ]] && [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then
- network_handler="connman"
-- elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
-+ elif [[ -d "$dracutbasedir"/modules.d/35network-manager ]] && ( [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] ); then
- network_handler="network-manager"
-- elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
-+ elif [[ -d "$dracutbasedir"/modules.d/01systemd-networkd ]] && [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
- network_handler="systemd-networkd"
-- else
-+ elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then
- network_handler="network-legacy"
- fi
- fi
---
-2.34.1
diff --git a/srcpkgs/dracut/patches/plymouth-udev-seat.patch b/srcpkgs/dracut/patches/plymouth-udev-seat.patch
index 490dd63b310a95..1830b38644e536 100644
--- a/srcpkgs/dracut/patches/plymouth-udev-seat.patch
+++ b/srcpkgs/dracut/patches/plymouth-udev-seat.patch
@@ -1,11 +1,12 @@
+adds udev rule that allows plymouth to work
+
--- a/modules.d/95udev-rules/module-setup.sh 2018-02-19 06:00:33.000000000 -0300
+++ b/modules.d/95udev-rules/module-setup.sh 2018-05-02 00:27:53.710253893 -0300
-@@ -39,6 +39,8 @@
- 60-persistent-storage.rules \
- 61-persistent-storage-edd.rules \
+@@ -49,6 +49,7 @@
+ 70-mouse.rules \
+ 70-touchpad.rules \
70-uaccess.rules \
+ 71-plymouth-seat.rules \
-+ 71-udev-seat.rules \
71-seat.rules \
73-seat-late.rules \
75-net-description.rules \
diff --git a/srcpkgs/dracut/patches/revert-fw_devlink.patch b/srcpkgs/dracut/patches/revert-fw_devlink.patch
new file mode 100644
index 00000000000000..c34caa76451403
--- /dev/null
+++ b/srcpkgs/dracut/patches/revert-fw_devlink.patch
@@ -0,0 +1,384 @@
+From daf80bbb8f8ca5c4ad56772f379110e7434cbc2c Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Wed, 16 Oct 2024 13:45:35 -0400
+Subject: [PATCH] Revert "feat(dracut-install): add fw_devlink suppliers as
+ module dependencies"
+
+...and associated later changes, as they cause serious regressions with
+aarch64 devices like the Lenovo X13s.
+
+see also https://github.com/dracut-ng/dracut-ng/issues/316
+
+This reverts commit 8de0258d71dc5600d715d7534471e35b2b75c7be.
+This reverts commit 07e2c4926780b672922563a6ea0bf1bd4bcfcd9f.
+This reverts commit d71bec4aa444d92820e428c0629d0e75e268c815.
+This reverts commit 6500e95494175819b382acbac8eafcdf72fabd6d.
+This reverts commit 131822e26d76a3ce2028e9a545be2af066805629.
+This reverts commit 3de4c7313260fb600507c9b87f780390b874c870.
+---
+ src/install/dracut-install.c | 245 +++--------------------------------
+ 1 file changed, 15 insertions(+), 230 deletions(-)
+
+diff --git a/src/install/dracut-install.c b/src/install/dracut-install.c
+index 96bc2eb6..96644151 100644
+--- a/src/install/dracut-install.c
++++ b/src/install/dracut-install.c
+@@ -83,9 +83,6 @@ FILE *logfile_f = NULL;
+ static Hashmap *items = NULL;
+ static Hashmap *items_failed = NULL;
+ static Hashmap *modules_loaded = NULL;
+-static Hashmap *modules_suppliers = NULL;
+-static Hashmap *processed_suppliers = NULL;
+-static Hashmap *modalias_to_kmod = NULL;
+ static regex_t mod_filter_path;
+ static regex_t mod_filter_nopath;
+ static regex_t mod_filter_symbol;
+@@ -98,7 +95,7 @@ static bool arg_mod_filter_nosymbol = false;
+ static bool arg_mod_filter_noname = false;
+
+ static int dracut_install(const char *src, const char *dst, bool isdir, bool resolvedeps, bool hashdst);
+-static int install_dependent_modules(struct kmod_ctx *ctx, struct kmod_list *modlist, Hashmap *suppliers_paths);
++static int install_dependent_modules(struct kmod_list *modlist);
+
+ static void item_free(char *i)
+ {
+@@ -1571,164 +1568,7 @@ static bool check_module_path(const char *path)
+ return true;
+ }
+
+-static int find_kmod_module_from_sysfs_driver(struct kmod_ctx *ctx, const char *sysfs_node, int sysfs_node_len,
+- struct kmod_module **module)
+-{
+- char mod_path[PATH_MAX], mod_realpath[PATH_MAX];
+- const char *mod_name;
+- if ((size_t)snprintf(mod_path, sizeof(mod_path), "%.*s/driver/module",
+- sysfs_node_len, sysfs_node) >= sizeof(mod_path))
+- return -1;
+-
+- if (realpath(mod_path, mod_realpath) == NULL)
+- return -1;
+-
+- if ((mod_name = basename(mod_realpath)) == NULL)
+- return -1;
+-
+- return kmod_module_new_from_name(ctx, mod_name, module);
+-}
+-
+-static int find_kmod_module_from_sysfs_modalias(struct kmod_ctx *ctx, const char *sysfs_node, int sysfs_node_len,
+- struct kmod_list **modules)
+-{
+- char modalias_path[PATH_MAX];
+- if ((size_t)snprintf(modalias_path, sizeof(modalias_path), "%.*s/modalias", sysfs_node_len,
+- sysfs_node) >= sizeof(modalias_path))
+- return -1;
+-
+- _cleanup_close_ int modalias_file = -1;
+- if ((modalias_file = open(modalias_path, O_RDONLY | O_CLOEXEC)) == -1)
+- return 0;
+-
+- char alias[page_size()];
+- ssize_t len = read(modalias_file, alias, sizeof(alias));
+- alias[len - 1] = '\0';
+-
+- void *list;
+-
+- if (hashmap_get_exists(modalias_to_kmod, alias, &list) == 1) {
+- *modules = list;
+- return 0;
+- }
+-
+- int ret = kmod_module_new_from_lookup(ctx, alias, modules);
+- if (!ret) {
+- hashmap_put(modalias_to_kmod, strdup(alias), *modules);
+- }
+-
+- return ret;
+-}
+-
+-static int find_modules_from_sysfs_node(struct kmod_ctx *ctx, const char *sysfs_node, Hashmap *modules)
+-{
+- _cleanup_kmod_module_unref_ struct kmod_module *drv = NULL;
+- struct kmod_list *list = NULL;
+- struct kmod_list *l = NULL;
+-
+- if (find_kmod_module_from_sysfs_driver(ctx, sysfs_node, strlen(sysfs_node), &drv) >= 0) {
+- char *module = strdup(kmod_module_get_name(drv));
+- if (hashmap_put(modules, module, module) < 0)
+- free(module);
+- return 0;
+- }
+-
+- if (find_kmod_module_from_sysfs_modalias(ctx, sysfs_node, strlen(sysfs_node), &list) >= 0) {
+- kmod_list_foreach(l, list) {
+- struct kmod_module *mod = kmod_module_get_module(l);
+- char *module = strdup(kmod_module_get_name(mod));
+- kmod_module_unref(mod);
+-
+- if (hashmap_put(modules, module, module) < 0)
+- free(module);
+- }
+- }
+-
+- return 0;
+-}
+-
+-static void find_suppliers_for_sys_node(Hashmap *suppliers, const char *node_path_raw,
+- size_t node_path_len)
+-{
+- char node_path[PATH_MAX];
+- char real_path[PATH_MAX];
+-
+- memcpy(node_path, node_path_raw, node_path_len);
+- node_path[node_path_len] = '\0';
+-
+- DIR *d;
+- struct dirent *dir;
+- while (realpath(node_path, real_path) != NULL && strcmp(real_path, "/sys/devices")) {
+- d = opendir(node_path);
+- if (d) {
+- size_t real_path_len = strlen(real_path);
+- while ((dir = readdir(d)) != NULL) {
+- if (strstr(dir->d_name, "supplier:platform") != NULL) {
+- if ((size_t)snprintf(real_path + real_path_len, sizeof(real_path) - real_path_len, "/%s/supplier",
+- dir->d_name) < sizeof(real_path) - real_path_len) {
+- char *real_supplier_path = realpath(real_path, NULL);
+- if (real_supplier_path != NULL)
+- if (hashmap_put(suppliers, real_supplier_path, real_supplier_path) < 0)
+- free(real_supplier_path);
+- }
+- }
+- }
+- closedir(d);
+- }
+- strcat(node_path, "/.."); // Also find suppliers of parents
+- }
+-}
+-
+-static void find_suppliers(struct kmod_ctx *ctx)
+-{
+- _cleanup_fts_close_ FTS *fts;
+- char *paths[] = { "/sys/devices/platform", NULL };
+- fts = fts_open(paths, FTS_NOSTAT | FTS_PHYSICAL, NULL);
+-
+- for (FTSENT *ftsent = fts_read(fts); ftsent != NULL; ftsent = fts_read(fts)) {
+- if (strcmp(ftsent->fts_name, "modalias") == 0) {
+- _cleanup_kmod_module_unref_ struct kmod_module *drv = NULL;
+- struct kmod_list *list = NULL;
+- struct kmod_list *l;
+-
+- if (find_kmod_module_from_sysfs_driver(ctx, ftsent->fts_parent->fts_path, ftsent->fts_parent->fts_pathlen, &drv) >= 0) {
+- const char *name = kmod_module_get_name(drv);
+- Hashmap *suppliers = hashmap_get(modules_suppliers, name);
+- if (suppliers == NULL) {
+- suppliers = hashmap_new(string_hash_func, string_compare_func);
+- hashmap_put(modules_suppliers, strdup(name), suppliers);
+- }
+-
+- find_suppliers_for_sys_node(suppliers, ftsent->fts_parent->fts_path, ftsent->fts_parent->fts_pathlen);
+-
+- /* Skip modalias check */
+- continue;
+- }
+-
+- if (find_kmod_module_from_sysfs_modalias(ctx, ftsent->fts_parent->fts_path, ftsent->fts_parent->fts_pathlen, &list) < 0)
+- continue;
+-
+- kmod_list_foreach(l, list) {
+- _cleanup_kmod_module_unref_ struct kmod_module *mod = kmod_module_get_module(l);
+- const char *name = kmod_module_get_name(mod);
+- Hashmap *suppliers = hashmap_get(modules_suppliers, name);
+- if (suppliers == NULL) {
+- suppliers = hashmap_new(string_hash_func, string_compare_func);
+- hashmap_put(modules_suppliers, strdup(name), suppliers);
+- }
+-
+- find_suppliers_for_sys_node(suppliers, ftsent->fts_parent->fts_path, ftsent->fts_parent->fts_pathlen);
+- }
+- }
+- }
+-}
+-
+-static Hashmap *find_suppliers_paths_for_module(const char *module)
+-{
+- return hashmap_get(modules_suppliers, module);
+-}
+-
+-static int install_dependent_module(struct kmod_ctx *ctx, struct kmod_module *mod, Hashmap *suppliers_paths, int *err)
++static int install_dependent_module(struct kmod_module *mod, int *err)
+ {
+ const char *path = NULL;
+ const char *name = NULL;
+@@ -1762,13 +1602,13 @@ static int install_dependent_module(struct kmod_ctx *ctx, struct kmod_module *mo
+ log_debug("dracut_install '%s' '%s' OK", path, &path[kerneldirlen]);
+ install_firmware(mod);
+ modlist = kmod_module_get_dependencies(mod);
+- *err = install_dependent_modules(ctx, modlist, suppliers_paths);
++ *err = install_dependent_modules(modlist);
+ if (*err == 0) {
+ *err = kmod_module_get_softdeps(mod, &modpre, &modpost);
+ if (*err == 0) {
+ int r;
+- *err = install_dependent_modules(ctx, modpre, NULL);
+- r = install_dependent_modules(ctx, modpost, NULL);
++ *err = install_dependent_modules(modpre);
++ r = install_dependent_modules(modpost);
+ *err = *err ? : r;
+ }
+ }
+@@ -1786,7 +1626,7 @@ static int install_dependent_module(struct kmod_ctx *ctx, struct kmod_module *mo
+ return 0;
+ }
+
+-static int install_dependent_modules(struct kmod_ctx *ctx, struct kmod_list *modlist, Hashmap *suppliers_paths)
++static int install_dependent_modules(struct kmod_list *modlist)
+ {
+ struct kmod_list *itr = NULL;
+ int ret = 0;
+@@ -1794,44 +1634,14 @@ static int install_dependent_modules(struct kmod_ctx *ctx, struct kmod_list *mod
+ kmod_list_foreach(itr, modlist) {
+ _cleanup_kmod_module_unref_ struct kmod_module *mod = NULL;
+ mod = kmod_module_get_module(itr);
+- if (install_dependent_module(ctx, mod, find_suppliers_paths_for_module(kmod_module_get_name(mod)), &ret))
++ if (install_dependent_module(mod, &ret))
+ return -1;
+ }
+
+- const char *supplier_path;
+- Iterator i;
+- HASHMAP_FOREACH(supplier_path, suppliers_paths, i) {
+- if (check_hashmap(processed_suppliers, supplier_path))
+- continue;
+-
+- char *path = strdup(supplier_path);
+- hashmap_put(processed_suppliers, path, path);
+-
+- _cleanup_destroy_hashmap_ Hashmap *modules = hashmap_new(string_hash_func, string_compare_func);
+- find_modules_from_sysfs_node(ctx, supplier_path, modules);
+-
+- _cleanup_destroy_hashmap_ Hashmap *suppliers = hashmap_new(string_hash_func, string_compare_func);
+- find_suppliers_for_sys_node(suppliers, supplier_path, strlen(supplier_path));
+-
+- if (!hashmap_isempty(modules)) { // Supplier is a module
+- const char *module;
+- Iterator j;
+- HASHMAP_FOREACH(module, modules, j) {
+- _cleanup_kmod_module_unref_ struct kmod_module *mod = NULL;
+- if (!kmod_module_new_from_name(ctx, module, &mod)) {
+- if (install_dependent_module(ctx, mod, suppliers, &ret))
+- return -1;
+- }
+- }
+- } else { // Supplier is builtin
+- install_dependent_modules(ctx, NULL, suppliers);
+- }
+- }
+-
+ return ret;
+ }
+
+-static int install_module(struct kmod_ctx *ctx, struct kmod_module *mod)
++static int install_module(struct kmod_module *mod)
+ {
+ int ret = 0;
+ _cleanup_kmod_module_unref_list_ struct kmod_list *modlist = NULL;
+@@ -1884,16 +1694,15 @@ static int install_module(struct kmod_ctx *ctx, struct kmod_module *mod)
+ }
+ install_firmware(mod);
+
+- Hashmap *suppliers = find_suppliers_paths_for_module(name);
+ modlist = kmod_module_get_dependencies(mod);
+- ret = install_dependent_modules(ctx, modlist, suppliers);
++ ret = install_dependent_modules(modlist);
+
+ if (ret == 0) {
+ ret = kmod_module_get_softdeps(mod, &modpre, &modpost);
+ if (ret == 0) {
+ int r;
+- ret = install_dependent_modules(ctx, modpre, NULL);
+- r = install_dependent_modules(ctx, modpost, NULL);
++ ret = install_dependent_modules(modpre);
++ r = install_dependent_modules(modpost);
+ ret = ret ? : r;
+ }
+ }
+@@ -2012,9 +1821,6 @@ static int install_modules(int argc, char **argv)
+ if (p != NULL)
+ kerneldirlen = p - abskpath;
+
+- modules_suppliers = hashmap_new(string_hash_func, string_compare_func);
+- find_suppliers(ctx);
+-
+ if (arg_hostonly) {
+ char *modalias_file;
+ modalias_file = getenv("DRACUT_KERNEL_MODALIASES");
+@@ -2102,7 +1908,7 @@ static int install_modules(int argc, char **argv)
+ }
+ kmod_list_foreach(itr, modlist) {
+ mod = kmod_module_get_module(itr);
+- r = install_module(ctx, mod);
++ r = install_module(mod);
+ kmod_module_unref(mod);
+ if ((r < 0) && !arg_optional) {
+ if (!arg_silent)
+@@ -2181,7 +1987,7 @@ static int install_modules(int argc, char **argv)
+ }
+ kmod_list_foreach(itr, modlist) {
+ mod = kmod_module_get_module(itr);
+- r = install_module(ctx, mod);
++ r = install_module(mod);
+ kmod_module_unref(mod);
+ if ((r < 0) && !arg_optional) {
+ if (!arg_silent)
+@@ -2232,7 +2038,7 @@ static int install_modules(int argc, char **argv)
+ }
+ kmod_list_foreach(itr, modlist) {
+ mod = kmod_module_get_module(itr);
+- r = install_module(ctx, mod);
++ r = install_module(mod);
+ kmod_module_unref(mod);
+ if ((r < 0) && !arg_optional) {
+ if (!arg_silent)
+@@ -2333,10 +2139,8 @@ int main(int argc, char **argv)
+
+ items = hashmap_new(string_hash_func, string_compare_func);
+ items_failed = hashmap_new(string_hash_func, string_compare_func);
+- processed_suppliers = hashmap_new(string_hash_func, string_compare_func);
+- modalias_to_kmod = hashmap_new(string_hash_func, string_compare_func);
+
+- if (!items || !items_failed || !processed_suppliers || !modules_loaded) {
++ if (!items || !items_failed || !modules_loaded) {
+ log_error("Out of memory");
+ r = EXIT_FAILURE;
+ goto finish1;
+@@ -2397,28 +2201,9 @@ finish2:
+ while ((i = hashmap_steal_first(items_failed)))
+ item_free(i);
+
+- Hashmap *h;
+- while ((h = hashmap_steal_first(modules_suppliers))) {
+- while ((i = hashmap_steal_first(h))) {
+- item_free(i);
+- }
+- hashmap_free(h);
+- }
+-
+- while ((i = hashmap_steal_first(processed_suppliers)))
+- item_free(i);
+-
+- /*
+- * Note: modalias_to_kmod's values are freed implicitly by the kmod context destruction
+- * in kmod_unref().
+- */
+-
+ hashmap_free(items);
+ hashmap_free(items_failed);
+ hashmap_free(modules_loaded);
+- hashmap_free(modules_suppliers);
+- hashmap_free(processed_suppliers);
+- hashmap_free(modalias_to_kmod);
+
+ if (arg_mod_filter_path)
+ regfree(&mod_filter_path);
+--
+2.46.0
+
diff --git a/srcpkgs/dracut/patches/silence-setfont.patch b/srcpkgs/dracut/patches/silence-setfont.patch
deleted file mode 100644
index 377c0f3a8981a7..00000000000000
--- a/srcpkgs/dracut/patches/silence-setfont.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/void-linux/void-packages/issues/45216
-
-I'm tired of seeing these setfont errors. This will hopefully/eventually be upstreamed, but I'm not holding my breath.
-
----
-
-diff --git a/modules.d/10i18n/console_init.sh b/modules.d/10i18n/console_init.sh
-index 3fe3b673..0e19ae30 100755
---- a/modules.d/10i18n/console_init.sh
-+++ b/modules.d/10i18n/console_init.sh
-@@ -49,7 +49,7 @@ set_font() {
- setfont "${FONT-${DEFAULT_FONT}}" \
- -C "${1}" \
- ${FONT_MAP:+-m "${FONT_MAP}"} \
-- ${FONT_UNIMAP:+-u "${FONT_UNIMAP}"}
-+ ${FONT_UNIMAP:+-u "${FONT_UNIMAP}"} 2>/dev/null
- }
-
- dev_close() {
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 313e2d98719358..c21b1a38a57932 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
# Template file for 'dracut'
pkgname=dracut
-version=059
-revision=7
+version=105
+revision=1
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc"
conf_files="/etc/dracut.conf"
@@ -11,10 +11,10 @@ depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
short_desc="Low-level tool for generating an initramfs/initrd image"
maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="https://github.com/dracutdevs/dracut/wiki"
-changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md"
-distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz"
-checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf
+homepage="https://github.com/dracut-ng/dracut-ng/wiki"
+changelog="https://raw.githubusercontent.com/dracut-ng/dracut-ng/master/NEWS.md"
+distfiles="https://github.com/dracut-ng/dracut-ng/archive/refs/tags/${version}.tar.gz"
+checksum=a5f94012873f589e2efc3659341f5e383ec90419f5c361a6fd3561f946133f69
alternatives="
initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/dracut/kernel-hook-postinst
initramfs:/etc/kernel.d/post-remove/20-initramfs:/usr/libexec/dracut/kernel-hook-postrm
@@ -32,16 +32,11 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
fi
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*) # archs supported by dracut for EFI bundle
+ i686*|x86_64*|aarch64*) # archs supported by dracut for EFI bundle
subpackages+=" dracut-uefi"
;;
esac
-pre_build() {
- # Upstream tarball is missing version information
- DRACUT_VERSION="${version}" make dracut-version.sh
-}
-
post_install() {
# kernel hooks.
vinstall ${FILESDIR}/kernel-hook-postinst 755 usr/libexec/dracut
@@ -52,23 +47,21 @@ post_install() {
# systemd dependent additional dracut modules
for f in 06rngd 06dbus-broker 06dbus-daemon 09dbus \
- 35connman 35network-manager 35network-wicked 80lvmmerge \
- 99memstrack 99squash; do
+ 35connman 35network-manager 80lvmmerge \
+ 91fido2 91pcsc 91pkcs11 91tpm2-tss 95squash* \
+ 99memstrack 99squash*; do
rm -r ${DESTDIR}/usr/lib/dracut/modules.d/${f}
done
# don't need s390x architecture dependent dracut modules
for f in 80cms 81cio_ignore 91zipl 95dasd 95dasd_mod \
- 95dasd_rules 95dcssblk 95qeth_rules 95zfcp \
- 95zfcp_rules 95znet; do
+ 95dcssblk 95zfcp 95znet; do
rm -r ${DESTDIR}/usr/lib/dracut/modules.d/${f}
done
- # ifcfg network-scripts dependent (RHEL-derived)
- rm -r ${DESTDIR}/usr/lib/dracut/modules.d/45ifcfg
-
rm ${DESTDIR}/usr/share/man/man8/*.service.*
rm -r ${DESTDIR}/usr/lib/kernel
+ rm -r "${DESTDIR}"/usr/lib/dracut/test
}
dracut-network_package() {
@@ -84,7 +77,7 @@ dracut-network_package() {
}
dracut-uefi_package() {
- depends="binutils gummiboot-efistub ${sourcepkg}>=${version}_${revision}"
+ depends="binutils systemd-boot-efistub ${sourcepkg}>=${version}_${revision}"
short_desc+=" - UEFI bundle hook"
conf_files="/etc/default/dracut-uefi-hook"
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: [PR PATCH] [Merged]: dracut: update to 105, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (44 preceding siblings ...)
2024-10-16 18:00 ` classabbyamp
@ 2024-10-28 19:51 ` classabbyamp
2024-11-03 16:18 ` TeusLollo
` (2 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: classabbyamp @ 2024-10-28 19:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 341 bytes --]
There's a merged pull request on the void-packages repository
dracut: update to 105, switch to dracut-ng
https://github.com/void-linux/void-packages/pull/51344
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
@zdykstra
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 105, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (45 preceding siblings ...)
2024-10-28 19:51 ` [PR PATCH] [Merged]: " classabbyamp
@ 2024-11-03 16:18 ` TeusLollo
2024-11-03 16:24 ` classabbyamp
2024-11-03 19:09 ` jozzsi
48 siblings, 0 replies; 50+ messages in thread
From: TeusLollo @ 2024-11-03 16:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 576 bytes --]
New comment by TeusLollo on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2453483245
Comment:
@classabbyamp Just wanted to drop here that this user on reddit put up this extensive issue thread, but won't apparently open an issue here presumably due to woes with github: https://reddit.com/r/voidlinux/comments/1gi4lwh/recent_issues_with_initramfs_generation/
I thought you should be informed, since we're switching to a new fork and all. I myself will be doing some tests in the next few days in case I can spot some bugs.
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 105, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (46 preceding siblings ...)
2024-11-03 16:18 ` TeusLollo
@ 2024-11-03 16:24 ` classabbyamp
2024-11-03 19:09 ` jozzsi
48 siblings, 0 replies; 50+ messages in thread
From: classabbyamp @ 2024-11-03 16:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2453485086
Comment:
make an issue instead of necrobumping a PR
^ permalink raw reply [flat|nested] 50+ messages in thread* Re: dracut: update to 105, switch to dracut-ng
2024-07-19 20:52 [PR PATCH] dracut: update to 103, switch to dracut-ng classabbyamp
` (47 preceding siblings ...)
2024-11-03 16:24 ` classabbyamp
@ 2024-11-03 19:09 ` jozzsi
48 siblings, 0 replies; 50+ messages in thread
From: jozzsi @ 2024-11-03 19:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
New comment by jozzsi on void-packages repository
https://github.com/void-linux/void-packages/pull/51344#issuecomment-2453544468
Comment:
https://github.com/dracut-ng/dracut-ng/issues/860
^ permalink raw reply [flat|nested] 50+ messages in thread