X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=a1d886ed0f022a944dfef424e732cb7bd3bca848;hp=83077d8e5b13119fd0d3a3746998f09213e7cde1;hb=6f827e863f99f21fc03c6fa55fe7fd4a74966c7e;hpb=a0588122758ad4a8c2764c1dfa1b45097e0c95da diff --git a/lustre.spec.in b/lustre.spec.in index 83077d8..a1d886e 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -20,6 +20,9 @@ %{!?lustre_name: %global lustre_name lustre} %{!?build_lustre_tests: %global build_lustre_tests 1} +%{!?build_lustre_osd_ldiskfs: %global build_lustre_osd_ldiskfs 0} +%{!?build_lustre_osd_zfs: %global build_lustre_osd_zfs 0} + # in order to get kernel symset and/or kernel module dependencies into # the RPM, in order to support weak-modules, the internal dependency gen- # erator needs to be disabled @@ -40,7 +43,7 @@ # response from them #%%global _use_internal_dependency_generator 0 -%define is_client %(bash -c "if [[ %{lustre_name} = *-client ]]; then echo -n '1'; else echo -n '0'; fi") +%define is_client %(bash -c "if [[ %{lustre_name} = *-client* ]]; then echo -n '1'; else echo -n '0'; fi") # for those uses that don't want the -smp/-bigsmp (or the .arch) on the end # of %kversion %define krequires %(bash -c "echo %{kversion} | sed -e 's/\.x86_64$//' -e 's/\.i[3456]86$//' -e 's/-smp$//' -e 's/-bigsmp$//' -e 's/-ppc64$//' -e 's/-default$//'") @@ -51,6 +54,15 @@ %define flavor %(bash -c "echo %{kversion} | sed -e 's/^.*-//'") %endif +%if %is_client +%define build_lustre_osd_ldiskfs 0 +%define build_lustre_osd_zfs 0 +%endif + +%if %{defined cross_path} && %{defined post_script} +%define rpm_post_base %(echo $(dirname %{cross_path})/%{lustre_name}) +%endif + Summary: Lustre File System Name: %{lustre_name} Version: %{version} @@ -63,6 +75,9 @@ BuildRoot: %{_tmppath}/lustre-%{version}-root Obsoletes: lustre-lite, lustre-lite-utils, lustre-ldap nfs-utils-lustre Provides: lustre-lite = %{version}, lustre-lite-utils = %{version} Requires: %{name}-modules = %{version} +%if ! %{is_client} +Requires: lustre-osd +%endif # GSS requires this: BuildRequires: pkgconfig, libgssapi-devel >= 0.10 %description @@ -70,6 +85,9 @@ Userspace tools and files for the Lustre file system. %package modules Summary: Kernel Lustre modules for Linux %{kversion} +%if %{defined cross_requires} +Requires: %{cross_requires} +%else # for SLES11, we need nothing here # for SLES10, we need (where %{flavor} is, i.e. smp): %if %sles10 @@ -81,14 +99,42 @@ Requires: kernel-%{flavor} Requires: kernel = %{krequires} %endif %endif -%if ! %{is_client} -Requires: lustre-backend-fs %endif Group: Development/Kernel %description modules Lustre file system, server and network drivers for Linux %{kversion}. +%if %{build_lustre_osd_ldiskfs} +%package osd-ldiskfs +Summary: osd-ldiskfs is the mandatory glue for LDISKFS support in Lustre. +Requires: lustre-modules = %{version}, lustre-ldiskfs >= 4.1.0 +Provides: lustre-osd +Group: Development/Kernel + +%description osd-ldiskfs +The Lustre Object Storage Device (OSD) API is the interface to access and +modify data that is supposed to be stored persistently. This API is the interface +to code that bridges individual file systems. This specific package provides an +implementation of the OSD API for using the Ldiskfs filesystem as the underlying +backing store of a Lustre server. +%endif + +%if %{build_lustre_osd_zfs} +%package osd-zfs +Summary: osd-zfs is the mandatory glue for ZFS support in Lustre. +Requires: lustre-modules = %{version}, zfs-kmod +Provides: lustre-osd +Group: Development/Kernel + +%description osd-zfs +The Lustre Object Storage Device (OSD) API is the interface to access and +modify data that is supposed to be stored persistently. This API is the interface +to code that bridges individual file systems. This specific package provides an +implementation of the OSD API for using the ZFS filesystem as the underlying +backing store of a Lustre server. +%endif + %package source Summary: Object-Based Disk storage driver source Group: Development/Kernel @@ -186,63 +232,61 @@ 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 -%define eval_configure %(echo '%configure' | sed -e 's#\./configure#eval ./configure#') +# also remove (build|host|target) options because they will be specified +# inside $CONFIGURE_ARGS +%define eval_configure %(echo '%configure' | sed -e 's#\./configure#eval ./configure#' -e 's/--\\(build\\|host\\|target\\)=[^ ][^ ]* //g') %eval_configure \ %{?kdir: --with-linux=%kdir} %{?kobjdir: --with-linux-obj=%kobjdir} \ $CONFIGURE_ARGS -make -j $RPM_BUILD_NCPUS -s +make -j $RPM_BUILD_NCPUS -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 # Remove ldiskfs module(s) - they are packaged by the ldiskfs .spec. -rm -rf $RPM_BUILD_ROOT/lib/modules/%{kversion}/updates/kernel/fs/lustre-ldiskfs +rm -rf $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre-ldiskfs # 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/lib/modules/%{kversion}/updates/kernel/fs/lustre + 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/lib/modules/%{kversion}/updates/kernel/fs/lustre + 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. -ln -s Lustre.ha_v2 $RPM_BUILD_ROOT/etc/ha.d/resource.d/Lustre +ln -s Lustre.ha_v2 $RPM_BUILD_ROOT%{_sysconfdir}/ha.d/resource.d/Lustre # Create the pristine source directory. cd $RPM_BUILD_DIR/lustre-%{version} -mkdir -p $RPM_BUILD_ROOT/usr/src +mkdir -p $RPM_BUILD_ROOT%{_prefix}/src rm -f lustre-source -ln -s $RPM_BUILD_ROOT/usr/src lustre-source +ln -s $RPM_BUILD_ROOT%{_prefix}/src lustre-source make distdir distdir=lustre-source/lustre-%{version} chmod -R go-w lustre-source/lustre-%{version} +# fc18 needs 'x' permission for library files +find $RPM_BUILD_ROOT -name '*.so' | xargs chmod +x cat >lustre.files <>lustre.files fi -# Have universal lustre headers +# Have universal lustre headers if [ -f $RPM_BUILD_DIR/lustre-%{version}/lustre/include/lustre/lustre_idl.h ] ; then - echo '%attr(-, root, root) /usr/include/linux/lustre_user.h' >>lustre.files + echo '%attr(-, root, root) %{_includedir}/linux/lustre_user.h' >>lustre.files else - echo '%attr(-, root, root) /usr/include/linux/lustre_idl.h' >>lustre.files + 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) /usr/include/linux/lustre_types.h' >>lustre.files + echo '%attr(-, root, root) %{_includedir}/linux/lustre_types.h' >>lustre.files fi %if %{build_lustre_tests} echo '%attr(-, root, root) %{_libdir}/lustre/tests/*' >lustre-tests.files -echo '%attr(-, root, root) /lib/modules/%{kversion}/updates/kernel/fs/lustre/llog_test.*' >>lustre-tests.files -modules_excludes="|llog_test" +echo '%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/llog_test.*' >>lustre-tests.files if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/liblustre/tests ] ; then echo '%attr(-, root, root) %{_libdir}/lustre/liblustre/tests/*' >>lustre-tests.files fi %endif -pushd $RPM_BUILD_ROOT >/dev/null -> $RPM_BUILD_DIR/lustre-%{version}/lustre-modules.files -find lib/modules/%{kversion}/updates -type f | awk "!/(ZZZZZZZZZZ$modules_excludes)/ {print \"%attr(-, root, root) /\"\$0}" >>$RPM_BUILD_DIR/lustre-%{version}/lustre-modules.files -popd >/dev/null - +%if %{defined cross_path} +%if %{defined rpm_post_base} +POST_SCRIPT=$RPM_BUILD_DIR/lustre-%{version}/%{post_script} +if [ -f $POST_SCRIPT ]; then + cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}.sh + echo '%attr(0555, root, root) %{rpm_post_base}.sh' >>lustre.files + cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-modules.sh +%if %{build_lustre_osd_ldiskfs} + cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-osd-ldiskfs.sh +%endif +%if %{build_lustre_osd_zfs} + cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-osd-zfs.sh +%endif +%if %{build_lustre_tests} + cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-tests.sh + echo '%attr(0555, root, root) %{rpm_post_base}-tests.sh' >>lustre-tests.files +%endif +fi +%endif +%else # mark modules executable for find-debuginfo.sh -find $RPM_BUILD_ROOT/lib/modules/%{kversion}/updates -name "*.ko" -type f | \ +find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/updates -name "*.ko" -type f | \ xargs --no-run-if-empty chmod u+x +%endif %files -f lustre.files -%files modules -f lustre-modules.files +%files modules +%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/* +%if %{build_lustre_tests} +%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/llog_test.ko +%endif +%if %{build_lustre_osd_ldiskfs} +%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/fsfilt_ldiskfs.ko +%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_ldiskfs.ko +%endif +%if %{build_lustre_osd_zfs} +%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/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 +%if %{build_lustre_osd_ldiskfs} +%files osd-ldiskfs +%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/fsfilt_ldiskfs.ko +%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_ldiskfs.ko +%if %{defined rpm_post_base} +%attr(0555, root, root) %{rpm_post_base}-osd-ldiskfs.sh +%endif +%endif + +%if %{build_lustre_osd_zfs} +%files osd-zfs +%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_zfs.ko +%if %{defined rpm_post_base} +%attr(0555, root, root) %{rpm_post_base}-osd-zfs.sh +%endif +%endif + %files source -%attr(-, root, root) /usr/src/lustre-%{version} +%attr(-, root, root) %{_prefix}/src/lustre-%{version} # uncomment these lines to enable deps packages # %files deps-sles @@ -314,7 +404,24 @@ find $RPM_BUILD_ROOT/lib/modules/%{kversion}/updates -name "*.ko" -type f | \ %files tests -f lustre-tests.files %endif +%if %{defined rpm_post_base} +%post +if [ -x %{rpm_post_base}.sh ]; then + %{rpm_post_base}.sh %{cross_path} create +fi + +%preun +if [ -x %{rpm_post_base}.sh ]; then + %{rpm_post_base}.sh %{cross_path} remove +fi +%endif + %post modules +%if %{defined rpm_post_base} +if [ -x %{rpm_post_base}-modules.sh ]; then + %{rpm_post_base}-modules.sh %{cross_path} create +fi +%else if [ -f /boot/System.map-%{kversion} ]; then depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0 else @@ -348,11 +455,129 @@ if sysctl kernel.unsupported >/dev/null 2>&1 && into /etc/modprobe.d/unsupported_modules" fi +%endif + +%if %{build_lustre_osd_ldiskfs} +%post osd-ldiskfs +%if %{defined rpm_post_base} +if [ -x %{rpm_post_base}-osd-ldiskfs.sh ]; then + %{rpm_post_base}-osd-ldiskfs.sh %{cross_path} create +fi +%else +if [ -f /boot/System.map-%{kversion} ]; then + depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0 +else + depmod -ae %{kversion} || exit 0 +fi + +OSD_LDISKFS_RPM_NAME=$(rpm -q %{name}-osd-ldiskfs | grep "%{version}-%{release}") +# "weak modules" support +# Suse +if [ -x /usr/lib/module-init-tools/weak-modules ]; then + rpm -ql $OSD_LDISKFS_RPM_NAME | grep '\.ko$' | + /usr/lib/module-init-tools/weak-modules --add-modules +fi +# RedHat +if [ -x /sbin/weak-modules ]; then + rpm -ql $OSD_LDISKFS_RPM_NAME | grep '\.ko$' | + /sbin/weak-modules --add-modules +fi + +# If the kernel was built to reject unsupported modules (e.g. not a Lustre +# kernel), and this hasn't been overridden in /etc/modprobe.d yet, then +# print a warning so that users are aware of this issue. +if sysctl kernel.unsupported >/dev/null 2>&1 && + [ "$(sysctl -n kernel.unsupported 2>/dev/null)" = "0" ] && + ! modprobe -c | grep -q "^allow_unsupported_modules[ \t]1" ; then + echo " + warning: the Lustre modules are not supported by Novell. To use Lustre + on this system, you should put + + allow_unsupported_modules 1 + + into /etc/modprobe.d/unsupported_modules" +fi +%endif +%endif + +%if %{build_lustre_osd_zfs} +%post osd-zfs +%if %{defined rpm_post_base} +if [ -x %{rpm_post_base}-osd-zfs.sh ]; then + %{rpm_post_base}-osd-zfs.sh %{cross_path} create +fi +%else +if [ -f /boot/System.map-%{kversion} ]; then + depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0 +else + depmod -ae %{kversion} || exit 0 +fi + +OSD_ZFS_RPM_NAME=$(rpm -q %{name}-osd-zfs | grep "%{version}-%{release}") +# "weak modules" support +# Suse +if [ -x /usr/lib/module-init-tools/weak-modules ]; then + rpm -ql $OSD_ZFS_RPM_NAME | grep '\.ko$' | + /usr/lib/module-init-tools/weak-modules --add-modules +fi +# RedHat +if [ -x /sbin/weak-modules ]; then + rpm -ql $OSD_ZFS_RPM_NAME | grep '\.ko$' | + /sbin/weak-modules --add-modules +fi + +# If the kernel was built to reject unsupported modules (e.g. not a Lustre +# kernel), and this hasn't been overridden in /etc/modprobe.d yet, then +# print a warning so that users are aware of this issue. +if sysctl kernel.unsupported >/dev/null 2>&1 && + [ "$(sysctl -n kernel.unsupported 2>/dev/null)" = "0" ] && + ! modprobe -c | grep -q "^allow_unsupported_modules[ \t]1" ; then + echo " + warning: the Lustre modules are not supported by Novell. To use Lustre + on this system, you should put + + allow_unsupported_modules 1 + + into /etc/modprobe.d/unsupported_modules" +fi +%endif +%endif %preun modules +%if %{defined rpm_post_base} +if [ -x %{rpm_post_base}-modules.sh ]; then + %{rpm_post_base}-modules.sh %{cross_path} remove +fi +%else MODULES_RPM_NAME=$(rpm -q %{name}-modules | grep "%{version}-%{release}") rpm -ql $MODULES_RPM_NAME | grep '\.ko$' > /var/run/%{name}-modules || true +%endif + +%if %{build_lustre_osd_ldiskfs} +%preun osd-ldiskfs +%if %{defined rpm_post_base} +if [ -x %{rpm_post_base}-osd-ldiskfs.sh ]; then + %{rpm_post_base}-osd-ldiskfs.sh %{cross_path} remove +fi +%else +OSD_LDISKFS_RPM_NAME=$(rpm -q %{name}-osd-ldiskfs | grep "%{version}-%{release}") +rpm -ql $OSD_LDISKFS_RPM_NAME | grep '\.ko$' > /var/run/%{name}-osd-ldiskfs || true +%endif +%endif +%if %{build_lustre_osd_zfs} +%preun osd-zfs +%if %{defined rpm_post_base} +if [ -x %{rpm_post_base}-osd-zfs.sh ]; then + %{rpm_post_base}-osd-zfs.sh %{cross_path} remove +fi +%else +OSD_ZFS_RPM_NAME=$(rpm -q %{name}-osd-zfs | grep "%{version}-%{release}") +rpm -ql $OSD_ZFS_RPM_NAME | grep '\.ko$' > /var/run/%{name}-osd-zfs || true +%endif +%endif + +%if %{undefined cross_path} %postun modules if [ -f /boot/System.map-%{kversion} ]; then depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0 @@ -373,8 +598,63 @@ if [ -x /sbin/weak-modules ]; then fi rm /var/run/%{name}-modules +%if %{build_lustre_osd_ldiskfs} +%postun osd-ldiskfs +if [ -f /boot/System.map-%{kversion} ]; then + depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0 +else + depmod -ae %{kversion} || exit 0 +fi + +# "weak modules" support +# Suse +if [ -x /usr/lib/module-init-tools/weak-modules ]; then + cat /var/run/%{name}-osd-ldiskfs | + /usr/lib/module-init-tools/weak-modules --remove-modules +fi +# RedHat +if [ -x /sbin/weak-modules ]; then + cat /var/run/%{name}-osd-ldiskfs | + /sbin/weak-modules --remove-modules +fi +rm /var/run/%{name}-osd-ldiskfs +%endif + +%if %{build_lustre_osd_zfs} +%postun osd-zfs +if [ -f /boot/System.map-%{kversion} ]; then + depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0 +else + depmod -ae %{kversion} || exit 0 +fi + +# "weak modules" support +# Suse +if [ -x /usr/lib/module-init-tools/weak-modules ]; then + cat /var/run/%{name}-osd-zfs | + /usr/lib/module-init-tools/weak-modules --remove-modules +fi +# RedHat +if [ -x /sbin/weak-modules ]; then + cat /var/run/%{name}-osd-zfs | + /sbin/weak-modules --remove-modules +fi +rm /var/run/%{name}-osd-zfs +%endif +%endif + %if %{build_lustre_tests} %post tests +%if %{defined rpm_post_base} +if [ -x %{rpm_post_base}-tests.sh ]; then + %{rpm_post_base}-tests.sh %{cross_path} create +fi + +%preun tests +if [ -x %{rpm_post_base}-tests.sh ]; then + %{rpm_post_base}-tests.sh %{cross_path} remove +fi +%else if [ -f /boot/System.map-%{kversion} ]; then depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0 else @@ -388,6 +668,7 @@ else depmod -ae %{kversion} || exit 0 fi %endif +%endif %clean rm -rf $RPM_BUILD_ROOT