From d326c6c870b2cd023b95f566e57d57bc1085b3aa Mon Sep 17 00:00:00 2001 From: Somasundaram Krishnasamy Date: Wed, 25 Oct 2017 13:45:57 -0700 Subject: [PATCH] uek-rpm: Update kernel-ueknano's provides list. Orabug: 27037687 Install of libibverbs requires kernel-uek as prerequisite. The older ueknano rpms had this in the provides list. Signed-off-by: Somasundaram Krishnasamy Reviewed-by: Ashok Vairavan --- uek-rpm/ol6/kernel-uek.spec | 17 ++++++++++------- uek-rpm/ol7/kernel-uek.spec | 3 +++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/uek-rpm/ol6/kernel-uek.spec b/uek-rpm/ol6/kernel-uek.spec index cfcc0a7ed9a8..2496008a9337 100644 --- a/uek-rpm/ol6/kernel-uek.spec +++ b/uek-rpm/ol6/kernel-uek.spec @@ -424,7 +424,7 @@ BuildRequires: rpm-build >= 4.4.2.1-4 %ifarch x86_64 %define kernel_obsoletes kernel-xen <= 2.6.27-0.2.rc0.git6.fc10 -%define kernel_provides kernel%{?variant}-xen = %{rpmversion}-%{pkg_release} +%define kernel_provides kernel%{?variant}%{?-r:nano}-xen = %{rpmversion}-%{pkg_release} %endif # We moved the drm include files into kernel-headers, make sure there's @@ -445,13 +445,16 @@ BuildRequires: rpm-build >= 4.4.2.1-4 # macros defined above. # %define kernel_reqprovconf(r) \ -Provides: kernel%{?variant} = %{rpmversion}-%{pkg_release}\ -Provides: kernel%{?variant}-%{_target_cpu} = %{rpmversion}-%{pkg_release}%{?1:.%{1}}\ -Provides: kernel%{?variant}-drm = 4.3.0\ -Provides: kernel%{?variant}-drm-nouveau = 12\ -Provides: kernel%{?variant}-modeset = 1\ -Provides: kernel%{?variant}-uname-r = %{KVERREL}%{?1:.%{1}}\ +Provides: kernel%{?variant}%{?-r:nano} = %{rpmversion}-%{pkg_release}\ +Provides: kernel%{?variant}%{?-r:nano}-%{_target_cpu} = %{rpmversion}-%{pkg_release}%{?1:.%{1}}\ +Provides: kernel%{?variant}%{?-r:nano}-drm = 4.3.0\ +Provides: kernel%{?variant}%{?-r:nano}-drm-nouveau = 12\ +Provides: kernel%{?variant}%{?-r:nano}-modeset = 1\ +Provides: kernel%{?variant}%{?-r:nano}-uname-r = %{KVERREL}%{?1:.%{1}}\ Provides: oracleasm = 2.0.5\ +%if "x%{?-r}" != "x"\ +Provides: kernel-uek\ +%endif\ %ifnarch sparc64\ Provides: x86_energy_perf_policy = %{KVERREL}%{?1:.%{1}}\ Provides: turbostat = %{KVERREL}%{?1:.%{1}}\ diff --git a/uek-rpm/ol7/kernel-uek.spec b/uek-rpm/ol7/kernel-uek.spec index f1e38720c1cf..da23b942404f 100644 --- a/uek-rpm/ol7/kernel-uek.spec +++ b/uek-rpm/ol7/kernel-uek.spec @@ -447,6 +447,9 @@ Provides: kernel%{?variant}%{?-r:nano}-drm-nouveau = 12\ Provides: kernel%{?variant}%{?-r:nano}-modeset = 1\ Provides: kernel%{?variant}%{?-r:nano}-uname-r = %{KVERREL}%{?1:.%{1}}\ Provides: oracleasm = 2.0.5\ +%if "x%{?-r}" != "x"\ +Provides: kernel-uek\ +%endif\ %ifnarch sparc64\ Provides: x86_energy_perf_policy = %{KVERREL}%{?1:.%{1}}\ Provides: turbostat = %{KVERREL}%{?1:.%{1}}\ -- 2.50.1