X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=2310a45a7334cf568a19d2a5f335539c7e611d3d;hp=65aa4fb72c521f0ef4d5a44d15870cd3531fbe26;hb=f21b9441275bd0d8b0d56cf8441aa67bede37ddc;hpb=55f211c800ffaabf6aba1313435ff039a01eee37 diff --git a/lustre.spec.in b/lustre.spec.in index 65aa4fb..2310a45 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -65,7 +65,7 @@ %{!?kobjdir: %global kobjdir %(if [ "%{kdir}" = "/lib/modules/%{_kver}/source" ]; then echo "/lib/modules/%{_kver}/build"; else echo "%{kdir}"; fi)} %if 0%{?suse_version} >= 1310 && %{defined _take_kobj} - %global _flavor %(basename "%{kobjdir}") + %global _flavor %(echo %{_kver} | sed -e 's/^.*-//') %else %global _flavor default %endif @@ -130,14 +130,15 @@ # 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}//') -%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} @@ -194,7 +195,7 @@ Requires: python3 >= 3.6.0 BuildRequires: python3-devel >= 3.6.0, swig %endif BuildRequires: libtool libyaml-devel zlib-devel libnl3-devel -%if %{_vendor}=="redhat" +%if "%{_vendor}" == "redhat" BuildRequires: redhat-rpm-config BuildRequires: pkgconfig %else @@ -204,21 +205,21 @@ BuildRequires: pkg-config BuildRequires: krb5-devel openssl-devel %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 @@ -230,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 @@ -275,8 +276,8 @@ echo $TMPFILE %if %{with lustre_utils} %package osd-ldiskfs-mount Summary: osd-ldiskfs-mount contains mount's ldiskfs specific dso. -BuildRequires: e2fsprogs-devel >= 1.44.3 -Requires: ldiskfsprogs > 1.45.6 +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} @@ -286,14 +287,18 @@ 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. +BuildRequires: libmount-devel +Requires: libmount Provides: %{name}-osd-mount = %{version} Obsoletes: lustre-osd-mount < %{version} # Tests also require zpool from zfs package: @@ -304,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 @@ -356,17 +363,17 @@ 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 -%endif -%endif +%endif # openmpi +%endif # mpi %description tests This package contains a set of test binaries and scripts that are intended @@ -443,7 +450,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 @@ -461,7 +468,10 @@ if [ -n "$CONFIGURE_ARGS" ]; then # 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 + 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 @@ -470,11 +480,23 @@ fi # 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 +%endif # mpi %if %{with mofed} o2ib_path=$(find /usr/src/ofa_kernel/ -type d -name ofed_scripts | xargs dirname) @@ -518,9 +540,25 @@ fi make %{?_smp_mflags} -s %{?make_args} +%if %{with mpi} +%if %{mpi_name} == "mpich" +%{?_mpich_unload} +%endif +%if %{mpi_name} == "openmpi" +%{?_openmpi_unload} +%endif +%endif # mpi + %install -%{?_openmpi_load} + +%if %{with mpi} +%if %{mpi_name} == "mpich" %{?_mpich_load} +%endif +%if %{mpi_name} == "openmpi" +%{?_openmpi_load} +%endif +%endif # mpi make install DESTDIR=$RPM_BUILD_ROOT @@ -550,6 +588,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} @@ -566,7 +613,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 @@ -622,6 +669,14 @@ 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 +%endif # mpi echo '%{_libdir}/lustre/tests/*' >>lustre-tests.files echo '%{_bindir}/mcreate' >>lustre-tests.files echo '%{_bindir}/munlink' >>lustre-tests.files @@ -731,7 +786,8 @@ echo '%{_libdir}/lustre/tests/lutf/*' >>lustre-tests.files %endif %endif -%endif # with lustre_modules +# with lustre_modules +%endif %if %{with servers} %files resource-agents