redhat: parallel builds

[openafs.git] / src / packaging / RedHat / openafs.spec.in

diff --git a/src/packaging/RedHat/openafs.spec.in b/src/packaging/RedHat/openafs.spec.in
index 71e4625..8938e0d 100644 (file)
--- a/src/packaging/RedHat/openafs.spec.in
+++ b/src/packaging/RedHat/openafs.spec.in
@@ -12,14 +12,10 @@
 # Determine presence of rpmbuild command line --define arguments and set
 # defaults if not present.
 #
-%define kernvers_on_cmdline %{?kernvers:1}%{!?kernvers:0}
 %define build_userspace_on_cmdline %{?build_userspace:1}%{!?build_userspace:0}
 %define build_modules_on_cmdline %{?build_modules:1}%{!?build_modules:0}
 %define debugspec_on_cmdline %{?debugspec:1}%{!?debugspec:0}
 
-%if !%{kernvers_on_cmdline}
-%define kernvers %(uname -r)
-%endif
 %if !%{build_userspace_on_cmdline}
 %define build_userspace 1
 %endif
@@ -118,7 +114,6 @@ Source11: http://www.openafs.org/dl/openafs/%{afsvers}/ChangeLog
 
 Source20: https://www.central.org/dl/cellservdb/CellServDB.2017-03-14
 
-Source30: openafs-kernel-version.sh
 Source996: openafs-kvers-is.sh
 Source997: openafs-buildfedora.pl
 Source998: openafs-buildall.sh
@@ -417,7 +412,7 @@ krb4 lookalike services.
 
 : @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 : @@@
-: @@@ kernel version:     %{kernvers}
+: @@@ kernel version:     %{kverrel}
 : @@@ kernel variations:  %{kvariants}
 : @@@ PAM modules dir:    %{pamdir}
 : @@@ build userspace:    %{build_userspace}
@@ -596,6 +591,8 @@ export KRB5_CONFIG
        --with-linux-kernel-packaging \
 %if %{build_modules}
        --with-linux-kernel-headers=${ksrc} \
+%else
+       --disable-kernel-module \
 %endif
 %if %{krb5support}
        --with-krb5 \
@@ -609,7 +606,7 @@ export KRB5_CONFIG
        || exit 1
 
 # Build the libafs tree
-make only_libafs_tree || exit 1
+make %{_smp_mflags} only_libafs_tree || exit 1
 
 %if %{krb5support}
 %if %{?krb5config:1}%{!?krb5config:0}
@@ -658,7 +655,7 @@ done
 
 %if %{build_userspace}
 # Build the user-space AFS stuff
-make all_nolibafs
+make %{_smp_mflags} all_nolibafs
 %endif
 
 %if %{build_modules}
@@ -666,10 +663,10 @@ for kvariant in %{kvariants}
 do
   if [ -n "${kvariant}" ] ; then
     pushd _kmod_build_$kvariant;
-    make all
+    make %{_smp_mflags} all
     popd
   else
-    make libafs
+    make %{_smp_mflags} libafs
   fi
 done
 %endif
@@ -696,7 +693,7 @@ export DONT_GPRINTIFY=1 # Do not modify initscripts.
 #-----------------------------------------------------------------------------
 # Install userspace files
 #-----------------------------------------------------------------------------
-make install_nolibafs DESTDIR="$RPM_BUILD_ROOT"
+make %{_smp_mflags} install_nolibafs DESTDIR="$RPM_BUILD_ROOT"
 
 # Set the executable bit on libraries in libdir, so rpmbuild knows to
 # create "Provides" entries in the package metadata for the libraries
@@ -1336,6 +1333,7 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||:
 %{_includedir}/timer.h
 %{_includedir}/ubik.h
 %{_includedir}/ubik_int.h
+%{_includedir}/opr/lock.h
 %{_includedir}/opr/queue.h
 %{_libdir}/afs
 %{_libdir}/libafshcrypto.a