- upstream fix for microcode check

diff --git a/dracut.spec b/dracut.spec
index 8a9bb79e504efee0f3843c5f67b982e171bf6dfd..72ffee6163226d2512d0818afbec955ccc286b68 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -2,7 +2,7 @@ Summary:        Initramfs generator using udev
 Summary(pl.UTF-8):     Generator initramfs wykorzystujący udev
 Name:          dracut
 Version:       059
 Summary(pl.UTF-8):     Generator initramfs wykorzystujący udev
 Name:          dracut
 Version:       059

-Release:       1
+Release:       2

 License:       GPL v2+
 Group:         Base
 Source0:       https://github.com/dracutdevs/dracut/archive/%{version}/%{name}-%{version}.tar.gz
 License:       GPL v2+
 Group:         Base
 Source0:       https://github.com/dracutdevs/dracut/archive/%{version}/%{name}-%{version}.tar.gz


@@ -18,6 +18,7 @@ Patch6:               misc_fixes.patch
 Patch7:                initrd-release.patch
 Patch8:                crypttab-keyscript.patch
 Patch9:                bash.patch
 Patch7:                initrd-release.patch
 Patch8:                crypttab-keyscript.patch
 Patch9:                bash.patch

+Patch10:       microcode-check.patch

 Patch100:      no_systemd.patch
 URL:           https://github.com/dracutdevs/dracut/wiki/
 BuildRequires: asciidoc
 Patch100:      no_systemd.patch
 URL:           https://github.com/dracutdevs/dracut/wiki/
 BuildRequires: asciidoc


@@ -190,6 +191,7 @@ Bashowe dopełnianie składni dla polecenia dracut.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1

+%patch10 -p1

 %patch100 -p1
 
 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/95resume/module-setup.sh
 %patch100 -p1
 
 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/95resume/module-setup.sh

diff --git a/microcode-check.patch b/microcode-check.patch
new file mode 100644 (file)
index 0000000..6d3295c
--- /dev/null
+++ b/microcode-check.patch
@@ -0,0 +1,45 @@
+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