X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre.spec.in;h=cced3d5142244225b73791dda187c926387fc16f;hb=15998eb78e279f1bfa5059f0f65087f7851d40ff;hp=1a7bf96297d637322e0c9662d0806d9f07bf981e;hpb=d6c89d28949f384cfd5bc766ea44407b1acdc500;p=fs%2Flustre-release.git

diff --git a/lustre.spec.in b/lustre.spec.in
index 1a7bf96..cced3d5 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 %(basename "%{kobjdir}")
 %else
-	%define _flavor default
+	%global _flavor default
 %endif
 
 %if %{defined _take_kver}
@@ -122,7 +128,7 @@
 
 %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"
 	%global requires_kmod_name kmod-%{lustre_name}
@@ -145,12 +151,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,9 +189,11 @@ 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 %{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
@@ -273,8 +275,8 @@ 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
+Requires: ldiskfsprogs >= 1.45.6.wc1
 Provides: lustre-osd-mount = %{version}
 Obsoletes: lustre-osd-mount < %{version}
 Group: System Environment/Kernel
@@ -317,6 +319,21 @@ 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
@@ -325,12 +342,15 @@ Provides: lustre-tests = %{version}
 %if %{with lustre_iokit}
 Requires: lustre-iokit
 %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"
 BuildRequires: mpich-devel
@@ -433,6 +453,13 @@ 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 "/ac_cv_env/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
@@ -550,7 +577,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
 
@@ -588,6 +615,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
@@ -615,7 +667,9 @@ fi
 %{_bindir}/lfs
 %{_bindir}/lfs_migrate
 /sbin/mount.lustre
+%if %{with servers}
 /sbin/mount.lustre_tgt
+%endif
 @BASH_COMPLETION_DIR@
 %endif
 
@@ -623,15 +677,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
@@ -685,6 +733,7 @@ fi
 %defattr(-, root, root)
 %{_bindir}/iokit-config
 %{_bindir}/iokit-gather-stats
+
 %{_bindir}/iokit-libecho
 %{_bindir}/iokit-lstats
 %{_bindir}/iokit-parse-ior