X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre.spec.in;h=800d31e43b836a01c99906831bcb4308ef3504fb;hb=81530fe44c6b8d8819b8e70ea99ef7014c23a05b;hp=ddb6b85d03130f6cec2a52a17f91bf5ca1c21951;hpb=d746e64fe18fe8e5b386814d833877deca1796c7;p=fs%2Flustre-release.git

diff --git a/lustre.spec.in b/lustre.spec.in
index ddb6b85..800d31e 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -19,6 +19,10 @@
 %bcond_without mpi
 %bcond_with kabi
 
+# LUTF Turn off brp-python-precompile script as we don't want the python files
+# to be compiled on installation
+%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
+
 # By default both gss and gss keyring are disabled.
 # gss keyring requires the gss core. If the builder
 # request gss_keyring we must enable gss core even if
@@ -54,14 +58,16 @@
 %if %{defined kdir}
 	%define _take_kver 1
 %endif
+%if %{defined kobjdir}
+	%define _take_kobj 1
+%endif
 %{!?kdir:    %global kdir    /lib/modules/%{_kver}/source}
 %{!?kobjdir: %global kobjdir %(if [ "%{kdir}" = "/lib/modules/%{_kver}/source" ]; then echo "/lib/modules/%{_kver}/build"; else echo "%{kdir}"; fi)}
 
-
-%if 0%{?suse_version} >= 1310
-	%define _flavor %(basename %{kobjdir})
+%if 0%{?suse_version} >= 1310 && %{defined _take_kobj}
+	%global _flavor %(echo %{_kver} | sed -e 's/^.*-//')
 %else
-	%define _flavor default
+	%global _flavor default
 %endif
 
 %if %{defined _take_kver}
@@ -122,16 +128,17 @@
 
 %global modules_fs_path /lib/modules/%{_kver}/%{kmoddir}
 # requires want to set a version including epoch
-%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$//' -e s/%{_flavor}//)
+%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$//' -e 's/-%{_flavor}//')
 
-%if %{_vendor}=="redhat" || %{_vendor}=="fedora"
+%if "%{_vendor}" == "redhat" || "%{_vendor}" == "fedora"
 	%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_tests_name kmod-%{lustre_name}-tests
 	%endif
 	%global requires_kmod_version %{version}
-%else	#for Suse
+#for Suse
+%else
 	%global requires_kmod_name %{lustre_name}-kmp
 	%global requires_kmod_osd_zfs_name %{lustre_name}-osd-zfs-kmp
 	%if %{with lustre_tests}
@@ -145,12 +152,6 @@
 %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
 %define with_systemd 1
@@ -189,10 +190,12 @@ BuildRoot: %{_tmppath}/lustre-%{version}-root
 %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"
+%if %{with lustre_tests_lutf}
+Requires: python3 >= 3.6.0
+BuildRequires: python3-devel >= 3.6.0, swig
+%endif
+BuildRequires: libtool libyaml-devel zlib-devel libnl3-devel
+%if "%{_vendor}" == "redhat"
 BuildRequires: redhat-rpm-config
 BuildRequires: pkgconfig
 %else
@@ -200,24 +203,23 @@ BuildRequires: pkg-config
 %endif
 %if %{with gss}
 BuildRequires: krb5-devel openssl-devel
-Requires: krb5-libs openssl-libs
 %endif
 %if %{with servers}
-Requires: lustre-osd
-Requires: lustre-osd-mount
+Requires: %{name}-osd
+Requires: %{name}-osd-mount
 Obsoletes: lustre-server < %{version}
 Provides: lustre-server = %{version}-%{release}
 %endif
 Obsoletes: lustre-client < %{version}
 Provides: lustre-client = %{version}-%{release}
-%if %{_vendor}=="redhat" || %{_vendor}=="fedora"
+%if "%{_vendor}" == "redhat" || "%{_vendor}" == "fedora"
 #suse don't support selinux
 BuildRequires: libselinux-devel
 %endif
 %if %{with lustre_modules}
 %if %{with mofed}
 BuildRequires: mlnx-ofa_kernel-devel
-%if %{_vendor} == "redhat"
+%if "%{_vendor}" == "redhat"
 Requires: kmod-mlnx-ofa_kernel
 %else
 Requires: mlnx-ofa_kernel-kmp
@@ -229,7 +231,7 @@ BuildRequires: kernel-rpm-macros
 BuildRequires: %kernel_module_package_buildreqs
 # need to provide a /usr/lib/${uname -r)/build dir
 BuildRequires: kernel
