X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=edd02f54340c5b792efff887aecaba3968af9152;hp=d14a6f5f7d585c9456bcca90835f12f858eedbe4;hb=725f3f8eb96203b5679da46bfc4e6d22bf1cdf9c;hpb=c1a61e3e9129d0e2062eed617d922e6dfa9ede5a diff --git a/lustre.spec.in b/lustre.spec.in index d14a6f5..edd02f5 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -1,24 +1,27 @@ # lustre.spec -%{!?version: %define version @VERSION@} -%{!?kver: %define kver ""} -%{!?kdir: %define kdir %(dir=$(echo "%configure_args" | sed -ne 's/.*--with-linux=\\([^ ][^ ]*\\).*$/\\1/p'); if [ -n "$dir" ]; then echo "$dir"; else if [ -n "%kver" ]; then kversion="%kver"; else kversion="$(uname -r)"; fi; echo "/lib/modules/$kversion/source"; fi)} +%{!?version: %global version @VERSION@} +%{!?kver: %global kver ""} +%{!?kdir: %global kdir %(dir=$(echo "%configure_args" | sed -ne 's/.*--with-linux=\\([^ ][^ ]*\\).*$/\\1/p'); if [ -n "$dir" ]; then echo "$dir"; else if [ -n "%kver" ]; then kversion="%kver"; else kversion="$(uname -r)"; fi; echo "/lib/modules/$kversion/source"; fi)} -%{!?kobjdir: %define kobjdir %(dir=$(echo "%configure_args" | sed -ne 's/.*--with-linux-obj=\\([^ ][^ ]*\\).*$/\\1/p'); if [ -n "$dir" ]; then echo "$dir"; else if [ -n "%kver" ]; then kversion="%kver"; else kversion="$(uname -r)"; fi; if [ "%kdir" = "/lib/modules/$kversion/source" ]; then echo "/lib/modules/$kversion/build"; else echo "%kdir"; fi; fi)} +%{!?kobjdir: %global kobjdir %(dir=$(echo "%configure_args" | sed -ne 's/.*--with-linux-obj=\\([^ ][^ ]*\\).*$/\\1/p'); if [ -n "$dir" ]; then echo "$dir"; else if [ -n "%kver" ]; then kversion="%kver"; else kversion="$(uname -r)"; fi; if [ "%kdir" = "/lib/modules/$kversion/source" ]; then echo "/lib/modules/$kversion/build"; else echo "%kdir"; fi; fi)} # as an alternative to this implementation we could simply "make -C $kdir kernelversion" -%{!?kversion: %define kversion %(if test -s %kobjdir/include/linux/utsrelease.h ; then LINUXRELEASEHEADER=utsrelease.h; else LINUXRELEASEHEADER=version.h; fi; sed -ne '/^#define UTS_RELEASE/s/.*"\\(.*\\)"$/\\1/p' %kobjdir/include/linux/$LINUXRELEASEHEADER)} +%{!?kversion: %global kversion %(if test -s %kobjdir/include/generated/utsrelease.h ; then LINUXRELEASEHEADER=%kobjdir/include/generated/utsrelease.h ; elif test -s %kobjdir/include/linux/utsrelease.h ; then LINUXRELEASEHEADER=%kobjdir/include/linux/utsrelease.h ; else LINUXRELEASEHEADER=%kobjdir/include/linux/version.h; fi; sed -ne '/^#define UTS_RELEASE/s/.*"\\(.*\\)"$/\\1/p' $LINUXRELEASEHEADER)} -%{!?downstream_release: %define downstream_release "@DOWNSTREAM_RELEASE@"} +%{!?downstream_release: %global downstream_release "@DOWNSTREAM_RELEASE@"} %define buildid %(if [ -n "@BUILDID@" ]; then echo "_@BUILDID@"; fi) -%{!?myrelease: %define myrelease %(if [ -n "%downstream_release" ]; then echo -n "%{downstream_release}_"; fi; echo %kversion | tr '-' '_')} +%{!?myrelease: %global myrelease %(if [ -n "%downstream_release" ]; then echo -n "%{downstream_release}_"; fi; echo %kversion | tr '-' '_')} # always append the buildid, even when the caller defines %release %define fullrelease %{myrelease}%{buildid} -%{!?lustre_name: %define lustre_name lustre} -%{!?build_lustre_tests: %define build_lustre_tests 1} +%{!?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- @@ -51,6 +54,11 @@ %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 + Summary: Lustre File System Name: %{lustre_name} Version: %{version} @@ -82,13 +90,43 @@ Requires: kernel = %{krequires} %endif %endif %if ! %{is_client} -Requires: lustre-backend-fs +Requires: lustre-osd %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 +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-modules +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 @@ -208,6 +246,11 @@ elif [ -e ${llog_base}.o ]; then cp ${llog_base}.o $RPM_BUILD_ROOT/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 + # Create the pristine source directory. cd $RPM_BUILD_DIR/lustre-%{version} mkdir -p $RPM_BUILD_ROOT/usr/src @@ -215,6 +258,8 @@ rm -f lustre-source ln -s $RPM_BUILD_ROOT/usr/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 <>lustre.files fi -if [ -f $RPM_BUILD_DIR/lustre-%{version}/lustre/utils/libiam.c ] ; then +if [ -f $RPM_BUILD_ROOT%{_libdir}/libiam.a ] ; then echo '%attr(-, root, root) %{_libdir}/libiam.a' >>lustre.files fi @@ -252,7 +307,7 @@ if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/snmp ] ; then echo '%attr(-, root, root) %{_datadir}/lustre/snmp/mibs' >>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 else @@ -266,24 +321,42 @@ 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" 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 +# mark modules executable for find-debuginfo.sh +find $RPM_BUILD_ROOT/lib/modules/%{kversion}/updates -name "*.ko" -type f | \ + xargs --no-run-if-empty chmod u+x %files -f lustre.files -%files modules -f lustre-modules.files +%files modules +%attr(-, root, root) /lib/modules/%{kversion}/updates/* +%if %{build_lustre_tests} +%exclude /lib/modules/%{kversion}/updates/kernel/fs/lustre/llog_test.ko +%endif +%if %{build_lustre_osd_ldiskfs} +%exclude /lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_ldiskfs.ko +%endif +%if %{build_lustre_osd_zfs} +%exclude /lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_zfs.ko +%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) /lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_ldiskfs.ko +%endif + +%if %{build_lustre_osd_zfs} +%files osd-zfs +%attr(-, root, root) /lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_zfs.ko +%endif + %files source %attr(-, root, root) /usr/src/lustre-%{version} @@ -302,15 +375,52 @@ else depmod -ae %{kversion} || exit 0 fi +MODULES_RPM_NAME=$(rpm -q %{name}-modules | grep "%{version}-%{release}") +# "weak modules" support +# Suse +if [ -x /usr/lib/module-init-tools/weak-modules ]; then + rpm -ql $MODULES_RPM_NAME | grep '\.ko$' | + /usr/lib/module-init-tools/weak-modules --add-modules +fi +# RedHat +if [ -x /sbin/weak-modules ]; then + rpm -ql $MODULES_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 + +%if %{build_lustre_osd_ldiskfs} +%post 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 + +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 %{name}-modules-%{version}-%{release} | grep '\.ko$' | + 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 %{name}-modules-%{version}-%{release} | grep '\.ko$' | + rpm -ql $OSD_LDISKFS_RPM_NAME | grep '\.ko$' | /sbin/weak-modules --add-modules fi @@ -328,9 +438,60 @@ if sysctl kernel.unsupported >/dev/null 2>&1 && into /etc/modprobe.d/unsupported_modules" fi +%endif + +%if %{build_lustre_osd_zfs} +%post 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 + +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 %preun modules -rpm -ql %{name}-modules-%{version}-%{release} | grep '\.ko$' > /var/run/%{name}-modules +MODULES_RPM_NAME=$(rpm -q %{name}-modules | grep "%{version}-%{release}") +rpm -ql $MODULES_RPM_NAME | grep '\.ko$' > /var/run/%{name}-modules || true + +%if %{build_lustre_osd_ldiskfs} +%preun osd-ldiskfs +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 + +%if %{build_lustre_osd_zfs} +%preun osd-zfs +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 %postun modules if [ -f /boot/System.map-%{kversion} ]; then @@ -342,16 +503,60 @@ fi # "weak modules" support # Suse if [ -x /usr/lib/module-init-tools/weak-modules ]; then - cat /var/run/%{name}-modules | grep '\.ko$' | + cat /var/run/%{name}-modules | /usr/lib/module-init-tools/weak-modules --remove-modules fi # RedHat if [ -x /sbin/weak-modules ]; then - cat /var/run/%{name}-modules | grep '\.ko$' | + cat /var/run/%{name}-modules | /sbin/weak-modules --remove-modules 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 + %if %{build_lustre_tests} %post tests if [ -f /boot/System.map-%{kversion} ]; then