[PR PATCH] [NEED TESTER] dracut update to 051

[PR PATCH] [NEED TESTER] dracut update to 051

[sgn]

[-- Attachment #1: Type: text/plain, Size: 786 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages dracut-051
https://github.com/void-linux/void-packages/pull/28137

[NEED TESTER] dracut update to 051
Since I'm bored, I'll step to be next person who breaks dracut (the other reason is I'm using a patched version of dracut that included by this version).

- This PR would require lot of testing, so I include a separated change to fix for bootchart from #28136 since I expect that one will be merged soon enough.
- From this version, dracut will print warning if `kernel_modules` or `kernel_cmdline` `+=` but not surrounding by whitespace, hence the change to `nvme-cli`

A patch file from https://github.com/void-linux/void-packages/pull/28137.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dracut-051-28137.patch --]
[-- Type: text/x-diff, Size: 12542 bytes --]

From c57e1b011d27e985f108b52934ae6cc958e0ffec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 16:09:02 +0700
Subject: [PATCH 1/3] dracut: fix 00bootchart's requirements

---
 .../dracut/patches/00bootchart-requirements.patch  | 14 ++++++++++++++
 srcpkgs/dracut/template                            |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/dracut/patches/00bootchart-requirements.patch

diff --git a/srcpkgs/dracut/patches/00bootchart-requirements.patch b/srcpkgs/dracut/patches/00bootchart-requirements.patch
new file mode 100644
index 00000000000..a617565a0c1
--- /dev/null
+++ b/srcpkgs/dracut/patches/00bootchart-requirements.patch
@@ -0,0 +1,14 @@
+--- modules.d/00bootchart/module-setup.sh.orig	2021-01-24 16:00:46.529880095 +0700
++++ modules.d/00bootchart/module-setup.sh	2021-01-24 16:00:56.134911133 +0700
+@@ -19,10 +19,8 @@
+ 
+     inst_multiple bootchartd bash \
+         /lib/bootchart/bootchart-collector /etc/bootchartd.conf \
+-        accton \
+         echo \
+-        grep \
+-        usleep
++        grep
+ 
+     inst /usr/bin/pkill /bin/pkill
+     inst /usr/bin/[  /bin/[
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 27743569eda..53cee6c4ff2 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
 # Template file for 'dracut'
 pkgname=dracut
 version=050
-revision=9
+revision=10
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"

From 1156987a6d5b4bcc190714f6aa090f11576799ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 16:32:38 +0700
Subject: [PATCH 2/3] dracut: update to 051.

---
 ...-ask-no-warn-if-run-cryptsetup-exist.patch | 39 -------------
 .../dracut/patches/better-arch-regex.patch    | 32 -----------
 .../patches/fix-early-microcode-non-x86.patch | 57 -------------------
 srcpkgs/dracut/patches/fix-ia32-uefi.patch    | 25 --------
 .../patches/ppcmac-respect-dracut-arch.patch  | 37 ------------
 srcpkgs/dracut/template                       |  6 +-
 6 files changed, 3 insertions(+), 193 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch
 delete mode 100644 srcpkgs/dracut/patches/better-arch-regex.patch
 delete mode 100644 srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch
 delete mode 100644 srcpkgs/dracut/patches/fix-ia32-uefi.patch
 delete mode 100644 srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch

diff --git a/srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch b/srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch
deleted file mode 100644
index 396fb7c05d4..00000000000
--- a/srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 2edc52848eaf2331cdcce64f92d8e76947c01a66 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Sat, 14 Mar 2020 11:44:47 +0700
-Subject: [PATCH] cryptroot-ask: no warn if /run/cryptsetup exist
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In either case:
-- encrypted device is decrypted, udev will trigger device changes again,
-- multiple encrypted device,
-
-cryptroot-ask will run multiple time, then report:
-> mkdir: cannot create directory '/run/cryptsetup': File exists
-
-Pass `-p` into mkdir to ignore that warning.
-
-Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
----
- modules.d/90crypt/cryptroot-ask.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git modules.d/90crypt/cryptroot-ask.sh modules.d/90crypt/cryptroot-ask.sh
-index e1f17975..97047ae9 100755
---- modules.d/90crypt/cryptroot-ask.sh
-+++ modules.d/90crypt/cryptroot-ask.sh
-@@ -8,7 +8,7 @@ NEWROOT=${NEWROOT:-"/sysroot"}
- 
- . /lib/dracut-lib.sh
- 
--mkdir -m 0700 /run/cryptsetup
-+mkdir -p -m 0700 /run/cryptsetup
- 
- # if device name is /dev/dm-X, convert to /dev/mapper/name
- if [ "${1##/dev/dm-}" != "$1" ]; then
--- 
-2.26.0.rc1.191.g7acaab7404
-
diff --git a/srcpkgs/dracut/patches/better-arch-regex.patch b/srcpkgs/dracut/patches/better-arch-regex.patch
deleted file mode 100644
index 75d51034dff..00000000000
--- a/srcpkgs/dracut/patches/better-arch-regex.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0e6859c98a90a1b44abc6f29ba64628afc1be7cb Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:29:23 +0200
-Subject: [PATCH 3/4] mkinitrd-dracut.sh: use vmlinux regex for ppc*, vmlinuz
- for i686
-
-Previously this would not catch ppc64le, now it does; same with
-i686.
----
- mkinitrd-dracut.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git mkinitrd-dracut.sh mkinitrd-dracut.sh
-index 82d90684..1ea3e514 100755
---- mkinitrd-dracut.sh
-+++ mkinitrd-dracut.sh
-@@ -57,10 +57,10 @@ default_kernel_images() {
-         s390|s390x)
-             regex='image'
-             ;;
--        ppc|ppc64)
-+        ppc*)
-             regex='vmlinux'
-             ;;
--        i386|x86_64)
-+        i*86|x86_64)
-             regex='vmlinuz'
-             ;;
-         arm*)
--- 
-2.27.0
-
diff --git a/srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch b/srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch
deleted file mode 100644
index 406e695f9a2..00000000000
--- a/srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From d690d736a71e18711b94098da24f56b392c7e6f7 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:28:16 +0200
-Subject: [PATCH 2/4] dracut.sh: fix early microcode detection logic
-
-This fixes two issues:
-
-1) on non-x86 systems in non-hostonly config this would cause
-   an annoying warning on every initramfs generation
-2) on non-x86 systems in hostonly config this would result in
-   early microcode not getting disabled
----
- dracut.sh | 23 +++++++++++++++--------
- 1 file changed, 15 insertions(+), 8 deletions(-)
-
-diff --git dracut.sh dracut.sh
-index 58ff24d1..cd3fcbe2 100755
---- dracut.sh
-+++ dracut.sh
-@@ -1194,19 +1194,26 @@ fi
- 
- if [[ $early_microcode = yes ]]; then
-     if [[ $hostonly ]]; then
--        [[ $(get_cpu_vendor) == "AMD" ]] \
--            && ! check_kernel_config CONFIG_MICROCODE_AMD \
--            && unset early_microcode
--        [[ $(get_cpu_vendor) == "Intel" ]] \
--            && ! check_kernel_config CONFIG_MICROCODE_INTEL \
--            && unset early_microcode
-+        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
-+        else
-+            unset early_microcode
-+        fi
-     else
-         ! check_kernel_config CONFIG_MICROCODE_AMD \
-             && ! check_kernel_config CONFIG_MICROCODE_INTEL \
-             && unset early_microcode
-     fi
--    [[ $early_microcode != yes ]] \
--        && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y"
-+    # Do not complain on non-x86 architectures as it makes no sense
-+    case $(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"
-+            ;;
-+        *) ;;
-+    esac
- fi
- 
- # Need to be able to have non-root users read stuff (rpcbind etc)
--- 
-2.27.0
-
diff --git a/srcpkgs/dracut/patches/fix-ia32-uefi.patch b/srcpkgs/dracut/patches/fix-ia32-uefi.patch
deleted file mode 100644
index b4a79092d69..00000000000
--- a/srcpkgs/dracut/patches/fix-ia32-uefi.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e1bce654f1bd739cf1f975ff0a1f766221c3d4ee Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:20:40 +0200
-Subject: [PATCH 1/4] dracut.sh: fix ia32 detection for uefi executables
-
----
- dracut.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git dracut.sh dracut.sh
-index e3195499..58ff24d1 100755
---- dracut.sh
-+++ dracut.sh
-@@ -1153,7 +1153,7 @@ if [[ ! $print_cmdline ]]; then
-         case $(uname -m) in
-             x86_64)
-                 EFI_MACHINE_TYPE_NAME=x64;;
--            ia32)
-+            i*86)
-                 EFI_MACHINE_TYPE_NAME=ia32;;
-             *)
-                 dfatal "Architecture '$(uname -m)' not supported to create a UEFI executable"
--- 
-2.27.0
-
diff --git a/srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch b/srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch
deleted file mode 100644
index b569572a6bc..00000000000
--- a/srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From c26b5c7559c297aaa6c78787fa8de18bbf090205 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:47:00 +0200
-Subject: [PATCH 4/4] 90ppcmac: respect DRACUT_ARCH, don't exclude ppcle
-
----
- modules.d/90ppcmac/module-setup.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git modules.d/90ppcmac/module-setup.sh modules.d/90ppcmac/module-setup.sh
-index 59221ec4..7199dd9b 100644
---- modules.d/90ppcmac/module-setup.sh
-+++ modules.d/90ppcmac/module-setup.sh
-@@ -17,9 +17,9 @@
- 
- # called by dracut
- check() {
--    local _arch="$(uname -m)"
-+    local _arch=${DRACUT_ARCH:-$(uname -m)}
-     # only for PowerPC Macs
--    [[ "$_arch" == ppc* && "$_arch" != ppc*le ]] || return 1
-+    [[ "$_arch" == ppc* && "$_arch" != ppc64le ]] || return 1
-     return 0
- }
- 
-@@ -36,7 +36,7 @@ installkernel() {
-     }
- 
-     # only PowerMac3,6 has a module, special case
--    if [[ "$(uname -m)" == ppc ]]; then
-+    if [[ "${DRACUT_ARCH:-$(uname -m)}" != ppc64* ]]; then
-         if ! [[ $hostonly ]] || [[ "$(pmac_model)" == "PowerMac3,6" ]]; then
-             instmods therm_windtunnel
-         fi
--- 
-2.27.0
-
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 53cee6c4ff2..a16a67a9693 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
 # Template file for 'dracut'
 pkgname=dracut