-%if %{_vendor}=="redhat"
+%if "%{_vendor}" == "redhat"
 %if %{with kabi}
 BuildRequires: kernel-abi-whitelists
 %endif
@@ -274,24 +276,30 @@ echo $TMPFILE
 %if %{with lustre_utils}
 %package osd-ldiskfs-mount
 Summary: osd-ldiskfs-mount contains mount's ldiskfs specific dso.
-BuildRequires: e2fsprogs-devel
-Requires: ldiskfsprogs
+BuildRequires: e2fsprogs-devel >= 1.44.3 libmount-devel
+Requires: ldiskfsprogs > 1.45.6 libmount
 Provides: lustre-osd-mount = %{version}
+Provides: %{name}-osd-mount = %{version}
+Obsoletes: %{name}-osd-mount < %{version}
 Obsoletes: lustre-osd-mount < %{version}
 Group: System Environment/Kernel
 
 %description osd-ldiskfs-mount
 LDISKFS hooks for mount/mkfs into a dynamic library.
 
-%endif	# with lustre_utils
-%endif	# with ldiskfs
+# with lustre_utils
+%endif
+# with ldiskfs
+%endif
 
 %if %{with zfs}
 %kernel_module_package -n %{name}-osd-zfs -p %SOURCE5 -f %SOURCE6 %{_flavor}
 %if %{with lustre_utils}
 %package osd-zfs-mount
 Summary: osd-zfs-mount contains mount's zfs specific dso.
-Provides: lustre-osd-mount = %{version}
+BuildRequires: libmount-devel
+Requires: libmount
+Provides: %{name}-osd-mount = %{version}
 Obsoletes: lustre-osd-mount < %{version}
 # Tests also require zpool from zfs package:
 Requires: zfs
@@ -301,10 +309,12 @@ Group: System Environment/Kernel
 %description osd-zfs-mount
 ZFS hooks for mount/mkfs into a dynamic library.
 
-%endif	# with lustre_utils
-%endif	# with zfs
-
-%endif # with lustre_modules
+# with lustre_utils
+%endif
+# with zfs
+%endif
+# with lustre_modules
+%endif
 
 %if %{with servers}
 %package resource-agents
@@ -318,31 +328,53 @@ A set of scripts to operate Lustre resources in a High Availablity
 environment for both Pacemaker and rgmanager.
 %endif
 
+%package devel
+Summary: Lustre include headers
+Group: Development/Kernel
+Provides: lustre-devel = %{version}
+Requires: %{lustre_name} = %{version}
+%if %{with lustre_modules}
+Requires: %{requires_kmod_name} = %{requires_kmod_version}
+%endif
+
+%description devel
+This package contains the header files needed for building additional
+applications against the Lustre / LNet utilities libraries.
+
+:> lustre-devel.files
+
 %if %{with lustre_tests}
 %package tests
 Summary: Lustre testing framework
 Group: System Environment/Kernel
-Provides: lustre-tests = %{version}
+Provides: %{name}-tests = %{version}
 %if %{with lustre_iokit}
-Requires: lustre-iokit
+Requires: %{name} = %{version}, lustre-iokit
+%else
+Requires: %{name} = %{version}
 %endif
-Requires: lustre-client = %{version}
+Requires: lustre-devel = %{version}
 %if %{with lustre_modules}
 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 lustre_tests_lutf}
+Requires: python3 >= 3.6.0
+%endif
+Requires: attr, rsync, perl, lsof, /usr/bin/getconf
 %if %{with mpi}
-%if %{mpi_name} == "mpich"
+%if "%{mpi_name}" == "mpich"
 BuildRequires: mpich-devel
 %endif
-%if %{mpi_name} == "openmpi"
-%if %{_vendor} == "redhat" || 0%{?suse_version} < 1500
+%if "%{mpi_name}" == "openmpi"
+%if "%{_vendor}" == "redhat" || 0%{?suse_version} < 1500
 BuildRequires: openmpi-devel
 %else
 BuildRequires: openmpi2-devel
 %endif
+# openmpi
 %endif
+# mpi
 %endif
 
 %description tests
@@ -420,7 +452,7 @@ export UTILS_CFLAGS="${UTILS_CFLAGS} -D__SANE_USERSPACE_TYPES__=1"
 %endif
 
 # Disable any hardening or annotation since this doesn't make sense for
-# kernel code, and reset %optflags so that the vendor's overzealous flags don't
+# kernel code, and reset "optflags" so that the vendor's overzealous flags don't
 # create build failures.
 %define optflags -g -O2 -Werror
 %undefine _annotated_build
