From: Dmitry Eremin <dmitry.eremin@intel.com>
Date: Mon, 8 Jun 2015 16:27:06 +0000 (+0300)
Subject: LU-6697 build: remove SRPM dependency from kernel version
X-Git-Tag: 2.7.55~1
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=cd4525f2c71e7bd186a42969d059ba24e5ef01c7

LU-6697 build: remove SRPM dependency from kernel version

If machine don't have default kernel sources installed
the following error will be when you "make srpm".

error: line 144: Version required: Requires: kernel =
make: *** [srpm] Error 1

Change-Id: I1ab6cf1650e97b86ca5f25723bf7244e3ca08a03
Signed-off-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-on: http://review.whamcloud.com/15181
Tested-by: Jenkins
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Patrick Farrell <paf@cray.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre.spec.in b/lustre.spec.in
index c20ff84..312db2d 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -33,6 +33,9 @@
 %else
     %{!?downstream_release: %global downstream_release "@DOWNSTREAM_RELEASE@"}
     %{!?myrelease: %global myrelease %(if [ -n "%downstream_release" ]; then echo -n "%{downstream_release}_"; fi; echo %kversion | tr '-' '_')}
+    # 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$//')
 %endif
 
 # always append the buildid, even when the caller defines %release
@@ -58,10 +61,6 @@
 # response from them
 #%%global _use_internal_dependency_generator 0
 
-# 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$//')
-
 # Set the package name prefix
 %if %{undefined lustre_name}
     %if %{with servers}
@@ -139,9 +138,11 @@ AutoReqProv: no
 %else
 # for SLES11, we need nothing here
 %if %{_vendor}=="redhat" || %{_vendor}=="fedora"
+%if %{defined krequires}
 # for RHEL we need to require the specific kernel still since weak-modules
 # support on RH is, well, weak, to be punny about it
 Requires: kernel = %{krequires}
+%endif
 %if %{with lnet_dlc}
 Requires: libyaml
 BuildRequires: libyaml-devel