%bcond_with zfs
%bcond_without lustre_tests
%bcond_without lustre_iokit
+%bcond_without lustre_modules
%if %{without servers}
# --without servers overrides --with {ldiskfs|zfs}
%endif
%endif
+%if %{undefined kmoddir}
+ %if %{defined kernel_module_package_moddir}
+ %global kmoddir %{kernel_module_package_moddir}
+ %else
+ %if %{defined suse_kernel_module_package}
+ %global kmoddir updates
+ %else
+ %global kmoddir extra
+ %endif
+ %endif
+%endif
+
%if %{defined cross_path} && %{defined post_script}
%define rpm_post_base %(echo $(dirname %{cross_path})/%{lustre_name})
%endif
%description
Userspace tools and files for the Lustre file system.
+%if %{with lustre_modules}
%package modules
Summary: Kernel Lustre modules for Linux %{kversion}
%if %{defined cross_requires}
implementation of the OSD API for using the ZFS filesystem as the underlying
backing store of a Lustre server.
%endif
+%endif # with lustre_modules
%package source
Summary: Object-Based Disk storage driver source
ln lnet/ChangeLog ChangeLog-lnet
%build
-# if RPM_BUILD_NCPUS unset, set it
-if [ -z "$RPM_BUILD_NCPUS" ] ; then
- RPM_BUILD_NCPUS=$(egrep -c "^cpu[0-9]+" /proc/stat 2>/dev/null || echo 0 :)
- if [ $RPM_BUILD_NCPUS -eq 0 ] ; then
- RPM_BUILD_NCPUS=1
- fi
- if [ $RPM_BUILD_NCPUS -gt 8 ] ; then
- RPM_BUILD_NCPUS=8
- fi
-fi
-
-rm -rf $RPM_BUILD_ROOT
# Set an explicit path to our Linux tree, if we can.
cd $RPM_BUILD_DIR/lustre-%{version}
CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-iokit"
%endif
+%if %{with lustre_modules}
+CONFIGURE_ARGS="$CONFIGURE_ARGS --enable-modules"
+%else
+CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-modules"
+%endif
+
# if %%kdir was given, make sure it's not in the configure arguments
if [ -n "%kdir" ]; then
CONFIGURE_ARGS=$(echo $CONFIGURE_ARGS | sed -e 's/"\?--with-linux=[^ ][^ ]* \?//')
if [ -n "%kobjdir" ]; then
CONFIGURE_ARGS=$(echo $CONFIGURE_ARGS | sed -e 's/"\?--with-linux-obj=[^ ][^ ]* \?//')
fi
+# 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=[^ ][^ ]* \?//')
# 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
%eval_configure \
%{?kdir: --with-linux=%kdir} %{?kobjdir: --with-linux-obj=%kobjdir} \
- $CONFIGURE_ARGS
-make -j $RPM_BUILD_NCPUS -s %{?make_args}
+ $CONFIGURE_ARGS --with-kmp-moddir=%{kmoddir}
+make %{?_smp_mflags} -s %{?make_args}
%install
make install DESTDIR=$RPM_BUILD_ROOT
# hack to avoid changing the libsysio code for "make install"
rm -f $RPM_BUILD_ROOT%{_libdir}/libsysio.a
-# hack to include the llog_test module in lustre-tests
-llog_base=$RPM_BUILD_DIR/lustre-%{version}/lustre/obdclass/llog_test
-if [ -e ${llog_base}.ko ]; then
- cp ${llog_base}.ko $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre
-elif [ -e ${llog_base}.o ]; then
- cp ${llog_base}.o $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre
-fi
-
# The .ha_v2 extension identifies the heartbeat resource agent as using
# legacy syntax. Install a compatibility symlink to avoid conflicts when
# newer-style agents are added.
# fc18 needs 'x' permission for library files
find $RPM_BUILD_ROOT -name '*.so' | xargs chmod +x
-cat >lustre.files <<EOF
-%attr(-, root, root) %{?rootdir}/sbin/mount.lustre
-%attr(-, root, root) %{_sbindir}/*
-%attr(-, root, root) %{_bindir}/lfs
-%attr(-, root, root) %{_bindir}/lfs_migrate
-%attr(-, root, root) %{_bindir}/llbackup
-%attr(-, root, root) %{_bindir}/llobdstat
-%attr(-, root, root) %{_bindir}/llstat
-%attr(-, root, root) %{_bindir}/lustre_req_history
-%attr(-, root, root) %{_bindir}/mcreate
-%attr(-, root, root) %{_bindir}/munlink
-%attr(-, root, root) %{_bindir}/plot-llstat
-%attr(-, root, root) %{_bindir}/req_layout
-%attr(-, root, root) %{_libdir}/libptlctl.a
-%attr(-, root, root) %{_libdir}/liblustreapi.a
-%attr(-, root, root) %{_libdir}/liblustreapi.so
-%attr(-, root, root) %{_mandir}/man?/*
-%attr(-, root, root) %{_datadir}/lustre
-%attr(-, root, root) %{_includedir}/lustre
-%attr(-, root, root) %{_includedir}/libcfs
-%attr(-, root, root) %{_libexecdir}/lustre/lc_common
-%attr(-, root, root) %{_sysconfdir}/udev/rules.d/99-lustre.rules
-%attr(-, root, root) %{_sysconfdir}/init.d/lnet
-%attr(-, root, root) %{_sysconfdir}/init.d/lustre
-%attr(-, root, root) %config(noreplace) %{_sysconfdir}/ldev.conf
-%attr(-, root, root) %{_sysconfdir}/sysconfig/lustre
-%attr(-, root, root) %{_libexecdir}/lustre/haconfig
-%attr(-, root, root) %{_sysconfdir}/ha.d/resource.d/Lustre.ha_v2
-%attr(-, root, root) %{_sysconfdir}/ha.d/resource.d/Lustre
-EOF
-
-if [ -f $RPM_BUILD_ROOT%{_libdir}/libcfsutil.a ] ; then
- echo '%attr(-, root, root) %{_libdir}/libcfsutil.a' >>lustre.files
-fi
+:> lustre.files
if [ -f $RPM_BUILD_ROOT%{_libdir}/liblustre.so ] ; then
- echo '%attr(-, root, root) %{_libdir}/liblustre.a' >>lustre.files
- echo '%attr(-, root, root) %{_libdir}/liblustre.so' >>lustre.files
+ echo '%{_libdir}/liblustre.a' >>lustre.files
+ echo '%{_libdir}/liblustre.so' >>lustre.files
fi
if [ -f $RPM_BUILD_ROOT%{_libdir}/libiam.a ] ; then
- echo '%attr(-, root, root) %{_libdir}/libiam.a' >>lustre.files
+ echo '%{_libdir}/libiam.a' >>lustre.files
fi
if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/snmp ] ; then
- echo '%attr(-, root, root) %{_libdir}/lustre/snmp' >>lustre.files
- echo '%attr(-, root, root) %{_datadir}/lustre/snmp/mibs' >>lustre.files
-fi
-
-# Have universal lustre headers
-if [ -f $RPM_BUILD_DIR/lustre-%{version}/lustre/include/lustre/lustre_idl.h ] ; then
- echo '%attr(-, root, root) %{_includedir}/linux/lustre_user.h' >>lustre.files
-else
- echo '%attr(-, root, root) %{_includedir}/linux/lustre_idl.h' >>lustre.files
-fi
-
-if [ -f $RPM_BUILD_DIR/lustre-%{version}/lustre/include/linux/lustre_types.h ] ; then
- echo '%attr(-, root, root) %{_includedir}/linux/lustre_types.h' >>lustre.files
+ echo '%{_libdir}/lustre/snmp' >>lustre.files
+ echo '%{_datadir}/lustre/snmp/mibs' >>lustre.files
fi
%if %{with lustre_tests}
-echo '%attr(-, root, root) %{_libdir}/lustre/tests/*' >lustre-tests.files
-echo '%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/llog_test.*' >>lustre-tests.files
+echo '%{_libdir}/lustre/tests/*' >>lustre-tests.files
+echo '%{_bindir}/mcreate' >>lustre-tests.files
+echo '%{_bindir}/munlink' >>lustre-tests.files
+%if %{with lustre_modules}
+echo '%{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/llog_test.ko' >>lustre-tests.files
+%endif
if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/liblustre/tests ] ; then
- echo '%attr(-, root, root) %{_libdir}/lustre/liblustre/tests/*' >>lustre-tests.files
+ echo '%{_libdir}/lustre/liblustre/tests/*' >>lustre-tests.files
fi
%endif
%endif
%else
# mark modules executable for find-debuginfo.sh
-find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/updates -name "*.ko" -type f | \
+find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/%{kmoddir} -name "*.ko" -type f | \
xargs --no-run-if-empty chmod u+x
%endif
%files -f lustre.files
-
+%defattr(-,root,root)
+%{?rootdir}/sbin/mount.lustre
+%{_sbindir}/*
+%{_bindir}/lfs
+%{_bindir}/lfs_migrate
+%{_bindir}/llbackup
+%{_bindir}/llobdstat
+%{_bindir}/llstat
+%{_bindir}/lustre_req_history
+%{_bindir}/plot-llstat
+%{_bindir}/req_layout
+%{_libdir}/libptlctl.a
+%{_libdir}/libcfsutil.a
+%{_libdir}/liblustreapi.a
+%{_libdir}/liblustreapi.so
+%{_mandir}/man?/*
+%{_datadir}/lustre
+%{_includedir}/lustre
+%{_includedir}/libcfs
+%{_includedir}/linux/lustre_user.h
+%{_libexecdir}/lustre/lc_common
+%{_sysconfdir}/udev/rules.d/99-lustre.rules
+%{_sysconfdir}/init.d/lnet
+%{_sysconfdir}/init.d/lustre
+%config(noreplace) %{_sysconfdir}/ldev.conf
+%{_sysconfdir}/sysconfig/lustre
+%{_libexecdir}/lustre/haconfig
+%{_sysconfdir}/ha.d/resource.d/Lustre.ha_v2
+%{_sysconfdir}/ha.d/resource.d/Lustre
+
+%if %{with lustre_modules}
%files modules
-%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/*
+%defattr(-,root,root)
+%{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/*
%if %{with lustre_tests}
-%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/llog_test.ko
+%exclude %{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/llog_test.ko
%endif
%if %{with ldiskfs}
-%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/ldiskfs.ko
-%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_ldiskfs.ko
+%exclude %{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/ldiskfs.ko
+%exclude %{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/osd_ldiskfs.ko
%endif
%if %{with zfs}
-%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_zfs.ko
+%exclude %{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/osd_zfs.ko
%endif
%if %{defined rpm_post_base}
%attr(0555, root, root) %{rpm_post_base}-modules.sh
%endif
-%attr(-, root, root) %doc COPYING
-%attr(-, root, root) %doc ChangeLog-lustre
-%attr(-, root, root) %doc ChangeLog-lnet
+%doc COPYING
+%doc ChangeLog-lustre
+%doc ChangeLog-lnet
%if %{with ldiskfs}
%files osd-ldiskfs
-%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/ldiskfs.ko
-%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_ldiskfs.ko
+%defattr(-,root,root)
+%{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/ldiskfs.ko
+%{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/osd_ldiskfs.ko
%if %{defined rpm_post_base}
%attr(0555, root, root) %{rpm_post_base}-osd-ldiskfs.sh
%endif
%if %{with zfs}
%files osd-zfs
-%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_zfs.ko
+%defattr(-,root,root)
+%{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/osd_zfs.ko
%if %{defined rpm_post_base}
%attr(0555, root, root) %{rpm_post_base}-osd-zfs.sh
%endif
%endif
+%endif # with lustre_modules
%files source
-%attr(-, root, root) %{_prefix}/src/lustre-%{version}
+%defattr(-,root,root)
+%{_prefix}/src/lustre-%{version}
# uncomment these lines to enable deps packages
# %files deps-sles
%if %{with lustre_tests}
%files tests -f lustre-tests.files
+%defattr(-,root,root)
%endif
%if %{with lustre_iokit}
%files -n lustre-iokit
-%attr(-, root, root) %{_bindir}/ior-survey
-%attr(-, root, root) %{_bindir}/parse-ior
-%attr(-, root, root) %{_bindir}/libecho
-%attr(-, root, root) %{_bindir}/obdfilter-survey
-%attr(-, root, root) %{_bindir}/plot-obdfilter
-%attr(-, root, root) %{_bindir}/plot-ost
-%attr(-, root, root) %{_bindir}/ost-survey
-%attr(-, root, root) %{_bindir}/sgpdd-survey
-%attr(-, root, root) %{_bindir}/plot-sgpdd
-%attr(-, root, root) %{_bindir}/lstats.sh
-%attr(-, root, root) %{_bindir}/gather_stats_everywhere.sh
-%attr(-, root, root) %{_bindir}/config.sh
-%attr(-, root, root) %{_bindir}/mds-survey
+%defattr(-, root, root)
+%{_bindir}/ior-survey
+%{_bindir}/parse-ior
+%{_bindir}/libecho
+%{_bindir}/obdfilter-survey
+%{_bindir}/plot-obdfilter
+%{_bindir}/plot-ost
+%{_bindir}/ost-survey
+%{_bindir}/sgpdd-survey
+%{_bindir}/plot-sgpdd
+%{_bindir}/lstats.sh
+%{_bindir}/gather_stats_everywhere.sh
+%{_bindir}/config.sh
+%{_bindir}/mds-survey
%doc lustre-iokit/obdfilter-survey/README.obdfilter-survey
%doc lustre-iokit/ior-survey/README.ior-survey
%doc lustre-iokit/ost-survey/README.ost-survey
fi
%endif
+%if %{with lustre_modules}
%post modules
%if %{defined rpm_post_base}
if [ -x %{rpm_post_base}-modules.sh ]; then
rm /var/run/%{name}-osd-zfs
%endif
%endif
+%endif # with lustre_modules
%if %{with lustre_tests}
-%post tests
%if %{defined rpm_post_base}
+%post tests
if [ -x %{rpm_post_base}-tests.sh ]; then
%{rpm_post_base}-tests.sh %{cross_path} create
fi
%{rpm_post_base}-tests.sh %{cross_path} remove
fi
%else
+%if %{with lustre_modules}
+%post tests
if [ -f /boot/System.map-%{kversion} ]; then
depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0
else
fi
%endif
%endif
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
git://git.whamcloud.com / fs / lustre-release.git / blobdiff