LU-12511 build: ignore kmod handling in spec file for

 utilities only build

The lustre spec file handles kmod even when --disable-modules is
used. We don't need to manage any kmod in this case so lets make
that handling only when ${with lustre_modules} is true.

Test-Parameters: trivial
Change-Id: Ifa43720aacabae5f41abf250d2e03b235c34cb4c
Signed-off-by: James Simmons <jsimmons@infradead.org>
Reviewed-on: https://review.whamcloud.com/38649
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Reviewed-by: Nathaniel Clark <nclark@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre.spec.in b/lustre.spec.in
index 20be3db..8d15abf 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -100,6 +100,7 @@
     %endif
 %endif
 
     %endif
 %endif
 

+%if %{with lustre_modules}

 %if %{undefined kmoddir}
     %if %{defined kernel_module_package_moddir}
         %global kmoddir %{kernel_module_package_moddir}
 %if %{undefined kmoddir}
     %if %{defined kernel_module_package_moddir}
         %global kmoddir %{kernel_module_package_moddir}


@@ -117,7 +118,6 @@
 %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$//')
 
 %if %{_vendor}=="redhat" || %{_vendor}=="fedora"
 %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$//')
 
 %if %{_vendor}=="redhat" || %{_vendor}=="fedora"

-       %global requires_yaml_name libyaml

        %global requires_kmod_name kmod-%{lustre_name}
        %global requires_kmod_osd_zfs_name kmod-%{lustre_name}-osd-zfs
        %if %{with lustre_tests}
        %global requires_kmod_name kmod-%{lustre_name}
        %global requires_kmod_osd_zfs_name kmod-%{lustre_name}-osd-zfs
        %if %{with lustre_tests}


@@ -125,7 +125,6 @@
        %endif
        %global requires_kmod_version %{version}
 %else  #for Suse
        %endif
        %global requires_kmod_version %{version}
 %else  #for Suse

-       %global requires_yaml_name libyaml-0-2

        %global requires_kmod_name %{lustre_name}-kmp
        %global requires_kmod_osd_zfs_name %{lustre_name}-osd-zfs-kmp
        %if %{with lustre_tests}
        %global requires_kmod_name %{lustre_name}-kmp
        %global requires_kmod_osd_zfs_name %{lustre_name}-osd-zfs-kmp
        %if %{with lustre_tests}


@@ -137,6 +136,13 @@
                %global requires_kmod_version %{version}_%(echo %{krequires} | sed -r 'y/-/_/; s/^(2\.6\.[0-9]+)_/\\1.0_/;')
        %endif
 %endif
                %global requires_kmod_version %{version}_%(echo %{krequires} | sed -r 'y/-/_/; s/^(2\.6\.[0-9]+)_/\\1.0_/;')
        %endif
 %endif

+%endif
+
+%if %{_vendor}=="redhat" || %{_vendor}=="fedora"
+       %global requires_yaml_name libyaml
+%else  #for Suse
+       %global requires_yaml_name libyaml-0-2
+%endif

 
 # RHEL >= 7 comes with systemd
 %if 0%{?rhel} >= 7
 
 # RHEL >= 7 comes with systemd
 %if 0%{?rhel} >= 7


@@ -173,7 +179,10 @@ Source6: kmp-lustre-osd-zfs.files
 Source7: kmp-lustre-tests.files
 URL: https://wiki.whamcloud.com/
 BuildRoot: %{_tmppath}/lustre-%{version}-root
 Source7: kmp-lustre-tests.files
 URL: https://wiki.whamcloud.com/
 BuildRoot: %{_tmppath}/lustre-%{version}-root

-Requires: %{requires_kmod_name} = %{requires_kmod_version} zlib
+%if %{with lustre_modules}
+Requires: %{requires_kmod_name} = %{requires_kmod_version}
+%endif
+Requires: zlib

 Requires: %{requires_yaml_name}
 BuildRequires: libtool libyaml-devel zlib-devel binutils-devel
 %if %{_vendor}=="redhat"
 Requires: %{requires_yaml_name}
 BuildRequires: libtool libyaml-devel zlib-devel binutils-devel
 %if %{_vendor}=="redhat"


@@ -309,8 +318,10 @@ Provides: lustre-tests = %{version}
 Requires: lustre-iokit
 %endif
 Requires: lustre-client = %{version}
 Requires: lustre-iokit
 %endif
 Requires: lustre-client = %{version}

+%if %{with lustre_modules}

 Requires: %{requires_kmod_name} = %{requires_kmod_version}
 Requires: %{requires_kmod_tests_name} = %{requires_kmod_version}
 Requires: %{requires_kmod_name} = %{requires_kmod_version}
 Requires: %{requires_kmod_tests_name} = %{requires_kmod_version}

+%endif

 Requires: attr, rsync, perl, lsof, libtool, /usr/bin/getconf
 %if %{with mpi}
 %if %{mpi_name} == "mpich"
 Requires: attr, rsync, perl, lsof, libtool, /usr/bin/getconf
 %if %{with mpi}
 %if %{mpi_name} == "mpich"