@@ -434,17 +466,52 @@ if [ -n "$CONFIGURE_ARGS" ]; then
 	# remove --with-kmp-moddir from configure arguments,
 	# it will be set --with-kmp-moddir=%%kmoddir
 	CONFIGURE_ARGS=$(echo $CONFIGURE_ARGS | sed -e 's/"\?--with-kmp-moddir=[^ ][^ ]* \?//')
+	# remove env variables from config cache built by initial configure,
+	# and create dedicated cache in temporary build directory
+	if [ -f "$CONFIG_CACHE_FILE" ]; then
+		TMP_CONFIG_CACHE="$(mktemp --tmpdir newconfig-XXXXXXXX.cache)"
+		sed -e "/ac_cv_env/d" \
+		    -e "/am_cv_CC_dependencies_compiler_type/d" \
+		    -e "/lb_cv_mpi_tests/d" \
+		       "$CONFIG_CACHE_FILE" > $TMP_CONFIG_CACHE
+		CONFIGURE_ARGS="$CONFIGURE_ARGS --cache-file=$TMP_CONFIG_CACHE"
+	fi
 fi
 
 # we need to eval "configure" because $CONFIGURE_ARGS could have a quoted
 # string in it which we don't want word splitted by the shell
 # also remove (build|host|target) options because they will be specified
 # inside $CONFIGURE_ARGS
-# kmod tools/scripts require %{name} directory with kernel modules
-%define eval_configure %(echo '%configure' | sed -e 's#\./configure#eval ./configure#' -e 's/--\\(build\\|host\\|target\\)=[^ ][^ ]* //g')
+# kmod tools/scripts require "name" directory with kernel modules
 
-%{?_openmpi_load}
+%if 0%{?rhel} >= 9
+%define _configure eval ./configure
+%define eval_configure %configure
+%else
+%define eval_configure %(echo -n '%configure' | sed -e 's#\./configure#eval ./configure#' -e 's/--\\(build\\|host\\|target\\)=[^ ][^ ]* //g')
+%endif
+
+%if %{with mpi}
+%if "%{mpi_name}" == "mpich"
 %{?_mpich_load}
+%endif
+%if "%{mpi_name}" == "openmpi"
+%{?_openmpi_load}
+%endif
+# mpi
+%endif
+
+%if %{with mofed}
+	o2ib_path=$(find /usr/src/ofa_kernel/ -type d -name ofed_scripts | xargs dirname)
+	if [ -z "$o2ib_path" ]; then
+		echo "ERROR: could not find OFED devel headers"
+		exit 1
+	fi
+	if [ $(echo $o2ib_path | wc -w) -ge 2 ]; then
+		echo "ERROR: multiple OFED versions installed"
+		exit 1
+	fi
+%endif
 
 %eval_configure $CONFIGURE_ARGS \
 	%{?with_lustre_tests:--enable-tests}%{!?with_lustre_tests:--disable-tests} \
@@ -462,7 +529,7 @@ fi
 	%{!?with_manpages:--disable-manpages} \
 	%{!?with_systemd:--with-systemdsystemunitdir=no} \
 	%{?with_systemd:--with-systemdsystemunitdir=%{_unitdir}} \
-	%{?with_mofed:--with-o2ib=/usr/src/ofa_kernel/default} \
+	%{?with_mofed:--with-o2ib=$o2ib_path} \
 	--with-linux=%{kdir} \
 	--with-linux-obj=%{kobjdir} \
 	--with-kmp-moddir=%{kmoddir}/%{name}
@@ -476,9 +543,27 @@ fi
 
 make %{?_smp_mflags} -s %{?make_args}
 
+%if %{with mpi}
+%if "%{mpi_name}" == "mpich"
+%{?_mpich_unload}
+%endif
+%if "%{mpi_name}" == "openmpi"
+%{?_openmpi_unload}
+%endif
+# mpi
+%endif
+
 %install
-%{?_openmpi_load}
+
+%if %{with mpi}
+%if "%{mpi_name}" == "mpich"
 %{?_mpich_load}
+%endif
+%if "%{mpi_name}" == "openmpi"
+%{?_openmpi_load}
+%endif
+# mpi
+%endif
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
@@ -508,6 +593,15 @@ mv $basemodpath/fs/kinode.ko $RPM_BUILD_ROOT%{_libdir}/lustre/tests/kernel/
 %endif
 %endif
 
