From be8a746bf574ffa1c180c22b937b04e56d5f9f92 Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Tue, 30 Sep 2014 18:04:38 +0300 Subject: [PATCH] Fix kernel version detection Change-Id: Ifb358de6631948ce80b0af1f8b8daabd94332c9f Signed-off-by: Mikko Ylinen --- packaging/openavb.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packaging/openavb.spec b/packaging/openavb.spec index 9fa4210..aeb6ad0 100644 --- a/packaging/openavb.spec +++ b/packaging/openavb.spec @@ -1,6 +1,6 @@ %{!?_with_debug:%{!?_without_debug:%define _without_debug 0}} -%define kernel kernel-x86-ivi +%define kernel "%(/bin/rpm -q --whatprovides kernel-profile-ivi)" %define kernel_relstr "%(/bin/rpm -q --queryformat '%{VERSION}-%{RELEASE}' %{kernel})" %define kernel_release %(echo %{kernel_relstr}) %define kernel_modstr "%(/bin/rpm -ql %{kernel} | sort | grep /lib/modules/%{kernel_release} | head -1 | sed 's#/*$##g')" @@ -19,15 +19,20 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: openavb-kmod-igb ExclusiveArch: %ix86 x86_64 -BuildRequires: libstdc++-devel +%ifarch %ix86 +# Temporary to address "have choice for kernel-devel" +BuildRequires: kernel-ivi-i386-default-devel +%else BuildRequires: kernel-devel +%endif +BuildRequires: libstdc++-devel BuildRequires: pkgconfig(libpci) BuildRequires: pkgconfig(zlib) %package kmod-igb Summary: kernel module for Intel ethernet cards Group: System/Kernel -Requires: %{kernel} = %{kernel_release} +Requires: kernel-profile-ivi = %{kernel_release} %package libigb Summary: IGB runtime library -- 2.7.4