-version=050
-revision=10
+version=051
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
@@ -14,7 +14,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html"
 distfiles="https://github.com/dracutdevs/dracut/archive/${version}.tar.gz"
-checksum=f9dbf18597e5929221365964293212c8c9ffb7d84529c5a338c834ecab06e333
+checksum=f6b93bd40f25c00a220730d276135b438eb73fe36d602bb93e098e6361c6fa0f
 subpackages="dracut-network"
 
 make_dirs="

From 17aed252833927354be6a9f98d88025de8638da4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 16:41:25 +0700
Subject: [PATCH 3/3] nvme-cli: fix dracut 051 warning

---
 srcpkgs/nvme-cli/patches/dracut-warning.patch | 5 +++++
 srcpkgs/nvme-cli/template                     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/nvme-cli/patches/dracut-warning.patch

diff --git a/srcpkgs/nvme-cli/patches/dracut-warning.patch b/srcpkgs/nvme-cli/patches/dracut-warning.patch
new file mode 100644
index 00000000000..966ce6c0ec9
--- /dev/null
+++ b/srcpkgs/nvme-cli/patches/dracut-warning.patch
@@ -0,0 +1,5 @@
+--- nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in.orig	2021-01-24 16:37:06.346511231 +0700
++++ nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in	2021-01-24 16:38:01.351158511 +0700
+@@ -1 +1 @@
+-install_items+="@@UDEVRULESDIR@@/70-nvmf-autoconnect.rules"
++install_items+=" @@UDEVRULESDIR@@/70-nvmf-autoconnect.rules "
diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index 8a731eae208..0da50f2663e 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'nvme-cli'
 pkgname=nvme-cli
 version=1.13
-revision=1
+revision=2
 build_style=gnu-makefile
 # yeah, it must be 0 to enable
 make_build_args="LIBUUID=0"

Re: [PR PATCH] [Updated] [NEED TESTER] dracut update to 051

[sgn]

