From 2df7682cd7812297dfc22f01ae65874bacd586eb Mon Sep 17 00:00:00 2001 From: Gu Zheng Date: Mon, 4 Sep 2017 06:32:23 -0400 Subject: [PATCH] RM-790 : fix Kernel string mismatch for ppc64le 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 ppc64le 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 = -.el6 the following string is used in Lustre client RPM for the required kernel version: kernel = -.el6.ppc64le The patch will remove the trailing string '.ppc64le' in macro 'krequires' defined in the lustre specfile describing the software dependeny. AUTOTEST:ONLY:sanity [Shilong added autotest args] Change-Id: Id1d9fd92928a567048d5ad6e9d0c872b5666b4e6 Signed-off-by: Gu Zheng Signed-off-by: Wang Shilong Reviewed-on: https://review.whamcloud.com/41877 Tested-by: jenkins Reviewed-by: Andreas Dilger Tested-by: Andreas Dilger --- lustre.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lustre.spec.in b/lustre.spec.in index ef29b67..9a4b45e 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -122,7 +122,7 @@ %global modules_fs_path /lib/modules/%{_kver}/%{kmoddir} # requires want to set a version including epoch -%global krequires %(echo %{kver} | sed -e 's/\.x86_64$//' -e 's/\.i[3456]86$//' -e 's/-smp$//' -e 's/-bigsmp$//' -e 's/[-.]ppc64$//' -e 's/\.aarch64$//' -e 's/-default$//' -e s/%{_flavor}//) +%global krequires %(echo %{kver} | sed -e 's/\.x86_64$//' -e 's/\.i[3456]86$//' -e 's/-smp$//' -e 's/-bigsmp$//' -e 's/[-.]ppc64$//' -e 's/\.aarch64$//' -e 's/[-.]ppc64le$//' -e 's/-default$//' -e s/%{_flavor}//) %if %{_vendor}=="redhat" || %{_vendor}=="fedora" %global requires_kmod_name kmod-%{lustre_name} -- 1.8.3.1