From: Brian Maly Date: Thu, 18 Jan 2018 18:45:50 +0000 (-0500) Subject: Revert "kernel.spec: Require the new microcode_ctl." X-Git-Tag: v4.1.12-124.31.3~1254 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6105202d2c19eb2a7a664b922edf40e07e67d277;p=users%2Fjedix%2Flinux-maple.git Revert "kernel.spec: Require the new microcode_ctl." orabug: 27423273 Reviewed-by: John Haxby Signed-off-by: Brian Maly This reverts commit 7fa039f8a06c7b2cc440a118410120328664e3b3. (cherry picked from commit c63fbab634cc84c688a9266fb8979576522e4e7f) From QU6 to QU7 Signed-off-by: Jack Vogel --- diff --git a/uek-rpm/ol6/kernel-uek.spec b/uek-rpm/ol6/kernel-uek.spec index 3eb685829058..7617eeb9401c 100644 --- a/uek-rpm/ol6/kernel-uek.spec +++ b/uek-rpm/ol6/kernel-uek.spec @@ -435,7 +435,7 @@ BuildRequires: rpm-build >= 4.4.2.1-4 # Packages that need to be installed before the kernel is, because the %post # scripts use them. # -%define kernel_prereq fileutils, module-init-tools, initscripts >= 8.11.1-1, /sbin/new-kernel-pkg, microcode_ctl >= 1.17-25.2 +%define kernel_prereq fileutils, module-init-tools, initscripts >= 8.11.1-1, /sbin/new-kernel-pkg %define initrd_prereq dracut-kernel >= 004-242.0.3 # diff --git a/uek-rpm/ol7/kernel-uek.spec b/uek-rpm/ol7/kernel-uek.spec index 2ebada896a4c..e3c806ebd90f 100644 --- a/uek-rpm/ol7/kernel-uek.spec +++ b/uek-rpm/ol7/kernel-uek.spec @@ -430,7 +430,7 @@ BuildRequires: rpm-build >= 4.4.2.1-4 # Packages that need to be installed before the kernel is, because the %post # scripts use them. # -%define kernel_prereq fileutils, module-init-tools, initscripts >= 8.11.1-1, %{_sbindir}/new-kernel-pkg, microcode_ctl >= 2.1-22.2 +%define kernel_prereq fileutils, module-init-tools, initscripts >= 8.11.1-1, %{_sbindir}/new-kernel-pkg %define initrd_prereq dracut-kernel >= 033-360.0.3 #