X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=5c5fc6d900b70fbe19b8bfe12b23e1bef3201ebb;hp=5c00be78a969736c72ce9c5e80c4baeb254874ae;hb=f625f670afbe954030ff81f0f8522137d6cdd335;hpb=31197e43bca94d9fbb4ca2090b556d93c6c18542 diff --git a/lustre.spec.in b/lustre.spec.in index 5c00be7..5c5fc6d 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -5,7 +5,10 @@ %bcond_without ldiskfs %bcond_with zfs %bcond_without lustre_tests +%bcond_without lustre_utils %bcond_without lustre_iokit +%bcond_without lustre_modules +%bcond_with lnet_dlc %if %{without servers} # --without servers overrides --with {ldiskfs|zfs} @@ -15,19 +18,21 @@ %endif %{!?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: %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)} +%{!?kver: %global kver %(uname -r)} +%{!?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)} # as an alternative to this implementation we could simply "make -C $kdir kernelversion" -%{!?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: %global downstream_release "@DOWNSTREAM_RELEASE@"} +%{!?kversion: %global kversion %(files="include/generated/utsrelease.h include/linux/utsrelease.h include/linux/version.h"; for f in $files; do if test -r %{kobjdir}/$f && grep UTS_RELEASE %{kobjdir}/$f >/dev/null; then sed -ne '/^#define UTS_RELEASE/s/.*"\\(.*\\)"$/\\1/p' %{kobjdir}/$f; break; fi; done)} %define buildid %(if [ -n "@BUILDID@" ]; then echo "_@BUILDID@"; fi) -%{!?myrelease: %global myrelease %(if [ -n "%downstream_release" ]; then echo -n "%{downstream_release}_"; fi; echo %kversion | tr '-' '_')} +%if 0%{?build_src_rpm} + %{!?myrelease: %global myrelease 1} +%else + %{!?downstream_release: %global downstream_release "@DOWNSTREAM_RELEASE@"} + %{!?myrelease: %global myrelease %(if [ -n "%downstream_release" ]; then echo -n "%{downstream_release}_"; fi; echo %kversion | tr '-' '_')} +%endif # always append the buildid, even when the caller defines %release %define fullrelease %{myrelease}%{buildid} @@ -54,7 +59,7 @@ # 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$//'") +%define krequires %(echo %{kversion} | sed -e 's/\.x86_64$//' -e 's/\.i[3456]86$//' -e 's/-smp$//' -e 's/-bigsmp$//' -e 's/-ppc64$//' -e 's/-default$//') # Set the package name prefix %if %{undefined lustre_name} @@ -65,8 +70,28 @@ %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}) +%define rpm_post_base %(dirname %{cross_path})/%{lustre_name} +%endif + +# SUSE don't support .debug_info section from cross compiler: +# /usr/lib/rpm/debugedit: Unhandled relocation 10 in .debug_info section +%if %{defined cross_path} && 0%{?suse_version} +%global __debug_install_post %{nil} +%global __debug_package %{nil} +%global debug_package %{nil} %endif Summary: Lustre File System @@ -76,13 +101,15 @@ Release: %{fullrelease} License: GPL Group: Utilities/System Source: lustre-%{version}.tar.gz -URL: http://wiki.whamcloud.com/ +URL: https://wiki.hpdd.intel.com/ 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} +BuildRequires: libtool python-docutils %if %{with servers} Requires: lustre-osd +Requires: lustre-osd-mount %endif %if %{defined cross_requires} Requires: %{cross_requires} @@ -99,6 +126,7 @@ Requires: libselinux %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} @@ -110,6 +138,10 @@ AutoReqProv: no # for RHEL we need to require the specific kernel still since weak-modules # support on RH is, well, weak, to be punny about it Requires: kernel = %{krequires} +%if %{with lnet_dlc} +Requires: libyaml +BuildRequires: libyaml-devel +%endif %endif %endif Group: Development/Kernel @@ -121,8 +153,9 @@ Lustre file system, server and network drivers for Linux %{kversion}. %package osd-ldiskfs Summary: osd-ldiskfs contains both ldiskfs and its osd interface in Lustre. Requires: lustre-modules = %{version} -Requires: modutils >= 2.4.10 +Requires: module-init-tools >= 3.9 Requires: ldiskfsprogs >= 1.42.7.wc1 +Requires: lustre-osd-ldiskfs-mount Provides: lustre-osd Obsoletes: lustre-ldiskfs Group: Development/Kernel @@ -133,12 +166,24 @@ modify data that is supposed to be stored persistently. This API is the interfac 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. + +%if %{with lustre_utils} +%package osd-ldiskfs-mount +Summary: osd-ldiskfs-mount contains mount's ldiskfs specific dso. +Provides: lustre-osd-mount +Group: Development/Kernel + +%description osd-ldiskfs-mount +LDISKFS hooks for mount/mkfs into a dynamic library. + +%endif %endif %if %{with zfs} %package osd-zfs Summary: osd-zfs is the mandatory glue for ZFS support in Lustre. Requires: lustre-modules = %{version}, zfs-kmod +Requires: lustre-osd-zfs-mount Provides: lustre-osd Group: Development/Kernel @@ -148,7 +193,19 @@ modify data that is supposed to be stored persistently. This API is the interfac 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. + +%if %{with lustre_utils} +%package osd-zfs-mount +Summary: osd-zfs-mount contains mount's ldiskfs specific dso. +Provides: lustre-osd-mount +Group: Development/Kernel + +%description osd-zfs-mount +ZFS hooks for mount/mkfs into a dynamic library. + +%endif %endif +%endif # with lustre_modules %package source Summary: Object-Based Disk storage driver source @@ -197,6 +254,7 @@ Summary: Lustre testing framework Group: Development/Kernel Provides: %{name}-tests = %{version} Requires: %{name} = %{version}, %{name}-modules = %{version}, lustre-iokit +Requires: attr, rsync, perl, lsof, /usr/bin/getconf %description tests This package contains a set of test binaries and scripts that are intended @@ -247,41 +305,21 @@ ln lustre/ChangeLog ChangeLog-lustre 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} # override %optflags so that the vendor's overzealous flags don't create # build failures %define optflags -g -O2 -Werror -CONFIGURE_ARGS="%{?configure_args} --with-release=%release" -%if %{with lustre_tests} -CONFIGURE_ARGS="$CONFIGURE_ARGS --enable-tests --enable-liblustre-tests" -%else -CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-tests --disable-liblustre-tests" -%endif -%if %{without lustre_iokit} -CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-iokit" -%endif -# if %%kdir was given, make sure it's not in the configure arguments -if [ -n "%kdir" ]; then +CONFIGURE_ARGS="%{?configure_args}" +if [ -n "$CONFIGURE_ARGS" ]; then + # make sure %%kdir and %%kobjdir are not in the configure arguments CONFIGURE_ARGS=$(echo $CONFIGURE_ARGS | sed -e 's/"\?--with-linux=[^ ][^ ]* \?//') -fi -# ditto for %%kobjdir -if [ -n "%kobjdir" ]; then CONFIGURE_ARGS=$(echo $CONFIGURE_ARGS | sed -e 's/"\?--with-linux-obj=[^ ][^ ]* \?//') + # 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=[^ ][^ ]* \?//') fi # we need to eval "configure" because $CONFIGURE_ARGS could have a quoted @@ -290,28 +328,44 @@ fi # 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_args} +%eval_configure $CONFIGURE_ARGS \ + %{?with_lustre_tests:--enable-tests}%{!?with_lustre_tests:--disable-tests} \ + %{?with_lustre_utils:--enable-utils}%{!?with_lustre_utils:--disable-utils} \ + %{?with_lustre_modules:--enable-modules}%{!?with_lustre_modules:--disable-modules} \ + %{!?with_lustre_iokit:--disable-iokit} \ + %{!?with_ldiskfs:--disable-ldiskfs} \ + %{!?with_servers:--disable-server} \ + %{!?with_zfs:--without-zfs} \ + %{!?with_lnet_dlc:--disable-dlc} \ + --with-release=%{release} \ + --with-linux=%{kdir} \ + --with-linux-obj=%{kobjdir} \ + --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 +:> lustre.files +%if %{with servers} && %{with lustre_utils} # 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%{_sysconfdir}/ha.d/resource.d/Lustre +echo '%{_sysconfdir}/ha.d/resource.d/Lustre.ha_v2' >>lustre.files +echo '%{_sysconfdir}/ha.d/resource.d/Lustre' >>lustre.files +%endif + +%if %{_vendor}=="redhat" +# The following scripts are Red Hat specific +%if %{with servers} +echo '%{_sysconfdir}/sysconfig/lustre' >>lustre.files +echo '%{_sysconfdir}/init.d/lustre' >>lustre.files +%endif +echo '%{_sysconfdir}/init.d/lnet' >>lustre.files +%endif # Create the pristine source directory. cd $RPM_BUILD_DIR/lustre-%{version} @@ -321,74 +375,35 @@ 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 - -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 -fi - -if [ -f $RPM_BUILD_ROOT%{_libdir}/libiam.a ] ; then - echo '%attr(-, root, root) %{_libdir}/libiam.a' >>lustre.files -fi +find $RPM_BUILD_ROOT -name \*.so -type f -exec chmod +x {} \; -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 +%if %{with lnet_dlc} +echo '%attr(-, root, root) %{_libdir}/liblnetconfig.a' >>lustre.files +echo '%attr(-, root, root) %{_libdir}/liblnetconfig.so' >>lustre.files +%endif -# 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 %{with ldiskfs} +echo '%{_libdir}/libiam.a' >>lustre.files +%endif -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 +if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/snmp ] ; then + echo '%{_libdir}/lustre/snmp' >>lustre.files + echo '%{_datadir}/lustre/snmp/mibs' >>lustre.files fi +find $RPM_BUILD_ROOT%{_libdir}/@PACKAGE@ \ + -name \*.la -type f -exec rm -f {} \; + %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 -if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/liblustre/tests ] ; then - echo '%attr(-, root, root) %{_libdir}/lustre/liblustre/tests/*' >>lustre-tests.files -fi +echo '%{_libdir}/lustre/tests/*' >>lustre-tests.files +echo '%{_bindir}/mcreate' >>lustre-tests.files +echo '%{_bindir}/munlink' >>lustre-tests.files +echo '%{_bindir}/req_layout' >>lustre-tests.files +echo '%{_sbindir}/wirecheck' >>lustre-tests.files +echo '%{_sbindir}/wiretest' >>lustre-tests.files +%if %{with lustre_modules} +echo '%{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/llog_test.ko' >>lustre-tests.files +%endif %endif %if %{defined cross_path} @@ -400,9 +415,15 @@ if [ -f $POST_SCRIPT ]; then cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-modules.sh %if %{with ldiskfs} cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-osd-ldiskfs.sh +%if %{with lustre_utils} + cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-mount-osd-ldiskfs.sh +%endif %endif %if %{with zfs} cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-osd-zfs.sh +%if %{with lustre_utils} + cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-mount-osd-zfs.sh +%endif %endif %if %{with lustre_tests} cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-tests.sh @@ -411,53 +432,106 @@ if [ -f $POST_SCRIPT ]; then fi %endif %else +%if %{with lustre_modules} # mark modules executable for find-debuginfo.sh -find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/updates -name "*.ko" -type f | \ - xargs --no-run-if-empty chmod u+x +find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/%{kmoddir} \ + -name \*.ko -type f -exec chmod u+x {} \; +%endif %endif %files -f lustre.files - +%defattr(-,root,root) +%{_sbindir}/* +%if %{with zfs} +%exclude %{_sbindir}/zfsobj2fid +%endif +%if %{with lustre_utils} +%if %{with servers} +%{_libexecdir}/lustre/lc_common +%{_libexecdir}/lustre/haconfig +%{_bindir}/lustre_req_history +%endif + +%{_bindir}/llobdstat +%{_bindir}/llstat +%{_bindir}/plot-llstat + +%{_bindir}/lfs +%{_bindir}/lfs_migrate +%{?rootdir}/sbin/mount.lustre +%{_libdir}/libptlctl.a +%{_libdir}/libcfsutil.a +%{_libdir}/liblustreapi.a +%{_libdir}/liblustreapi.so +%{_mandir}/man?/* +%{_includedir}/lustre +%{_includedir}/libcfs +%endif +%{_datadir}/lustre +%{_sysconfdir}/udev/rules.d/99-lustre.rules +%config(noreplace) %{_sysconfdir}/ldev.conf + +%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/fsfilt_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/fsfilt_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 lustre_utils} +%files osd-ldiskfs-mount +%defattr(-,root,root) +%{_libdir}/@PACKAGE@/mount_osd_ldiskfs.so +%if %{defined rpm_post_base} +%attr(0555, root, root) %{rpm_post_base}-mount-osd-ldiskfs.sh +%endif +%endif %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 +%{_sbindir}/zfsobj2fid %if %{defined rpm_post_base} %attr(0555, root, root) %{rpm_post_base}-osd-zfs.sh %endif +%if %{with lustre_utils} +%files osd-zfs-mount +%defattr(-,root,root) +%{_libdir}/@PACKAGE@/mount_osd_zfs.so +%if %{defined rpm_post_base} +%attr(0555, root, root) %{rpm_post_base}-mount-osd-zfs.sh +%endif +%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 @@ -465,29 +539,31 @@ find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/updates -name "*.ko" -ty %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 -%doc lustre-iokit/obdfilter-survey/README.obdfilter-survey +%defattr(-, root, root) +%{_bindir}/iokit-config +%{_bindir}/iokit-gather-stats +%{_bindir}/iokit-libecho +%{_bindir}/iokit-lstats +%{_bindir}/iokit-parse-ior +%{_bindir}/iokit-plot-obdfilter +%{_bindir}/iokit-plot-ost +%{_bindir}/iokit-plot-sgpdd +%{_bindir}/ior-survey +%{_bindir}/mds-survey +%{_bindir}/obdfilter-survey +%{_bindir}/ost-survey +%{_bindir}/sgpdd-survey %doc lustre-iokit/ior-survey/README.ior-survey -%doc lustre-iokit/ost-survey/README.ost-survey %doc lustre-iokit/mds-survey/README.mds-survey +%doc lustre-iokit/obdfilter-survey/README.obdfilter-survey +%doc lustre-iokit/ost-survey/README.ost-survey %doc lustre-iokit/sgpdd-survey/README.sgpdd-survey -%doc lustre-iokit/stats-collect/README.lstats.sh +%doc lustre-iokit/stats-collect/README.iokit-lstats %endif %if %{defined rpm_post_base} @@ -502,6 +578,7 @@ if [ -x %{rpm_post_base}.sh ]; then fi %endif +%if %{with lustre_modules} %post modules %if %{defined rpm_post_base} if [ -x %{rpm_post_base}-modules.sh ]; then @@ -584,6 +661,12 @@ if sysctl kernel.unsupported >/dev/null 2>&1 && into /etc/modprobe.d/unsupported_modules" fi %endif +%if %{with lustre_utils} && %{defined rpm_post_base} +%post osd-ldiskfs-mount +if [ -x %{rpm_post_base}-mount-osd-ldiskfs.sh ]; then + %{rpm_post_base}-mount-osd-ldiskfs.sh %{cross_path} create +fi +%endif %endif %if %{with zfs} @@ -627,6 +710,12 @@ if sysctl kernel.unsupported >/dev/null 2>&1 && into /etc/modprobe.d/unsupported_modules" fi %endif +%if %{with lustre_utils} && %{defined rpm_post_base} +%post osd-zfs-mount +if [ -x %{rpm_post_base}-mount-osd-zfs.sh ]; then + %{rpm_post_base}-mount-osd-zfs.sh %{cross_path} create +fi +%endif %endif %preun modules @@ -649,6 +738,12 @@ fi 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 %{with lustre_utils} && %{defined rpm_post_base} +%preun osd-ldiskfs-mount +if [ -x %{rpm_post_base}-mount-osd-ldiskfs.sh ]; then + %{rpm_post_base}-mount-osd-ldiskfs.sh %{cross_path} remove +fi +%endif %endif %if %{with zfs} @@ -661,6 +756,12 @@ fi 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 +%if %{with lustre_utils} && %{defined rpm_post_base} +%preun osd-zfs-mount +if [ -x %{rpm_post_base}-mount-osd-zfs.sh ]; then + %{rpm_post_base}-mount-osd-zfs.sh %{cross_path} remove +fi +%endif %endif %if %{undefined cross_path} @@ -728,10 +829,11 @@ fi 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 @@ -741,6 +843,8 @@ if [ -x %{rpm_post_base}-tests.sh ]; then %{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 @@ -755,6 +859,7 @@ else fi %endif %endif +%endif %clean rm -rf $RPM_BUILD_ROOT