[-- Attachment #1: Type: text/plain, Size: 791 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages dracut-051
https://github.com/void-linux/void-packages/pull/28137

[NEED TESTER] dracut update to 051
Since I'm bored, I'll step to be next person who breaks dracut (the other reason is I'm using a patched version of dracut that included by this version).

- This PR would require lot of testing, so I include a separated change to fix for bootchart from #28136 since I expect that one will be merged soon enough.
- From this version, dracut will print warning if `kernel_modules` or `kernel_cmdline` `+=` but not surrounding by whitespace, hence the change to `nvme-cli`

A patch file from https://github.com/void-linux/void-packages/pull/28137.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dracut-051-28137.patch --]
[-- Type: text/x-diff, Size: 12917 bytes --]

From c57e1b011d27e985f108b52934ae6cc958e0ffec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 16:09:02 +0700
Subject: [PATCH 1/3] dracut: fix 00bootchart's requirements

---
 .../dracut/patches/00bootchart-requirements.patch  | 14 ++++++++++++++
 srcpkgs/dracut/template                            |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/dracut/patches/00bootchart-requirements.patch

diff --git a/srcpkgs/dracut/patches/00bootchart-requirements.patch b/srcpkgs/dracut/patches/00bootchart-requirements.patch
new file mode 100644
index 00000000000..a617565a0c1
--- /dev/null
+++ b/srcpkgs/dracut/patches/00bootchart-requirements.patch
@@ -0,0 +1,14 @@
+--- modules.d/00bootchart/module-setup.sh.orig	2021-01-24 16:00:46.529880095 +0700
++++ modules.d/00bootchart/module-setup.sh	2021-01-24 16:00:56.134911133 +0700
+@@ -19,10 +19,8 @@
+ 
+     inst_multiple bootchartd bash \
+         /lib/bootchart/bootchart-collector /etc/bootchartd.conf \
+-        accton \
+         echo \
+-        grep \
+-        usleep
++        grep
+ 
+     inst /usr/bin/pkill /bin/pkill
+     inst /usr/bin/[  /bin/[
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 27743569eda..53cee6c4ff2 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
 # Template file for 'dracut'
 pkgname=dracut
 version=050
-revision=9
+revision=10
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"

From cf07aa2f47d66e81c22ff937d9dc5ad713428ef5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 16:32:38 +0700
Subject: [PATCH 2/3] dracut: update to 051.

---
 ...-ask-no-warn-if-run-cryptsetup-exist.patch | 39 -------------
 .../dracut/patches/better-arch-regex.patch    | 32 -----------
 .../patches/fix-early-microcode-non-x86.patch | 57 -------------------
 srcpkgs/dracut/patches/fix-ia32-uefi.patch    | 25 --------
 .../patches/ppcmac-respect-dracut-arch.patch  | 37 ------------
 srcpkgs/dracut/template                       | 11 ++--
 6 files changed, 5 insertions(+), 196 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch
 delete mode 100644 srcpkgs/dracut/patches/better-arch-regex.patch
 delete mode 100644 srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch
 delete mode 100644 srcpkgs/dracut/patches/fix-ia32-uefi.patch
 delete mode 100644 srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch

diff --git a/srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch b/srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch
deleted file mode 100644
index 396fb7c05d4..00000000000
--- a/srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 2edc52848eaf2331cdcce64f92d8e76947c01a66 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Sat, 14 Mar 2020 11:44:47 +0700
-Subject: [PATCH] cryptroot-ask: no warn if /run/cryptsetup exist
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In either case:
-- encrypted device is decrypted, udev will trigger device changes again,
-- multiple encrypted device,
-
-cryptroot-ask will run multiple time, then report:
-> mkdir: cannot create directory '/run/cryptsetup': File exists
-
-Pass `-p` into mkdir to ignore that warning.
-
-Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
----
- modules.d/90crypt/cryptroot-ask.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git modules.d/90crypt/cryptroot-ask.sh modules.d/90crypt/cryptroot-ask.sh
-index e1f17975..97047ae9 100755
---- modules.d/90crypt/cryptroot-ask.sh
-+++ modules.d/90crypt/cryptroot-ask.sh
-@@ -8,7 +8,7 @@ NEWROOT=${NEWROOT:-"/sysroot"}
- 
- . /lib/dracut-lib.sh
- 
--mkdir -m 0700 /run/cryptsetup
-+mkdir -p -m 0700 /run/cryptsetup
- 
- # if device name is /dev/dm-X, convert to /dev/mapper/name
- if [ "${1##/dev/dm-}" != "$1" ]; then
--- 
-2.26.0.rc1.191.g7acaab7404
-
diff --git a/srcpkgs/dracut/patches/better-arch-regex.patch b/srcpkgs/dracut/patches/better-arch-regex.patch
deleted file mode 100644
index 75d51034dff..00000000000
--- a/srcpkgs/dracut/patches/better-arch-regex.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0e6859c98a90a1b44abc6f29ba64628afc1be7cb Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:29:23 +0200
-Subject: [PATCH 3/4] mkinitrd-dracut.sh: use vmlinux regex for ppc*, vmlinuz
- for i686
-
-Previously this would not catch ppc64le, now it does; same with
-i686.
----
- mkinitrd-dracut.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git mkinitrd-dracut.sh mkinitrd-dracut.sh
-index 82d90684..1ea3e514 100755
---- mkinitrd-dracut.sh
-+++ mkinitrd-dracut.sh
-@@ -57,10 +57,10 @@ default_kernel_images() {
-         s390|s390x)
-             regex='image'
-             ;;
--        ppc|ppc64)
-+        ppc*)
-             regex='vmlinux'
-             ;;
--        i386|x86_64)
-+        i*86|x86_64)
-             regex='vmlinuz'
-             ;;
-         arm*)
--- 
-2.27.0
-
diff --git a/srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch b/srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch
deleted file mode 100644
index 406e695f9a2..00000000000
--- a/srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From d690d736a71e18711b94098da24f56b392c7e6f7 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:28:16 +0200
-Subject: [PATCH 2/4] dracut.sh: fix early microcode detection logic
-
-This fixes two issues:
-
-1) on non-x86 systems in non-hostonly config this would cause
-   an annoying warning on every initramfs generation
-2) on non-x86 systems in hostonly config this would result in
-   early microcode not getting disabled
----
- dracut.sh | 23 +++++++++++++++--------
- 1 file changed, 15 insertions(+), 8 deletions(-)
-
-diff --git dracut.sh dracut.sh
-index 58ff24d1..cd3fcbe2 100755
---- dracut.sh
-+++ dracut.sh
-@@ -1194,19 +1194,26 @@ fi
- 
- if [[ $early_microcode = yes ]]; then
-     if [[ $hostonly ]]; then
--        [[ $(get_cpu_vendor) == "AMD" ]] \
--            && ! check_kernel_config CONFIG_MICROCODE_AMD \
--            && unset early_microcode
--        [[ $(get_cpu_vendor) == "Intel" ]] \
--            && ! check_kernel_config CONFIG_MICROCODE_INTEL \
--            && unset early_microcode
-+        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
-+        else
-+            unset early_microcode
-+        fi
-     else
-         ! check_kernel_config CONFIG_MICROCODE_AMD \
-             && ! check_kernel_config CONFIG_MICROCODE_INTEL \
-             && unset early_microcode
-     fi
--    [[ $early_microcode != yes ]] \
--        && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y"
-+    # Do not complain on non-x86 architectures as it makes no sense
-+    case $(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"
-+            ;;
-+        *) ;;
-+    esac
- fi
- 
- # Need to be able to have non-root users read stuff (rpcbind etc)
--- 
-2.27.0
-
diff --git a/srcpkgs/dracut/patches/fix-ia32-uefi.patch b/srcpkgs/dracut/patches/fix-ia32-uefi.patch
deleted file mode 100644
index b4a79092d69..00000000000
--- a/srcpkgs/dracut/patches/fix-ia32-uefi.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e1bce654f1bd739cf1f975ff0a1f766221c3d4ee Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:20:40 +0200
-Subject: [PATCH 1/4] dracut.sh: fix ia32 detection for uefi executables
-
----
- dracut.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git dracut.sh dracut.sh
-index e3195499..58ff24d1 100755
---- dracut.sh
-+++ dracut.sh
-@@ -1153,7 +1153,7 @@ if [[ ! $print_cmdline ]]; then
-         case $(uname -m) in
-             x86_64)
-                 EFI_MACHINE_TYPE_NAME=x64;;
--            ia32)
-+            i*86)
-                 EFI_MACHINE_TYPE_NAME=ia32;;
-             *)
-                 dfatal "Architecture '$(uname -m)' not supported to create a UEFI executable"
--- 
-2.27.0
-
diff --git a/srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch b/srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch
deleted file mode 100644
index b569572a6bc..00000000000
--- a/srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From c26b5c7559c297aaa6c78787fa8de18bbf090205 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:47:00 +0200
-Subject: [PATCH 4/4] 90ppcmac: respect DRACUT_ARCH, don't exclude ppcle
-
----
- modules.d/90ppcmac/module-setup.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git modules.d/90ppcmac/module-setup.sh modules.d/90ppcmac/module-setup.sh
-index 59221ec4..7199dd9b 100644
---- modules.d/90ppcmac/module-setup.sh
-+++ modules.d/90ppcmac/module-setup.sh
-@@ -17,9 +17,9 @@
- 
- # called by dracut
- check() {
--    local _arch="$(uname -m)"
-+    local _arch=${DRACUT_ARCH:-$(uname -m)}
-     # only for PowerPC Macs
--    [[ "$_arch" == ppc* && "$_arch" != ppc*le ]] || return 1
-+    [[ "$_arch" == ppc* && "$_arch" != ppc64le ]] || return 1
-     return 0
- }
- 
-@@ -36,7 +36,7 @@ installkernel() {
-     }
- 
-     # only PowerMac3,6 has a module, special case
--    if [[ "$(uname -m)" == ppc ]]; then
-+    if [[ "${DRACUT_ARCH:-$(uname -m)}" != ppc64* ]]; then
-         if ! [[ $hostonly ]] || [[ "$(pmac_model)" == "PowerMac3,6" ]]; then
-             instmods therm_windtunnel
-         fi
--- 
-2.27.0
-
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 53cee6c4ff2..d58e168497d 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,20 +1,19 @@
 # Template file for 'dracut'
 pkgname=dracut
-version=050
-revision=10
+version=051
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
-# XXX: docbook-xml was added to sort builders out, can be removed
-hostmakedepends="asciidoc docbook-xml pkg-config"
+hostmakedepends="pkg-config"
 makedepends="libkmod-devel"
 depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
 short_desc="Low-level tool for generating an initramfs/initrd image"
 maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html"
-distfiles="https://github.com/dracutdevs/dracut/archive/${version}.tar.gz"
-checksum=f9dbf18597e5929221365964293212c8c9ffb7d84529c5a338c834ecab06e333
+distfiles="${KERNEL_SITE}/utils/boot/dracut/dracut-${version}.tar.xz"
+checksum=95bc2586b771e3f4ab5c8637201732a137bb682395d25ab496374241091906e3
 subpackages="dracut-network"
 
 make_dirs="

From f72390013c3ab0faeb9b6bd694f37516d5387fd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 16:41:25 +0700
Subject: [PATCH 3/3] nvme-cli: fix dracut 051 warning

---
 srcpkgs/nvme-cli/patches/dracut-warning.patch | 5 +++++
 srcpkgs/nvme-cli/template                     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/nvme-cli/patches/dracut-warning.patch

