From 069411cd55c2e22e392ddad9b87d15fa162fe55d Mon Sep 17 00:00:00 2001 From: Somasundaram Krishnasamy Date: Tue, 15 Aug 2017 12:55:52 -0700 Subject: [PATCH] uek-rpm: Fix package dependencies for kernel-ueknano Orabug: 26639379 Since kernel-ueknano has no explicit dependencies specified in the spec file, it fails to check or install linux-nano-firmware rpm. This commit adds requires, provides, conflicts, obsoletes directives to kernel-ueknano same as in kernel-uek package. Signed-off-by: Somasundaram Krishnasamy Reviewed-by: Ashok Vairavan Acked-by: Ethan Zhao --- uek-rpm/ol6/kernel-uek.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/uek-rpm/ol6/kernel-uek.spec b/uek-rpm/ol6/kernel-uek.spec index 71167a64c26a..9adb97ac8991 100644 --- a/uek-rpm/ol6/kernel-uek.spec +++ b/uek-rpm/ol6/kernel-uek.spec @@ -435,16 +435,16 @@ 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 # # This macro does requires, provides, conflicts, obsoletes for a kernel package. -# %%kernel_reqprovconf +# %%kernel_reqprovconf [-r] # It uses any kernel__conflicts and kernel__obsoletes # macros defined above. # -%define kernel_reqprovconf \ +%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\ @@ -463,7 +463,10 @@ Provides: kernel = %{rpmversion}-%{pkg_release}\ %endif\ Requires(pre): %{kernel_prereq}\ Requires(pre): %{initrd_prereq}\ -Requires(pre): linux-firmware >= 20170803-56.git7d2c913d.0.1\ +%if "x%{?-r}" == "x"\ +Requires(pre): kernel-firmware = %{rpmversion}-%{pkg_release}\ +%endif\ +Requires(pre): linux%{?-r:-nano}-firmware >= 20170803-56.git7d2c913d.0.1\ Requires(post): /sbin/new-kernel-pkg\ Requires(preun): /sbin/new-kernel-pkg\ Conflicts: %{kernel_dot_org_conflicts}\ @@ -624,6 +627,7 @@ input and output, etc. Summary: The Linux kernel Group: System Environment/Kernel License: GPLv2 +%kernel_reqprovconf -r %description -n kernel-ueknano The kernel package contains the Linux kernel (vmlinuz), the core of any Linux operating system. The kernel handles the basic functions -- 2.50.1