From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 20 Dec 2023 07:44:10 +0000 (+0100)
Subject: dracut: fix early_microcode put into ramdisk
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=73b04029c9761944e404da9c20fda6483049d459;p=people%2Fms%2Fipfire-2.x.git

dracut: fix early_microcode put into ramdisk

the kernel has no CONFIG_MICROCODE_{AMD|INTEL} anymore so this patch change the check
to CONFIG_MICROCODE.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/rootfiles/core/183/filelists/dracut b/config/rootfiles/core/183/filelists/dracut
new file mode 120000
index 0000000000..160869946d
--- /dev/null
+++ b/config/rootfiles/core/183/filelists/dracut
@@ -0,0 +1 @@
+../../../common/dracut
\ No newline at end of file
diff --git a/lfs/dracut b/lfs/dracut
index cf8cd5cb56..de48ae61f9 100644
--- a/lfs/dracut
+++ b/lfs/dracut
@@ -73,6 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	# https://bugzilla.ipfire.org/show_bug.cgi?id=12842
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dracut-059-fix-e2fsck-call.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dracut/dracut-056-fix_early_microcode_for_kernel_6.6.patch
 
 	cd $(DIR_APP) && ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc
 	cd $(DIR_APP) && make $(MAKETUNING)
diff --git a/src/patches/dracut/dracut-056-fix_early_microcode_for_kernel_6.6.patch b/src/patches/dracut/dracut-056-fix_early_microcode_for_kernel_6.6.patch
new file mode 100644
index 0000000000..dc9e7c3e9d
--- /dev/null
+++ b/src/patches/dracut/dracut-056-fix_early_microcode_for_kernel_6.6.patch
@@ -0,0 +1,30 @@
+diff -Naur dracut-056.prg/dracut.sh dracut-056/dracut.sh
+--- dracut-056.prg/dracut.sh	2022-02-18 12:32:53.000000000 +0100
++++ dracut-056/dracut.sh	2023-12-19 23:30:27.720703043 +0100
+@@ -1385,22 +1385,21 @@
+ if [[ $early_microcode == yes ]]; then
+     if [[ $hostonly ]]; then
+         if [[ $(get_cpu_vendor) == "AMD" ]]; then
+-            check_kernel_config CONFIG_MICROCODE_AMD || unset early_microcode
++            check_kernel_config CONFIG_MICROCODE || unset early_microcode
+         elif [[ $(get_cpu_vendor) == "Intel" ]]; then
+-            check_kernel_config CONFIG_MICROCODE_INTEL || unset early_microcode
++            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 $(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