diff --git a/srcpkgs/nvme-cli/patches/dracut-warning.patch b/srcpkgs/nvme-cli/patches/dracut-warning.patch
new file mode 100644
index 00000000000..966ce6c0ec9
--- /dev/null
+++ b/srcpkgs/nvme-cli/patches/dracut-warning.patch
@@ -0,0 +1,5 @@
+--- nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in.orig	2021-01-24 16:37:06.346511231 +0700
++++ nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in	2021-01-24 16:38:01.351158511 +0700
+@@ -1 +1 @@
+-install_items+="@@UDEVRULESDIR@@/70-nvmf-autoconnect.rules"
++install_items+=" @@UDEVRULESDIR@@/70-nvmf-autoconnect.rules "
diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index 8a731eae208..0da50f2663e 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'nvme-cli'
 pkgname=nvme-cli
 version=1.13
-revision=1
+revision=2
 build_style=gnu-makefile
 # yeah, it must be 0 to enable
 make_build_args="LIBUUID=0"

Re: [NEED TESTER] dracut update to 051

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 423 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/28137#issuecomment-767293609

Comment:
On 2021-01-24 at 20:59 (UTC -0500), Đoàn Trần Công Danh wrote:
> @sgn requested review from @void-linux/pkg-committers on: void-linux/void-packages#28137 [NEED TESTER] dracut update to 051.

Works fine for me, both as the ZFSBootMenu initramfs and as the ordinary
initramfs.

Re: [PR PATCH] [Updated] [NEED TESTER] dracut update to 051

[sgn]

[-- Attachment #1: Type: text/plain, Size: 926 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages dracut-051
https://github.com/void-linux/void-packages/pull/28137

[NEED TESTER] dracut update to 051
Since I'm bored, I'll step to be next person who breaks dracut (the other reason is I'm using a patched version of dracut that included by this version).

- This PR would require lot of testing, so I include a separated change to fix for bootchart from #28136 since I expect that one will be merged soon enough.
- From this version, dracut will print warning if `kernel_modules` or `kernel_cmdline` `+=` but not surrounding by whitespace, hence the change to `nvme-cli`
- Also switch distfiles to kernel site, with this distfiles, we have pre-generated manpages, save some time and has version attached.

A patch file from https://github.com/void-linux/void-packages/pull/28137.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dracut-051-28137.patch --]
[-- Type: text/x-diff, Size: 11316 bytes --]

From 2c74aed28009d2024f7007d70f5cbb5b8a21058d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 16:32:38 +0700
Subject: [PATCH 1/2] dracut: update to 051.

---
 ...-ask-no-warn-if-run-cryptsetup-exist.patch | 39 -------------
 .../dracut/patches/better-arch-regex.patch    | 32 -----------
 .../patches/fix-early-microcode-non-x86.patch | 57 -------------------
 srcpkgs/dracut/patches/fix-ia32-uefi.patch    | 25 --------
 .../patches/ppcmac-respect-dracut-arch.patch  | 37 ------------
 srcpkgs/dracut/template                       | 11 ++--
 6 files changed, 5 insertions(+), 196 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch
 delete mode 100644 srcpkgs/dracut/patches/better-arch-regex.patch
 delete mode 100644 srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch
 delete mode 100644 srcpkgs/dracut/patches/fix-ia32-uefi.patch
 delete mode 100644 srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch

diff --git a/srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch b/srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch
deleted file mode 100644
index 396fb7c05d4..00000000000
--- a/srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 2edc52848eaf2331cdcce64f92d8e76947c01a66 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Sat, 14 Mar 2020 11:44:47 +0700
-Subject: [PATCH] cryptroot-ask: no warn if /run/cryptsetup exist
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In either case:
-- encrypted device is decrypted, udev will trigger device changes again,
-- multiple encrypted device,
-
-cryptroot-ask will run multiple time, then report:
-> mkdir: cannot create directory '/run/cryptsetup': File exists
-
-Pass `-p` into mkdir to ignore that warning.
-
-Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
----
- modules.d/90crypt/cryptroot-ask.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git modules.d/90crypt/cryptroot-ask.sh modules.d/90crypt/cryptroot-ask.sh
-index e1f17975..97047ae9 100755
---- modules.d/90crypt/cryptroot-ask.sh
-+++ modules.d/90crypt/cryptroot-ask.sh
-@@ -8,7 +8,7 @@ NEWROOT=${NEWROOT:-"/sysroot"}
- 
- . /lib/dracut-lib.sh
- 
--mkdir -m 0700 /run/cryptsetup
-+mkdir -p -m 0700 /run/cryptsetup
- 
- # if device name is /dev/dm-X, convert to /dev/mapper/name
- if [ "${1##/dev/dm-}" != "$1" ]; then
--- 
-2.26.0.rc1.191.g7acaab7404
-
diff --git a/srcpkgs/dracut/patches/better-arch-regex.patch b/srcpkgs/dracut/patches/better-arch-regex.patch
deleted file mode 100644
index 75d51034dff..00000000000
--- a/srcpkgs/dracut/patches/better-arch-regex.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0e6859c98a90a1b44abc6f29ba64628afc1be7cb Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:29:23 +0200
-Subject: [PATCH 3/4] mkinitrd-dracut.sh: use vmlinux regex for ppc*, vmlinuz
- for i686
-
-Previously this would not catch ppc64le, now it does; same with
-i686.
----
- mkinitrd-dracut.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git mkinitrd-dracut.sh mkinitrd-dracut.sh
-index 82d90684..1ea3e514 100755
---- mkinitrd-dracut.sh
-+++ mkinitrd-dracut.sh
-@@ -57,10 +57,10 @@ default_kernel_images() {
-         s390|s390x)
-             regex='image'
-             ;;
--        ppc|ppc64)
-+        ppc*)
-             regex='vmlinux'
-             ;;
--        i386|x86_64)
-+        i*86|x86_64)
-             regex='vmlinuz'
-             ;;
-         arm*)
--- 
-2.27.0
-
diff --git a/srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch b/srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch
deleted file mode 100644
index 406e695f9a2..00000000000
--- a/srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From d690d736a71e18711b94098da24f56b392c7e6f7 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:28:16 +0200
-Subject: [PATCH 2/4] dracut.sh: fix early microcode detection logic
-
-This fixes two issues:
-
-1) on non-x86 systems in non-hostonly config this would cause
-   an annoying warning on every initramfs generation
-2) on non-x86 systems in hostonly config this would result in
-   early microcode not getting disabled
----
- dracut.sh | 23 +++++++++++++++--------
- 1 file changed, 15 insertions(+), 8 deletions(-)
-
-diff --git dracut.sh dracut.sh
-index 58ff24d1..cd3fcbe2 100755
---- dracut.sh
-+++ dracut.sh
-@@ -1194,19 +1194,26 @@ fi
- 
- if [[ $early_microcode = yes ]]; then
-     if [[ $hostonly ]]; then
--        [[ $(get_cpu_vendor) == "AMD" ]] \
--            && ! check_kernel_config CONFIG_MICROCODE_AMD \
--            && unset early_microcode
--        [[ $(get_cpu_vendor) == "Intel" ]] \
--            && ! check_kernel_config CONFIG_MICROCODE_INTEL \
--            && unset early_microcode
-+        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
-+        else
-+            unset early_microcode
-+        fi
-     else
-         ! check_kernel_config CONFIG_MICROCODE_AMD \
-             && ! check_kernel_config CONFIG_MICROCODE_INTEL \
-             && unset early_microcode
-     fi
--    [[ $early_microcode != yes ]] \
--        && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y"
-+    # Do not complain on non-x86 architectures as it makes no sense
-+    case $(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"
-+            ;;
-+        *) ;;
-+    esac
- fi
- 
- # Need to be able to have non-root users read stuff (rpcbind etc)
--- 
-2.27.0
-
diff --git a/srcpkgs/dracut/patches/fix-ia32-uefi.patch b/srcpkgs/dracut/patches/fix-ia32-uefi.patch
deleted file mode 100644
index b4a79092d69..00000000000
--- a/srcpkgs/dracut/patches/fix-ia32-uefi.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e1bce654f1bd739cf1f975ff0a1f766221c3d4ee Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:20:40 +0200
-Subject: [PATCH 1/4] dracut.sh: fix ia32 detection for uefi executables
-
----
- dracut.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git dracut.sh dracut.sh
-index e3195499..58ff24d1 100755
---- dracut.sh
-+++ dracut.sh
-@@ -1153,7 +1153,7 @@ if [[ ! $print_cmdline ]]; then
-         case $(uname -m) in
-             x86_64)
-                 EFI_MACHINE_TYPE_NAME=x64;;
--            ia32)
-+            i*86)
-                 EFI_MACHINE_TYPE_NAME=ia32;;
-             *)
-                 dfatal "Architecture '$(uname -m)' not supported to create a UEFI executable"
--- 
-2.27.0
-
diff --git a/srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch b/srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch
deleted file mode 100644
index b569572a6bc..00000000000
--- a/srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From c26b5c7559c297aaa6c78787fa8de18bbf090205 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:47:00 +0200
-Subject: [PATCH 4/4] 90ppcmac: respect DRACUT_ARCH, don't exclude ppcle
-
----
- modules.d/90ppcmac/module-setup.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git modules.d/90ppcmac/module-setup.sh modules.d/90ppcmac/module-setup.sh
-index 59221ec4..7199dd9b 100644
---- modules.d/90ppcmac/module-setup.sh
-+++ modules.d/90ppcmac/module-setup.sh
-@@ -17,9 +17,9 @@
- 
- # called by dracut
- check() {
--    local _arch="$(uname -m)"
-+    local _arch=${DRACUT_ARCH:-$(uname -m)}
-     # only for PowerPC Macs
--    [[ "$_arch" == ppc* && "$_arch" != ppc*le ]] || return 1
-+    [[ "$_arch" == ppc* && "$_arch" != ppc64le ]] || return 1
-     return 0
- }
- 
-@@ -36,7 +36,7 @@ installkernel() {
-     }
- 
-     # only PowerMac3,6 has a module, special case
--    if [[ "$(uname -m)" == ppc ]]; then
-+    if [[ "${DRACUT_ARCH:-$(uname -m)}" != ppc64* ]]; then
-         if ! [[ $hostonly ]] || [[ "$(pmac_model)" == "PowerMac3,6" ]]; then
-             instmods therm_windtunnel
-         fi
--- 
-2.27.0
-
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 53cee6c4ff2..d58e168497d 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,20 +1,19 @@
 # Template file for 'dracut'
 pkgname=dracut
