From: Frank Heckes <frank.heckes@intel.com>
Date: Mon, 9 Mar 2015 10:44:30 +0000 (+0100)
Subject: LU-6300 build: Kernel string mismatch for ppc64 in RPMs
X-Git-Tag: 2.7.53~47
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=a4bcfa9c49abae8035b05d94a09352aae01bd77d

LU-6300 build: Kernel string mismatch for ppc64 in RPMs

The macro in the kernel RPMs for ppc64 provided
by Redhat describing the kernel version supported,
mismatch the content of the macro of the Lustre kernel
client modules for ppc64 describing the required
kernel. This leads to unresolved dependency errors
during installation of the Lustre client modules
although the kernel versions match actually.

While Redhat uses the convention:

kernel = <major-number>-<minor-release-number>.el6

the following string is used in Lustre client RPM
for the required kernel version:

kernel = <major-number>-<minor-release-number>.el6.ppc64

The patch will remove the trailing string '.ppc64' in
macro 'krequires' defined in the lustre specfile
describing the software dependeny.

Signed-off-by: Frank Heckes <frank.heckes@intel.com>
Change-Id: I930d2fe67da819db57a6591341c5a55f0374ad43
Reviewed-on: http://review.whamcloud.com/14012
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Tested-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre.spec.in b/lustre.spec.in
index 5c5fc6d..9e4bbb8 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -59,7 +59,7 @@
 
 # for those uses that don't want the -smp/-bigsmp (or the .arch) on the end
 # of %kversion
-%define krequires %(echo %{kversion} | sed -e 's/\.x86_64$//' -e 's/\.i[3456]86$//' -e 's/-smp$//' -e 's/-bigsmp$//' -e 's/-ppc64$//' -e 's/-default$//')
+%define krequires %(echo %{kversion} | sed -e 's/\.x86_64$//' -e 's/\.i[3456]86$//' -e 's/-smp$//' -e 's/-bigsmp$//' -e 's/[-.]ppc64$//' -e 's/-default$//')
 
 # Set the package name prefix
 %if %{undefined lustre_name}