LU-8383 build: Spec file cleanup after LU-5614

Add dependency from kmod-%{lustre_name}-tests
Fix BuildRequires: %kernel_module_package_buildreqs

Test-Parameters: trivial

Change-Id: I92325687812f10fb308971391e67bb80c08ae5db
Signed-off-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Christopher J. Morrone <morrone2@llnl.gov>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Reviewed-on: http://review.whamcloud.com/22125
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Tested-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/contrib/lbuild/lbuild-sles b/contrib/lbuild/lbuild-sles
index 435e88b..6a9bebd 100644 (file)
--- a/contrib/lbuild/lbuild-sles
+++ b/contrib/lbuild/lbuild-sles
@@ -58,6 +58,13 @@ prepare_and_build_srpm() {
         fatal 1 "Failed to build kernel source RPM"
     fi
 
         fatal 1 "Failed to build kernel source RPM"
     fi
 

+    # for SLES, we also need to build the kernel-syms rpm
+    if ! rpmbuild $rpmbuildopt $targets \
+                   --define "_topdir $TOPDIR" \
+                   $TOPDIR/SOURCES/kernel-syms.spec 2>&1; then
+        fatal 1 "Failed to build kernel syms RPM"
+    fi
+

 }
 
 devel_kernel_name() {
 }
 
 devel_kernel_name() {

diff --git a/contrib/lbuild/lbuild-sles11 b/contrib/lbuild/lbuild-sles11
index 97521bd..8514f96 100644 (file)
--- a/contrib/lbuild/lbuild-sles11
+++ b/contrib/lbuild/lbuild-sles11
@@ -23,7 +23,7 @@ edit_specs() {
     # edit the SPECs with our changes
     local spec
     (cd $TOPDIR/SOURCES; ./mkspec --release ${lnxrel})
     # edit the SPECs with our changes
     local spec
     (cd $TOPDIR/SOURCES; ./mkspec --release ${lnxrel})

-    for spec in $RPMSMPTYPE source; do
+    for spec in $RPMSMPTYPE source syms; do

         #cp $TOPDIR/SOURCES/kernel-$spec.spec{,.orig}
         sed -i -e "s/^\(Release: *\).*$/\1${lnxrel}_${buildid}/" \
                -e '/^%setup /a\
         #cp $TOPDIR/SOURCES/kernel-$spec.spec{,.orig}
         sed -i -e "s/^\(Release: *\).*$/\1${lnxrel}_${buildid}/" \
                -e '/^%setup /a\

diff --git a/contrib/lbuild/lbuild-sles12 b/contrib/lbuild/lbuild-sles12
index cce4e56..1a02945 100644 (file)
--- a/contrib/lbuild/lbuild-sles12
+++ b/contrib/lbuild/lbuild-sles12
@@ -23,7 +23,7 @@ edit_specs() {
     # edit the SPECs with our changes
     local spec
     (cd $TOPDIR/SOURCES; ./mkspec --release ${lnxrel})
     # edit the SPECs with our changes
     local spec
     (cd $TOPDIR/SOURCES; ./mkspec --release ${lnxrel})

-    for spec in $RPMSMPTYPE source; do
+    for spec in $RPMSMPTYPE source syms; do

         #cp $TOPDIR/SOURCES/kernel-$spec.spec{,.orig}
         sed -i -e "s/^\(Release: *\).*$/\1${lnxrel}_${buildid}/" \
                -e '/^%setup /a\
         #cp $TOPDIR/SOURCES/kernel-$spec.spec{,.orig}
         sed -i -e "s/^\(Release: *\).*$/\1${lnxrel}_${buildid}/" \
                -e '/^%setup /a\

diff --git a/lustre.spec.in b/lustre.spec.in
index 70ff7fc..e078822 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -80,9 +80,11 @@
 
 %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

        %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

        %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_/;')


@@ -123,6 +125,7 @@ BuildRequires: libselinux-devel
 Requires: libselinux
 %endif
 %if %{with lustre_modules}
 Requires: libselinux
 %endif
 %if %{with lustre_modules}

+BuildRequires: %kernel_module_package_buildreqs

 %if %{_vendor}=="redhat"
 BuildRequires: redhat-rpm-config
 %endif
 %if %{_vendor}=="redhat"
 BuildRequires: redhat-rpm-config
 %endif


@@ -132,9 +135,6 @@ BuildRequires: redhat-rpm-config
 Userspace tools and files for the Lustre file system.
 
 %if %{with lustre_modules}
 Userspace tools and files for the Lustre file system.
 
 %if %{with lustre_modules}

-%kernel_module_package_buildreqs
-
-# Lustre modules

 %kernel_module_package -n %{name} -p %SOURCE1 -f %SOURCE2 default
 
 %if %{with ldiskfs}
 %kernel_module_package -n %{name} -p %SOURCE1 -f %SOURCE2 default
 
 %if %{with ldiskfs}


@@ -171,7 +171,9 @@ ZFS hooks for mount/mkfs into a dynamic library.
 Summary: Lustre testing framework
 Group: Development/Kernel
 Provides: %{name}-tests = %{version}
 Summary: Lustre testing framework
 Group: Development/Kernel
 Provides: %{name}-tests = %{version}

-Requires: %{name} = %{version}, %{requires_kmod_name} = %{requires_kmod_version}, lustre-iokit
+Requires: %{name} = %{version}, lustre-iokit
+Requires: %{requires_kmod_name} = %{requires_kmod_version}
+Requires: %{requires_kmod_tests_name} = %{requires_kmod_version}

 Requires: attr, rsync, perl, lsof, /usr/bin/getconf
 
 %description tests
 Requires: attr, rsync, perl, lsof, /usr/bin/getconf
 
 %description tests


@@ -179,7 +181,7 @@ This package contains a set of test binaries and scripts that are intended
 to be used by the Lustre testing framework.
 
 %if %{with lustre_modules}
 to be used by the Lustre testing framework.
 
 %if %{with lustre_modules}

-%kernel_module_package -n %{name}-tests -f %SOURCE7  default
+%kernel_module_package -n %{name}-tests -f %SOURCE7 default

 %endif
 
 %if %{with lustre_iokit}
 %endif
 
 %if %{with lustre_iokit}