From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 73b04029c9761944e404da9c20fda6483049d459
Date: Wed, 20 Dec 2023 07:46:14 +0000
Message-ID: <4Sw5GZ5WBwz2xr5@people01.haj.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6801083649700575451=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============6801083649700575451==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  73b04029c9761944e404da9c20fda6483049d459 (commit)
      from  0348f6b23f98b2e6109241b0d97424a676cde560 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 73b04029c9761944e404da9c20fda6483049d459
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Dec 20 08:44:10 2023 +0100

    dracut: fix early_microcode put into ramdisk
   =20
    the kernel has no CONFIG_MICROCODE_{AMD|INTEL} anymore so this patch chan=
ge the check
    to CONFIG_MICROCODE.
   =20
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 .../{oldcore/167 =3D> core/183}/filelists/dracut     |  0
 lfs/dracut                                         |  1 +
 ...ut-056-fix_early_microcode_for_kernel_6.6.patch | 30 ++++++++++++++++++++=
++
 3 files changed, 31 insertions(+)
 copy config/rootfiles/{oldcore/167 =3D> core/183}/filelists/dracut (100%)
 create mode 100644 src/patches/dracut/dracut-056-fix_early_microcode_for_ker=
nel_6.6.patch

Difference in files:
diff --git a/config/rootfiles/core/183/filelists/dracut b/config/rootfiles/co=
re/183/filelists/dracut
new file mode 120000
index 000000000..160869946
--- /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 cf8cd5cb5..de48ae61f 100644
--- a/lfs/dracut
+++ b/lfs/dracut
@@ -73,6 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
=20
 	# https://bugzilla.ipfire.org/show_bug.cgi?id=3D12842
 	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
=20
 	cd $(DIR_APP) && ./configure --prefix=3D/usr --sbindir=3D/sbin --sysconfdir=
=3D/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.pat=
ch
new file mode 100644
index 000000000..dc9e7c3e9
--- /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 =3D=3D yes ]]; then
+     if [[ $hostonly ]]; then
+         if [[ $(get_cpu_vendor) =3D=3D "AMD" ]]; then
+-            check_kernel_config CONFIG_MICROCODE_AMD || unset early_microco=
de
++            check_kernel_config CONFIG_MICROCODE || unset early_microcode
+         elif [[ $(get_cpu_vendor) =3D=3D "Intel" ]]; then
+-            check_kernel_config CONFIG_MICROCODE_INTEL || unset early_micro=
code
++            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 !=3D yes ]] \
+-                && dwarn "Disabling early microcode, because kernel does no=
t support it. CONFIG_MICROCODE_[AMD|INTEL]!=3Dy"
++                && dwarn "Disabling early microcode, because kernel does no=
t support it. CONFIG_MICROCODE!=3Dy"
+             ;;
+         *) ;;
+     esac


hooks/post-receive
--
IPFire 2.x development tree

--===============6801083649700575451==--