Re: [PR PATCH] [Updated] dracut: update to 104, switch to dracut-ng

[classabbyamp <classabbyamp@users.noreply.github.com>]

[-- 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"