+%if %{without mpi}
+if [ -d $RPM_BUILD_ROOT%{_libdir}/openmpi ] ; then
+	rm -fr $RPM_BUILD_ROOT%{_libdir}/openmpi
+fi
+if [ -d $RPM_BUILD_ROOT%{_libdir}/mpich ] ; then
+	rm -fr $RPM_BUILD_ROOT%{_libdir}/mpich
+fi
+%endif
+
 :> lustre.files
 
 %if %{with servers} && %{with lustre_utils}
@@ -524,7 +618,7 @@ echo '%{_sysconfdir}/ha.d/resource.d/Lustre' >>lustre.files
 echo '%{_unitdir}/lnet.service' >>lustre.files
 %endif
 
-%if %{_vendor}=="redhat"
+%if "%{_vendor}" == "redhat"
 # The following scripts are Red Hat specific
 %if %{with servers}
 echo '%{_sysconfdir}/init.d/lustre' >>lustre.files
@@ -551,7 +645,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/liblnetconfig.la
 echo '%attr(-, root, root) %{_libdir}/liblnetconfig.a' >>lustre.files
 %endif
 %if %{with shared}
-echo '%attr(-, root, root) %{_libdir}/liblnetconfig.so' >>lustre.files
+echo '%attr(-, root, root) %{_libdir}/liblnetconfig.so' >>lustre-devel.files
 echo '%attr(-, root, root) %{_libdir}/liblnetconfig.so.*' >>lustre.files
 %endif
 
@@ -580,6 +674,15 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/liblustreapi.la
 
 %if %{with lustre_tests}
 :> lustre-tests.files
+%if %{with mpi}
+%if "%{mpi_name}" == "mpich"
+%{?_mpich_load}
+%endif
+%if "%{mpi_name}" == "openmpi"
+%{?_openmpi_load}
+%endif
+# mpi
+%endif
 echo '%{_libdir}/lustre/tests/*' >>lustre-tests.files
 echo '%{_bindir}/mcreate' >>lustre-tests.files
 echo '%{_bindir}/munlink' >>lustre-tests.files
@@ -589,6 +692,31 @@ echo '%{_sbindir}/wiretest' >>lustre-tests.files
 if [ -n "$MPI_BIN" ]; then
 	echo "$MPI_BIN/*" >>lustre-tests.files
 fi
+%if %{with lustre_tests_lutf}
+echo '%{_libdir}/lustre/tests/lutf/*' >>lustre-tests.files
+%endif
+%endif
+
+%if %{with lustre_tests_lutf}
+echo '%{_libdir}/lustre/tests/lutf/*' >>lustre-tests.files
+%endif
+
+%files devel -f lustre-devel.files
+%defattr(-,root,root)
+%{_libdir}/pkgconfig/lustre.pc
+%if %{with static}
+%{_libdir}/liblustreapi.a
+%endif
+%if %{with shared}
+%{_libdir}/liblustreapi.so
+%endif
+%{_includedir}/lustre
+%if %{with lustre_modules}
+%{_includedir}/linux/lnet
+%{_includedir}/linux/lustre
+%else
+%exclude %{_includedir}/linux/lnet
+%exclude %{_includedir}/linux/lustre
 %endif
 
 %files -f lustre.files
@@ -616,7 +744,9 @@ fi
 %{_bindir}/lfs
 %{_bindir}/lfs_migrate
 /sbin/mount.lustre
+%if %{with servers}
 /sbin/mount.lustre_tgt
+%endif
 @BASH_COMPLETION_DIR@
 %endif
 
@@ -624,15 +754,9 @@ fi
 %{_mandir}/man?/*
 %endif
 
-%if %{with static}
-%{_libdir}/liblustreapi.a
-%endif
 %if %{with shared}
-%{_libdir}/liblustreapi.so*
+%{_libdir}/liblustreapi.so.*
 %endif
-%{_includedir}/lustre
-%{_includedir}/linux/lnet
-%{_includedir}/linux/lustre
 %{_sysconfdir}/udev/rules.d/99-lustre.rules
 %if %{with servers}
 %{_sysconfdir}/udev/rules.d/99-lustre-server.rules
@@ -668,7 +792,8 @@ fi
 %endif
 %endif
 
-%endif # with lustre_modules
+# with lustre_modules
+%endif
 
 %if %{with servers}
 %files resource-agents
@@ -686,6 +811,7 @@ fi
 %defattr(-, root, root)
 %{_bindir}/iokit-config
 %{_bindir}/iokit-gather-stats
+
 %{_bindir}/iokit-libecho
 %{_bindir}/iokit-lstats
 %{_bindir}/iokit-parse-ior