-version=050
-revision=10
+version=051
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
-# XXX: docbook-xml was added to sort builders out, can be removed
-hostmakedepends="asciidoc docbook-xml pkg-config"
+hostmakedepends="pkg-config"
 makedepends="libkmod-devel"
 depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
 short_desc="Low-level tool for generating an initramfs/initrd image"
 maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html"
-distfiles="https://github.com/dracutdevs/dracut/archive/${version}.tar.gz"
-checksum=f9dbf18597e5929221365964293212c8c9ffb7d84529c5a338c834ecab06e333
+distfiles="${KERNEL_SITE}/utils/boot/dracut/dracut-${version}.tar.xz"
+checksum=95bc2586b771e3f4ab5c8637201732a137bb682395d25ab496374241091906e3
 subpackages="dracut-network"
 
 make_dirs="

From e6c625e7ac1c3971bbf5b8b57822f78dc51c8f7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 16:41:25 +0700
Subject: [PATCH 2/2] nvme-cli: fix dracut 051 warning

---
 srcpkgs/nvme-cli/patches/dracut-warning.patch | 5 +++++
 srcpkgs/nvme-cli/template                     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/nvme-cli/patches/dracut-warning.patch

diff --git a/srcpkgs/nvme-cli/patches/dracut-warning.patch b/srcpkgs/nvme-cli/patches/dracut-warning.patch
new file mode 100644
index 00000000000..966ce6c0ec9
--- /dev/null
+++ b/srcpkgs/nvme-cli/patches/dracut-warning.patch
@@ -0,0 +1,5 @@
+--- nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in.orig	2021-01-24 16:37:06.346511231 +0700
++++ nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in	2021-01-24 16:38:01.351158511 +0700
+@@ -1 +1 @@
+-install_items+="@@UDEVRULESDIR@@/70-nvmf-autoconnect.rules"
++install_items+=" @@UDEVRULESDIR@@/70-nvmf-autoconnect.rules "
diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index 8a731eae208..0da50f2663e 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'nvme-cli'
 pkgname=nvme-cli
 version=1.13
-revision=1
+revision=2
 build_style=gnu-makefile
 # yeah, it must be 0 to enable
 make_build_args="LIBUUID=0"

Re: [NEED TESTER] dracut update to 051

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 1225 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/28137#issuecomment-770289140

Comment:
The `squash` module now errors out if `systemd-initrd` is not available:
> dracut: dracut-squash only supports systemd bases [sic] initramfs

This is because the `check` function in `/usr/lib/dracut/modules.d/99squash/module-setup.sh` was changed from always returning 255 (which means "only use this module if explicitly requested") to throwing a `derror` message without 
systemd and returning 1 (which means "omit this module"). The error is harmless but could be scary to those unfamiliar with dracut.

I suggest one of three changes:
1. Patch the `check` function to again always return 255 without complaining;
2. Drop the `derror` call in that function; or
3. Include a conf file in `/usr/lib/dracut/dracut.conf.d` that adds `omit_dracutmodules+=" squash "`.

Pick your favorite.

Also, I noticed we have `/usr/lib/dracut/dracut.conf.d/00-void.conf` coming from `base-files` and `/usr/lib/dracut/dracut.conf.d/10-runit-void.conf` coming from `runit-void`. It might be nice to move these files to the `dracut` package itself rather than scattering them around.

Re: [NEED TESTER] dracut update to 051

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 215 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28137#issuecomment-770301435

Comment:
Squash makes me think of live systems. Do we have anything to worry about?

Re: [NEED TESTER] dracut update to 051

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 213 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/28137#issuecomment-770301612

Comment:
Just users being alarmed by new messages when kernels are reconfigured.

Re: [NEED TESTER] dracut update to 051

[sgn]

