From: Ashok Vairavan <ashok.vairavan@oracle.com>
Date: Mon, 31 Oct 2016 19:51:50 +0000 (-0700)
Subject: uek-rpm nano: remove the OL6 nano kernel dependency on kernel-firmware
X-Git-Tag: v4.1.12-92~48^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=94a6e6b08098d2f6cac710acb30ca7fdd68c8168;p=users%2Fjedix%2Flinux-maple.git

uek-rpm nano: remove the OL6 nano kernel dependency on kernel-firmware

linux-nano-firmware obsoletes kernel-firmware.  Remove the requirement
for it from the OL6 nano kernel-uek.spec.

Orabug: 25023723

Signed-off-by: Ashok Vairavan <ashok.vairavan@oracle.com>
---

diff --git a/uek-rpm/ol6-nano/kernel-uek.spec b/uek-rpm/ol6-nano/kernel-uek.spec
index 471399c863dc3..6c87941cb4556 100644
--- a/uek-rpm/ol6-nano/kernel-uek.spec
+++ b/uek-rpm/ol6-nano/kernel-uek.spec
@@ -433,7 +433,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, kernel-firmware = %{rpmversion}-%{pkg_release}, /sbin/new-kernel-pkg
+%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
 
 #