LU-9758 build: allow disabling lustre test and iokit rpm creation

While attempting to create a basic set of rpms that didn't
include the lustre test and iokit rpm I encountered build
breakage. Test the lustre_test conditional in the spec file
so we don't attempt to build special lustre test rpms. The
lustre test rpm is actually dependant on the lustre iokit
rpm so if --disable-iokit is set we should disable lustre
test rpms generation as well.

Test-Parameters: trivial

Lustre-commit: f810a0b0c5af842c7e644f1e82594f1615e540e6
Lustre-change: https://review.whamcloud.com/27985

Change-Id: I39e215aa6816b782314c779ad6f752bf32a43341
Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Reviewed-on: https://review.whamcloud.com/28372
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Minh Diep <minh.diep@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>

diff --git a/lustre.spec.in b/lustre.spec.in
index 8d066df..47607cb 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -81,11 +81,15 @@
 
 %if %{_vendor}=="redhat" || %{_vendor}=="fedora"
        %global requires_kmod_name kmod-%{lustre_name}
 
 %if %{_vendor}=="redhat" || %{_vendor}=="fedora"
        %global requires_kmod_name kmod-%{lustre_name}

-       %global requires_kmod_tests_name kmod-%{lustre_name}-tests
+       %if %{with lustre_tests}
+               %global requires_kmod_tests_name kmod-%{lustre_name}-tests
+       %endif

        %global requires_kmod_version %{version}
 %else  #for Suse
        %global requires_kmod_name %{lustre_name}-kmp
        %global requires_kmod_version %{version}
 %else  #for Suse
        %global requires_kmod_name %{lustre_name}-kmp

-       %global requires_kmod_tests_name %{lustre_name}-tests-kmp
+       %if %{with lustre_tests}
+               %global requires_kmod_tests_name %{lustre_name}-tests-kmp
+       %endif

        %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/\.aarch64$//' -e 's/-default$//')
        %if 0%{?suse_version} >= 1200
                %global requires_kmod_version %{version}_k%(echo %{krequires} | sed -r 'y/-/_/; s/^(2\.6\.[0-9]+)_/\\1.0_/;')
        %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/\.aarch64$//' -e 's/-default$//')
        %if 0%{?suse_version} >= 1200
                %global requires_kmod_version %{version}_k%(echo %{krequires} | sed -r 'y/-/_/; s/^(2\.6\.[0-9]+)_/\\1.0_/;')


@@ -203,11 +207,16 @@ A set of scripts to operate Lustre resources in a High Availablity
 environment for both Pacemaker and rgmanager.
 %endif
 
 environment for both Pacemaker and rgmanager.
 %endif
 

+%if %{with lustre_tests}

 %package tests
 Summary: Lustre testing framework
 Group: System Environment/Kernel
 Provides: %{name}-tests = %{version}
 %package tests
 Summary: Lustre testing framework
 Group: System Environment/Kernel
 Provides: %{name}-tests = %{version}

+%if %{with lustre_iokit}

 Requires: %{name} = %{version}, lustre-iokit
 Requires: %{name} = %{version}, lustre-iokit

+%else
+Requires: %{name} = %{version}
+%endif

 Requires: %{requires_kmod_name} = %{requires_kmod_version}
 Requires: %{requires_kmod_tests_name} = %{requires_kmod_version}
 Requires: attr, rsync, perl, lsof, /usr/bin/getconf
 Requires: %{requires_kmod_name} = %{requires_kmod_version}
 Requires: %{requires_kmod_tests_name} = %{requires_kmod_version}
 Requires: attr, rsync, perl, lsof, /usr/bin/getconf


@@ -219,6 +228,7 @@ to be used by the Lustre testing framework.
 %if %{with lustre_modules}
 %kernel_module_package -n %{name}-tests -f %SOURCE7 default
 %endif
 %if %{with lustre_modules}
 %kernel_module_package -n %{name}-tests -f %SOURCE7 default
 %endif

+%endif

 
 %if %{with lustre_iokit}
 %package -n lustre-iokit
 
 %if %{with lustre_iokit}
 %package -n lustre-iokit


@@ -415,8 +425,10 @@ echo '%{_sbindir}/wiretest' >>lustre-tests.files
 %files -f lustre.files
 %defattr(-,root,root)
 %{_sbindir}/*
 %files -f lustre.files
 %defattr(-,root,root)
 %{_sbindir}/*

+%if %{with lustre_tests}

 %exclude %{_sbindir}/wirecheck
 %exclude %{_sbindir}/wiretest
 %exclude %{_sbindir}/wirecheck
 %exclude %{_sbindir}/wiretest

+%endif

 %if %{with zfs}
 %exclude %{_sbindir}/zfsobj2fid
 %endif
 %if %{with zfs}
 %exclude %{_sbindir}/zfsobj2fid
 %endif