[-- Attachment #1: Type: text/plain, Size: 905 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/28137#issuecomment-771275959

Comment:

> 1. Patch the `check` function to again always return 255 without complaining;

I'll pick this route.

> Also, I noticed we have `/usr/lib/dracut/dracut.conf.d/00-void.conf` coming from `base-files`

I think this change could be postponed for a while, I think it's better to not move files around when updating the package, (which potentially break).
Moving file around require updating both package at the same time.

> and `/usr/lib/dracut/dracut.conf.d/10-runit-void.conf` coming from `runit-void`. It might be nice to move these files to the `dracut` package itself rather than scattering them around.

While it's nice to have everything in single location, `runit-void` is maintained in another repo.
I think we'll re-visit the file moving later.

Re: [PR PATCH] [Updated] [NEED TESTER] dracut update to 051

[sgn]

[-- Attachment #1: Type: text/plain, Size: 926 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages dracut-051
https://github.com/void-linux/void-packages/pull/28137

[NEED TESTER] dracut update to 051
Since I'm bored, I'll step to be next person who breaks dracut (the other reason is I'm using a patched version of dracut that included by this version).

- This PR would require lot of testing, so I include a separated change to fix for bootchart from #28136 since I expect that one will be merged soon enough.
- From this version, dracut will print warning if `kernel_modules` or `kernel_cmdline` `+=` but not surrounding by whitespace, hence the change to `nvme-cli`
- Also switch distfiles to kernel site, with this distfiles, we have pre-generated manpages, save some time and has version attached.

A patch file from https://github.com/void-linux/void-packages/pull/28137.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dracut-051-28137.patch --]
[-- Type: text/x-diff, Size: 12209 bytes --]

From 0afcfa9838fc069574de3ae6f857f5358e34041c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 16:32:38 +0700
Subject: [PATCH 1/2] dracut: update to 051.

---
 ...-ask-no-warn-if-run-cryptsetup-exist.patch | 39 -------------
 .../patches/99squash-no-systemd-error.patch   | 14 +++++
 .../dracut/patches/better-arch-regex.patch    | 32 -----------
 .../patches/fix-early-microcode-non-x86.patch | 57 -------------------
 srcpkgs/dracut/patches/fix-ia32-uefi.patch    | 25 --------
 .../patches/ppcmac-respect-dracut-arch.patch  | 37 ------------
 srcpkgs/dracut/template                       | 11 ++--
 7 files changed, 19 insertions(+), 196 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch
 create mode 100644 srcpkgs/dracut/patches/99squash-no-systemd-error.patch
 delete mode 100644 srcpkgs/dracut/patches/better-arch-regex.patch
 delete mode 100644 srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch
 delete mode 100644 srcpkgs/dracut/patches/fix-ia32-uefi.patch
 delete mode 100644 srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch

diff --git a/srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch b/srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch
deleted file mode 100644
index 396fb7c05d4..00000000000
--- a/srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 2edc52848eaf2331cdcce64f92d8e76947c01a66 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Sat, 14 Mar 2020 11:44:47 +0700
-Subject: [PATCH] cryptroot-ask: no warn if /run/cryptsetup exist
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In either case:
-- encrypted device is decrypted, udev will trigger device changes again,
-- multiple encrypted device,
-
-cryptroot-ask will run multiple time, then report:
-> mkdir: cannot create directory '/run/cryptsetup': File exists
-
-Pass `-p` into mkdir to ignore that warning.
-
-Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
----
- modules.d/90crypt/cryptroot-ask.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git modules.d/90crypt/cryptroot-ask.sh modules.d/90crypt/cryptroot-ask.sh
-index e1f17975..97047ae9 100755
---- modules.d/90crypt/cryptroot-ask.sh
-+++ modules.d/90crypt/cryptroot-ask.sh
-@@ -8,7 +8,7 @@ NEWROOT=${NEWROOT:-"/sysroot"}
- 
- . /lib/dracut-lib.sh
- 
--mkdir -m 0700 /run/cryptsetup
-+mkdir -p -m 0700 /run/cryptsetup
- 
- # if device name is /dev/dm-X, convert to /dev/mapper/name
- if [ "${1##/dev/dm-}" != "$1" ]; then
--- 
-2.26.0.rc1.191.g7acaab7404
-
diff --git a/srcpkgs/dracut/patches/99squash-no-systemd-error.patch b/srcpkgs/dracut/patches/99squash-no-systemd-error.patch
new file mode 100644
index 00000000000..bcdd0a3ced4
--- /dev/null
+++ b/srcpkgs/dracut/patches/99squash-no-systemd-error.patch
@@ -0,0 +1,14 @@
+diff --git modules.d/99squash/module-setup.sh modules.d/99squash/module-setup.sh
+index 9a61a59d..96543a58 100644
+--- modules.d/99squash/module-setup.sh
++++ modules.d/99squash/module-setup.sh
+@@ -2,8 +2,7 @@
+ 
+ check() {
+     if ! dracut_module_included "systemd-initrd"; then
+-        derror "dracut-squash only supports systemd bases initramfs"
+-        return 1
++        return 255
+     fi
+ 
+     if ! type -P mksquashfs >/dev/null || ! type -P unsquashfs >/dev/null ; then
diff --git a/srcpkgs/dracut/patches/better-arch-regex.patch b/srcpkgs/dracut/patches/better-arch-regex.patch
deleted file mode 100644
index 75d51034dff..00000000000
--- a/srcpkgs/dracut/patches/better-arch-regex.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0e6859c98a90a1b44abc6f29ba64628afc1be7cb Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:29:23 +0200
-Subject: [PATCH 3/4] mkinitrd-dracut.sh: use vmlinux regex for ppc*, vmlinuz
- for i686
-
-Previously this would not catch ppc64le, now it does; same with
-i686.
----
- mkinitrd-dracut.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git mkinitrd-dracut.sh mkinitrd-dracut.sh
-index 82d90684..1ea3e514 100755
---- mkinitrd-dracut.sh
-+++ mkinitrd-dracut.sh
-@@ -57,10 +57,10 @@ default_kernel_images() {
-         s390|s390x)
-             regex='image'
-             ;;
--        ppc|ppc64)
-+        ppc*)
-             regex='vmlinux'
-             ;;
--        i386|x86_64)
-+        i*86|x86_64)
-             regex='vmlinuz'
-             ;;
-         arm*)
--- 
-2.27.0
-
diff --git a/srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch b/srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch
deleted file mode 100644
index 406e695f9a2..00000000000
--- a/srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From d690d736a71e18711b94098da24f56b392c7e6f7 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:28:16 +0200
-Subject: [PATCH 2/4] dracut.sh: fix early microcode detection logic
-
-This fixes two issues:
-
-1) on non-x86 systems in non-hostonly config this would cause
-   an annoying warning on every initramfs generation
-2) on non-x86 systems in hostonly config this would result in
-   early microcode not getting disabled
----
- dracut.sh | 23 +++++++++++++++--------
- 1 file changed, 15 insertions(+), 8 deletions(-)
-
-diff --git dracut.sh dracut.sh
-index 58ff24d1..cd3fcbe2 100755
---- dracut.sh
-+++ dracut.sh
-@@ -1194,19 +1194,26 @@ fi
- 
- if [[ $early_microcode = yes ]]; then
-     if [[ $hostonly ]]; then
--        [[ $(get_cpu_vendor) == "AMD" ]] \
--            && ! check_kernel_config CONFIG_MICROCODE_AMD \
--            && unset early_microcode
--        [[ $(get_cpu_vendor) == "Intel" ]] \
--            && ! check_kernel_config CONFIG_MICROCODE_INTEL \
--            && unset early_microcode
-+        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
-+        else
-+            unset early_microcode
-+        fi
-     else
-         ! check_kernel_config CONFIG_MICROCODE_AMD \
-             && ! check_kernel_config CONFIG_MICROCODE_INTEL \
-             && unset early_microcode
-     fi
--    [[ $early_microcode != yes ]] \
--        && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y"
-+    # Do not complain on non-x86 architectures as it makes no sense
-+    case $(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"
-+            ;;
-+        *) ;;
-+    esac
- fi
- 
- # Need to be able to have non-root users read stuff (rpcbind etc)
--- 
-2.27.0
-
diff --git a/srcpkgs/dracut/patches/fix-ia32-uefi.patch b/srcpkgs/dracut/patches/fix-ia32-uefi.patch
deleted file mode 100644
index b4a79092d69..00000000000
--- a/srcpkgs/dracut/patches/fix-ia32-uefi.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e1bce654f1bd739cf1f975ff0a1f766221c3d4ee Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:20:40 +0200
-Subject: [PATCH 1/4] dracut.sh: fix ia32 detection for uefi executables
-
----
- dracut.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git dracut.sh dracut.sh
-index e3195499..58ff24d1 100755
---- dracut.sh
-+++ dracut.sh
-@@ -1153,7 +1153,7 @@ if [[ ! $print_cmdline ]]; then
-         case $(uname -m) in
-             x86_64)
-                 EFI_MACHINE_TYPE_NAME=x64;;
--            ia32)
-+            i*86)
-                 EFI_MACHINE_TYPE_NAME=ia32;;
-             *)
-                 dfatal "Architecture '$(uname -m)' not supported to create a UEFI executable"
--- 
-2.27.0
-
diff --git a/srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch b/srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch
deleted file mode 100644
index b569572a6bc..00000000000
--- a/srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From c26b5c7559c297aaa6c78787fa8de18bbf090205 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:47:00 +0200
-Subject: [PATCH 4/4] 90ppcmac: respect DRACUT_ARCH, don't exclude ppcle
-
----
- modules.d/90ppcmac/module-setup.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git modules.d/90ppcmac/module-setup.sh modules.d/90ppcmac/module-setup.sh
-index 59221ec4..7199dd9b 100644
---- modules.d/90ppcmac/module-setup.sh
-+++ modules.d/90ppcmac/module-setup.sh
-@@ -17,9 +17,9 @@
- 
- # called by dracut
- check() {
--    local _arch="$(uname -m)"
-+    local _arch=${DRACUT_ARCH:-$(uname -m)}
-     # only for PowerPC Macs
--    [[ "$_arch" == ppc* && "$_arch" != ppc*le ]] || return 1
-+    [[ "$_arch" == ppc* && "$_arch" != ppc64le ]] || return 1
-     return 0
- }
- 
-@@ -36,7 +36,7 @@ installkernel() {
-     }
- 
-     # only PowerMac3,6 has a module, special case
--    if [[ "$(uname -m)" == ppc ]]; then
-+    if [[ "${DRACUT_ARCH:-$(uname -m)}" != ppc64* ]]; then
-         if ! [[ $hostonly ]] || [[ "$(pmac_model)" == "PowerMac3,6" ]]; then
-             instmods therm_windtunnel
-         fi
--- 
-2.27.0
-
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 53cee6c4ff2..d58e168497d 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,20 +1,19 @@
 # Template file for 'dracut'
 pkgname=dracut
