From: James Simmons Date: Wed, 18 Sep 2013 13:44:24 +0000 (-0400) Subject: LU-1199 rpm: remove SLES10 support X-Git-Tag: 2.5.51~70 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=31197e43bca94d9fbb4ca2090b556d93c6c18542 LU-1199 rpm: remove SLES10 support SLES10 is out of scope for Lustre 2.4 so we can drop the spec file hacks. Signed-off-by: Jeff Mahoney Signed-off-by: James Simmons Change-Id: I94ea2164a4b339ab26825058678b54859d2617a8 Reviewed-on: http://review.whamcloud.com/5490 Tested-by: Hudson Reviewed-by: Bob Glossman Tested-by: Maloo Reviewed-by: Minh Diep Reviewed-by: Oleg Drokin --- diff --git a/lustre.spec.in b/lustre.spec.in index 8d2ccd0..5c00be7 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -56,12 +56,6 @@ # of %kversion %define krequires %(bash -c "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 sles10 %(bash -c "if [ "%sles_version" = "10" ]; then echo -n '1'; else echo -n '0'; fi") - -%if %sles10 -%define flavor %(bash -c "echo %{kversion} | sed -e 's/^.*-//'") -%endif - # Set the package name prefix %if %{undefined lustre_name} %if %{with servers} @@ -112,17 +106,12 @@ Requires: %{cross_requires} AutoReqProv: no %else # for SLES11, we need nothing here -# for SLES10, we need (where %{flavor} is, i.e. smp): -%if %sles10 -Requires: kernel-%{flavor} -%else %if %{_vendor}=="redhat" || %{_vendor}=="fedora" # 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 %endif -%endif Group: Development/Kernel %description modules