From: Ethan Zhao <ethan.zhao@oracle.com>
Date: Tue, 26 Dec 2017 21:24:00 +0000 (-0600)
Subject: kernel-uek.spec: update linux-firmware and linux-nano-firmware dependency
X-Git-Tag: v4.1.12-124.31.3~1461
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6caf265a63f568958457bf178371a2e79febae68;p=users%2Fjedix%2Flinux-maple.git

kernel-uek.spec: update linux-firmware and linux-nano-firmware dependency

Orabug: 27185358

Signed-off-by: Ethan Zhao <ethan.zhao@oracle.com>
Reviewed-by: Zhu Yanjun <yanjun.zhu@oracle.com>
---

diff --git a/uek-rpm/ol6/kernel-uek.spec b/uek-rpm/ol6/kernel-uek.spec
index 2496008a9337..7617eeb9401c 100644
--- a/uek-rpm/ol6/kernel-uek.spec
+++ b/uek-rpm/ol6/kernel-uek.spec
@@ -469,7 +469,11 @@ Requires(pre): %{initrd_prereq}\
 %if "x%{?-r}" == "x"\
 Requires(pre): kernel-firmware = %{rpmversion}-%{pkg_release}\
 %endif\
-Requires(pre): linux%{?-r:-nano}-firmware >= 20170803-56.git7d2c913d.0.1\
+%if "x%{?-r}" != "x"\
+Requires(pre): linux-nano-firmware >= 20171128-56.git17e62881.0.1\
+%else\
+Requires(pre): linux-firmware >= 20171128-56.git17e62881.0.2\
+%endif\
 Requires(post): /sbin/new-kernel-pkg\
 Requires(preun): /sbin/new-kernel-pkg\
 Conflicts: %{kernel_dot_org_conflicts}\
diff --git a/uek-rpm/ol7/kernel-uek.spec b/uek-rpm/ol7/kernel-uek.spec
index da23b942404f..e3c806ebd90f 100644
--- a/uek-rpm/ol7/kernel-uek.spec
+++ b/uek-rpm/ol7/kernel-uek.spec
@@ -464,7 +464,11 @@ Requires(pre): %{initrd_prereq}\
 %if "x%{?-r}" == "x"\
 Requires(pre): kernel-firmware = %{rpmversion}-%{pkg_release}\
 %endif\
-Requires(pre): linux%{?-r:-nano}-firmware >= 20170803-56.git7d2c913d.0.1\
+%if "x%{?-r}" != "x"\
+Requires(pre): linux-nano-firmware >= 20171128-57.git17e62881.0.2\
+%else\
+Requires(pre): linux-firmware >= 20171128-57.git17e62881.0.2\
+%endif\
 Requires(post): %{_sbindir}/new-kernel-pkg\
 Requires(preun): %{_sbindir}/new-kernel-pkg\
 Conflicts: %{kernel_dot_org_conflicts}\