-version=050
-revision=10
+version=051
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
-# XXX: docbook-xml was added to sort builders out, can be removed
-hostmakedepends="asciidoc docbook-xml pkg-config"
+hostmakedepends="pkg-config"
 makedepends="libkmod-devel"
 depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
 short_desc="Low-level tool for generating an initramfs/initrd image"
 maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html"
-distfiles="https://github.com/dracutdevs/dracut/archive/${version}.tar.gz"
-checksum=f9dbf18597e5929221365964293212c8c9ffb7d84529c5a338c834ecab06e333
+distfiles="${KERNEL_SITE}/utils/boot/dracut/dracut-${version}.tar.xz"
+checksum=95bc2586b771e3f4ab5c8637201732a137bb682395d25ab496374241091906e3
 subpackages="dracut-network"
 
 make_dirs="

From 9f8e1fcf35df3fe14a8e80d5e00064b4f7386fd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 16:41:25 +0700
Subject: [PATCH 2/2] nvme-cli: fix dracut 051 warning

---
 srcpkgs/nvme-cli/patches/dracut-warning.patch | 5 +++++
 srcpkgs/nvme-cli/template                     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/nvme-cli/patches/dracut-warning.patch

diff --git a/srcpkgs/nvme-cli/patches/dracut-warning.patch b/srcpkgs/nvme-cli/patches/dracut-warning.patch
new file mode 100644
index 00000000000..966ce6c0ec9
--- /dev/null
+++ b/srcpkgs/nvme-cli/patches/dracut-warning.patch
@@ -0,0 +1,5 @@
+--- nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in.orig	2021-01-24 16:37:06.346511231 +0700
++++ nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in	2021-01-24 16:38:01.351158511 +0700
+@@ -1 +1 @@
+-install_items+="@@UDEVRULESDIR@@/70-nvmf-autoconnect.rules"
++install_items+=" @@UDEVRULESDIR@@/70-nvmf-autoconnect.rules "
diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index 8a731eae208..0da50f2663e 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'nvme-cli'
 pkgname=nvme-cli
 version=1.13
-revision=1
+revision=2
 build_style=gnu-makefile
 # yeah, it must be 0 to enable
 make_build_args="LIBUUID=0"

Re: [PR PATCH] [Updated] [NEED TESTER] dracut update to 051

[sgn]

[-- Attachment #1: Type: text/plain, Size: 926 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages dracut-051
https://github.com/void-linux/void-packages/pull/28137

[NEED TESTER] dracut update to 051
Since I'm bored, I'll step to be next person who breaks dracut (the other reason is I'm using a patched version of dracut that included by this version).

- This PR would require lot of testing, so I include a separated change to fix for bootchart from #28136 since I expect that one will be merged soon enough.
- From this version, dracut will print warning if `kernel_modules` or `kernel_cmdline` `+=` but not surrounding by whitespace, hence the change to `nvme-cli`
- Also switch distfiles to kernel site, with this distfiles, we have pre-generated manpages, save some time and has version attached.

A patch file from https://github.com/void-linux/void-packages/pull/28137.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dracut-051-28137.patch --]
[-- Type: text/x-diff, Size: 12188 bytes --]

From eb82814ee0415d91d59d882ec161f4cf6cefc3fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 16:32:38 +0700
Subject: [PATCH 1/2] dracut: update to 051.

---
 ...-ask-no-warn-if-run-cryptsetup-exist.patch | 39 -------------
 .../patches/99squash-no-systemd-error.patch   | 13 +++++
 .../dracut/patches/better-arch-regex.patch    | 32 -----------
 .../patches/fix-early-microcode-non-x86.patch | 57 -------------------
 srcpkgs/dracut/patches/fix-ia32-uefi.patch    | 25 --------
 .../patches/ppcmac-respect-dracut-arch.patch  | 37 ------------
 srcpkgs/dracut/template                       | 11 ++--
 7 files changed, 18 insertions(+), 196 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch
 create mode 100644 srcpkgs/dracut/patches/99squash-no-systemd-error.patch
 delete mode 100644 srcpkgs/dracut/patches/better-arch-regex.patch
 delete mode 100644 srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch
 delete mode 100644 srcpkgs/dracut/patches/fix-ia32-uefi.patch
 delete mode 100644 srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch

diff --git a/srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch b/srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch
deleted file mode 100644
index 396fb7c05d4..00000000000
--- a/srcpkgs/dracut/patches/0001-cryptroot-ask-no-warn-if-run-cryptsetup-exist.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 2edc52848eaf2331cdcce64f92d8e76947c01a66 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Sat, 14 Mar 2020 11:44:47 +0700
-Subject: [PATCH] cryptroot-ask: no warn if /run/cryptsetup exist
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In either case:
-- encrypted device is decrypted, udev will trigger device changes again,
-- multiple encrypted device,
-
-cryptroot-ask will run multiple time, then report:
-> mkdir: cannot create directory '/run/cryptsetup': File exists
-
-Pass `-p` into mkdir to ignore that warning.
-
-Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
----
- modules.d/90crypt/cryptroot-ask.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git modules.d/90crypt/cryptroot-ask.sh modules.d/90crypt/cryptroot-ask.sh
-index e1f17975..97047ae9 100755
---- modules.d/90crypt/cryptroot-ask.sh
-+++ modules.d/90crypt/cryptroot-ask.sh
-@@ -8,7 +8,7 @@ NEWROOT=${NEWROOT:-"/sysroot"}
- 
- . /lib/dracut-lib.sh
- 
--mkdir -m 0700 /run/cryptsetup
-+mkdir -p -m 0700 /run/cryptsetup
- 
- # if device name is /dev/dm-X, convert to /dev/mapper/name
- if [ "${1##/dev/dm-}" != "$1" ]; then
--- 
-2.26.0.rc1.191.g7acaab7404
-
diff --git a/srcpkgs/dracut/patches/99squash-no-systemd-error.patch b/srcpkgs/dracut/patches/99squash-no-systemd-error.patch
new file mode 100644
index 00000000000..d93f6d895b1
--- /dev/null
+++ b/srcpkgs/dracut/patches/99squash-no-systemd-error.patch
@@ -0,0 +1,13 @@
+diff --git modules.d/99squash/module-setup.sh modules.d/99squash/module-setup.sh
+index 9a61a59d..96543a58 100644
+--- modules.d/99squash/module-setup.sh
++++ modules.d/99squash/module-setup.sh
+@@ -2,8 +2,7 @@
+ 
+ check() {
+     if ! dracut_module_included "systemd-initrd"; then
+-        derror "dracut-squash only supports systemd bases initramfs"
+         return 1
+     fi
+ 
+     if ! type -P mksquashfs >/dev/null || ! type -P unsquashfs >/dev/null ; then
diff --git a/srcpkgs/dracut/patches/better-arch-regex.patch b/srcpkgs/dracut/patches/better-arch-regex.patch
deleted file mode 100644
index 75d51034dff..00000000000
--- a/srcpkgs/dracut/patches/better-arch-regex.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0e6859c98a90a1b44abc6f29ba64628afc1be7cb Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:29:23 +0200
-Subject: [PATCH 3/4] mkinitrd-dracut.sh: use vmlinux regex for ppc*, vmlinuz
- for i686
-
-Previously this would not catch ppc64le, now it does; same with
-i686.
----
- mkinitrd-dracut.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git mkinitrd-dracut.sh mkinitrd-dracut.sh
-index 82d90684..1ea3e514 100755
---- mkinitrd-dracut.sh
-+++ mkinitrd-dracut.sh
-@@ -57,10 +57,10 @@ default_kernel_images() {
-         s390|s390x)
-             regex='image'
-             ;;
--        ppc|ppc64)
-+        ppc*)
-             regex='vmlinux'
-             ;;
--        i386|x86_64)
-+        i*86|x86_64)
-             regex='vmlinuz'
-             ;;
-         arm*)
--- 
-2.27.0
-
diff --git a/srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch b/srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch
deleted file mode 100644
index 406e695f9a2..00000000000
--- a/srcpkgs/dracut/patches/fix-early-microcode-non-x86.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From d690d736a71e18711b94098da24f56b392c7e6f7 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:28:16 +0200
-Subject: [PATCH 2/4] dracut.sh: fix early microcode detection logic
-
-This fixes two issues:
-
-1) on non-x86 systems in non-hostonly config this would cause
-   an annoying warning on every initramfs generation
-2) on non-x86 systems in hostonly config this would result in
-   early microcode not getting disabled
----
- dracut.sh | 23 +++++++++++++++--------
- 1 file changed, 15 insertions(+), 8 deletions(-)
-
-diff --git dracut.sh dracut.sh
-index 58ff24d1..cd3fcbe2 100755
---- dracut.sh
-+++ dracut.sh
-@@ -1194,19 +1194,26 @@ fi
- 
- if [[ $early_microcode = yes ]]; then
-     if [[ $hostonly ]]; then
--        [[ $(get_cpu_vendor) == "AMD" ]] \
--            && ! check_kernel_config CONFIG_MICROCODE_AMD \
--            && unset early_microcode
--        [[ $(get_cpu_vendor) == "Intel" ]] \
--            && ! check_kernel_config CONFIG_MICROCODE_INTEL \
--            && unset early_microcode
-+        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
-+        else
-+            unset early_microcode
-+        fi
-     else
-         ! check_kernel_config CONFIG_MICROCODE_AMD \
-             && ! check_kernel_config CONFIG_MICROCODE_INTEL \
-             && unset early_microcode
-     fi
--    [[ $early_microcode != yes ]] \
--        && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y"
-+    # Do not complain on non-x86 architectures as it makes no sense
-+    case $(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"
-+            ;;
-+        *) ;;
-+    esac
- fi
- 
- # Need to be able to have non-root users read stuff (rpcbind etc)
--- 
-2.27.0
-
diff --git a/srcpkgs/dracut/patches/fix-ia32-uefi.patch b/srcpkgs/dracut/patches/fix-ia32-uefi.patch
deleted file mode 100644
index b4a79092d69..00000000000
--- a/srcpkgs/dracut/patches/fix-ia32-uefi.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e1bce654f1bd739cf1f975ff0a1f766221c3d4ee Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:20:40 +0200
-Subject: [PATCH 1/4] dracut.sh: fix ia32 detection for uefi executables
-
----
- dracut.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git dracut.sh dracut.sh
-index e3195499..58ff24d1 100755
---- dracut.sh
-+++ dracut.sh
-@@ -1153,7 +1153,7 @@ if [[ ! $print_cmdline ]]; then
-         case $(uname -m) in
-             x86_64)
-                 EFI_MACHINE_TYPE_NAME=x64;;
--            ia32)
-+            i*86)
-                 EFI_MACHINE_TYPE_NAME=ia32;;
-             *)
-                 dfatal "Architecture '$(uname -m)' not supported to create a UEFI executable"
--- 
-2.27.0
-
diff --git a/srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch b/srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch
deleted file mode 100644
index b569572a6bc..00000000000
--- a/srcpkgs/dracut/patches/ppcmac-respect-dracut-arch.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From c26b5c7559c297aaa6c78787fa8de18bbf090205 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sat, 25 Jul 2020 17:47:00 +0200
-Subject: [PATCH 4/4] 90ppcmac: respect DRACUT_ARCH, don't exclude ppcle
-
----
- modules.d/90ppcmac/module-setup.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git modules.d/90ppcmac/module-setup.sh modules.d/90ppcmac/module-setup.sh
-index 59221ec4..7199dd9b 100644
---- modules.d/90ppcmac/module-setup.sh
-+++ modules.d/90ppcmac/module-setup.sh
-@@ -17,9 +17,9 @@
- 
- # called by dracut
- check() {
--    local _arch="$(uname -m)"
-+    local _arch=${DRACUT_ARCH:-$(uname -m)}
-     # only for PowerPC Macs
--    [[ "$_arch" == ppc* && "$_arch" != ppc*le ]] || return 1
-+    [[ "$_arch" == ppc* && "$_arch" != ppc64le ]] || return 1
-     return 0
- }
- 
-@@ -36,7 +36,7 @@ installkernel() {
-     }
- 
-     # only PowerMac3,6 has a module, special case
--    if [[ "$(uname -m)" == ppc ]]; then
-+    if [[ "${DRACUT_ARCH:-$(uname -m)}" != ppc64* ]]; then
-         if ! [[ $hostonly ]] || [[ "$(pmac_model)" == "PowerMac3,6" ]]; then
-             instmods therm_windtunnel
-         fi
--- 
-2.27.0
-
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 53cee6c4ff2..d58e168497d 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,20 +1,19 @@
 # Template file for 'dracut'
 pkgname=dracut
-version=050
-revision=10
+version=051
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
-# XXX: docbook-xml was added to sort builders out, can be removed
-hostmakedepends="asciidoc docbook-xml pkg-config"
+hostmakedepends="pkg-config"
 makedepends="libkmod-devel"
 depends="bash coreutils cpio eudev gzip kmod>=3.7 kpartx util-linux"
 short_desc="Low-level tool for generating an initramfs/initrd image"
 maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html"
-distfiles="https://github.com/dracutdevs/dracut/archive/${version}.tar.gz"
-checksum=f9dbf18597e5929221365964293212c8c9ffb7d84529c5a338c834ecab06e333
+distfiles="${KERNEL_SITE}/utils/boot/dracut/dracut-${version}.tar.xz"
+checksum=95bc2586b771e3f4ab5c8637201732a137bb682395d25ab496374241091906e3
 subpackages="dracut-network"
 
 make_dirs="

From 53dd10b34a94788fa08e5b42b5611f8392dd6c4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 24 Jan 2021 16:41:25 +0700
Subject: [PATCH 2/2] nvme-cli: fix dracut 051 warning

---
 srcpkgs/nvme-cli/patches/dracut-warning.patch | 5 +++++
 srcpkgs/nvme-cli/template                     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/nvme-cli/patches/dracut-warning.patch

diff --git a/srcpkgs/nvme-cli/patches/dracut-warning.patch b/srcpkgs/nvme-cli/patches/dracut-warning.patch
new file mode 100644
index 00000000000..966ce6c0ec9
--- /dev/null
+++ b/srcpkgs/nvme-cli/patches/dracut-warning.patch
@@ -0,0 +1,5 @@
+--- nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in.orig	2021-01-24 16:37:06.346511231 +0700
++++ nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in	2021-01-24 16:38:01.351158511 +0700
+@@ -1 +1 @@
+-install_items+="@@UDEVRULESDIR@@/70-nvmf-autoconnect.rules"
++install_items+=" @@UDEVRULESDIR@@/70-nvmf-autoconnect.rules "
diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index 8a731eae208..0da50f2663e 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'nvme-cli'
 pkgname=nvme-cli
 version=1.13
-revision=1
+revision=2
 build_style=gnu-makefile
 # yeah, it must be 0 to enable
 make_build_args="LIBUUID=0"

Re: [PR PATCH] [Merged]: [NEED TESTER] dracut update to 051

[sgn]

[-- Attachment #1: Type: text/plain, Size: 775 bytes --]

There's a merged pull request on the void-packages repository

[NEED TESTER] dracut update to 051
https://github.com/void-linux/void-packages/pull/28137

Description:
Since I'm bored, I'll step to be next person who breaks dracut (the other reason is I'm using a patched version of dracut that included by this version).

- This PR would require lot of testing, so I include a separated change to fix for bootchart from #28136 since I expect that one will be merged soon enough.
- From this version, dracut will print warning if `kernel_modules` or `kernel_cmdline` `+=` but not surrounding by whitespace, hence the change to `nvme-cli`
- Also switch distfiles to kernel site, with this distfiles, we have pre-generated manpages, save some time and has version attached.