X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=f20e0647e6a9e2c4fe1bb19828a7f58a991c5ec4;hp=967395770cd5845f44116bcfa22bb216ce12cd73;hb=fe9273a52a97e6560108a9563e0370855dc0319a;hpb=6a2a17345af332af31d31c6c7b9ec369b17729e4 diff --git a/lustre.spec.in b/lustre.spec.in index 9673957..f20e064 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -5,8 +5,13 @@ %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 +%bcond_without manpages +%bcond_without shared +%bcond_without static %if %{without servers} # --without servers overrides --with {ldiskfs|zfs} @@ -16,22 +21,23 @@ %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 + %{!?myrelease: %global myrelease %(echo %kversion | tr '-' '_')} + # for those uses that don't want the -smp/-bigsmp (or the .arch) on the end + # of %kversion + %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/\.aarch64$//' -e 's/-default$//') +%endif -# always append the buildid, even when the caller defines %release -%define fullrelease %{myrelease}%{buildid} +%define fullrelease %{myrelease} # in order to get kernel symset and/or kernel module dependencies into # the RPM, in order to support weak-modules, the internal dependency gen- @@ -53,10 +59,6 @@ # response from them #%%global _use_internal_dependency_generator 0 -# 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$//'") - # Set the package name prefix %if %{undefined lustre_name} %if %{with servers} @@ -78,10 +80,6 @@ %endif %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} @@ -89,25 +87,23 @@ 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 %if %{with servers} Requires: lustre-osd +Requires: lustre-osd-mount +Provides: lustre-client = %{version}-%{fullrelease} %endif -%if %{defined cross_requires} -Requires: %{cross_requires} -AutoReqProv: no -%else # GSS requires this: BuildRequires: pkgconfig, libgssapi-devel >= 0.10 %if %{_vendor}=="redhat" || %{_vendor}=="fedora" #suse don't support selinux BuildRequires: libselinux-devel Requires: libselinux %endif -%endif %description Userspace tools and files for the Lustre file system. @@ -115,16 +111,17 @@ 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} -Requires: %{cross_requires} -AutoReqProv: no -%else # for SLES11, we need nothing here %if %{_vendor}=="redhat" || %{_vendor}=="fedora" +%if %{defined krequires} # 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} %endif +%if %{with lnet_dlc} +Requires: libyaml +BuildRequires: libyaml-devel +%endif %endif Group: Development/Kernel @@ -135,8 +132,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 = %{version} Provides: lustre-osd Obsoletes: lustre-ldiskfs Group: Development/Kernel @@ -147,12 +145,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 = %{version} Provides: lustre-osd Group: Development/Kernel @@ -162,15 +172,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. -%endif -%endif # with lustre_modules -%package source -Summary: Object-Based Disk storage driver source +%if %{with lustre_utils} +%package osd-zfs-mount +Summary: osd-zfs-mount contains mount's zfs specific dso. +Provides: lustre-osd-mount Group: Development/Kernel -%description source -Lustre sources for further development +%description osd-zfs-mount +ZFS hooks for mount/mkfs into a dynamic library. + +%endif +%endif +%endif # with lustre_modules # Since the RPMs we ship are to be used on both SLES and RHEL, we # can't include any dependency information (since the package names @@ -212,6 +226,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 @@ -268,33 +283,16 @@ 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" -%else -CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-tests" -%endif -%if %{without lustre_iokit} -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="%{?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 -# 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 @@ -302,9 +300,23 @@ CONFIGURE_ARGS=$(echo $CONFIGURE_ARGS | sed -e 's/"\?--with-kmp-moddir=[^ ][^ ]* # 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 --with-kmp-moddir=%{kmoddir} +%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_shared:--disable-shared} \ + %{!?with_static:--disable-static} \ + %{!?with_lustre_iokit:--disable-iokit} \ + %{!?with_ldiskfs:--disable-ldiskfs} \ + %{!?with_servers:--disable-server} \ + %{!?with_zfs:--without-zfs} \ + %{!?with_lnet_dlc:--disable-dlc} \ + %{!?with_manpages:--disable-manpages} \ + --with-release=%{release} \ + --with-linux=%{kdir} \ + --with-linux-obj=%{kobjdir} \ + --with-kmp-moddir=%{kmoddir} + make %{?_smp_mflags} -s %{?make_args} %install @@ -312,119 +324,117 @@ make install DESTDIR=$RPM_BUILD_ROOT :> lustre.files -%if %{with servers} +%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 - -if [ -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/lustre ]; then - echo '%{_sysconfdir}/sysconfig/lustre' >>lustre.files - echo '%{_sysconfdir}/init.d/lustre' >>lustre.files -fi %endif -if [ -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/lnet ]; then - echo '%{_sysconfdir}/init.d/lnet' >>lustre.files -fi +%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 +echo '%{_sysconfdir}/init.d/lsvcgss' >>lustre.files +%endif -# Create the pristine source directory. -cd $RPM_BUILD_DIR/lustre-%{version} -mkdir -p $RPM_BUILD_ROOT%{_prefix}/src -rm -f 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 +find $RPM_BUILD_ROOT -name \*.so -type f -exec chmod +x {} \; -if [ -f $RPM_BUILD_ROOT%{_libdir}/libiam.a ] ; then - echo '%{_libdir}/libiam.a' >>lustre.files -fi +%if %{with lnet_dlc} +rm -f $RPM_BUILD_ROOT%{_libdir}/liblnetconfig.la +%if %{with static} +echo '%attr(-, root, root) %{_libdir}/liblnetconfig.a' >>lustre.files +%endif +%if %{with shared} +echo '%attr(-, root, root) %{_libdir}/liblnetconfig.so' >>lustre.files +echo '%attr(-, root, root) %{_libdir}/liblnetconfig.so.*' >>lustre.files +%endif +%endif + +%if %{with ldiskfs} +echo '%{_libdir}/libiam.a' >>lustre.files +%endif if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/snmp ] ; then - echo '%{_libdir}/lustre/snmp' >>lustre.files - echo '%{_datadir}/lustre/snmp/mibs' >>lustre.files + echo '%{_libdir}/lustre/snmp' >>lustre.files fi +find $RPM_BUILD_ROOT%{_libdir}/@PACKAGE@ \ + -name \*.la -type f -exec rm -f {} \; + +%if %{with lustre_modules} +# mark modules executable for find-debuginfo.sh +find $RPM_BUILD_ROOT/lib/modules -name \*.ko -type f -exec chmod u+x {} \; +%endif + %if %{with lustre_tests} 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 +echo '/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/llog_test.ko' >>lustre-tests.files %endif %endif -%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 %{with ldiskfs} - cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-osd-ldiskfs.sh -%endif +%files -f lustre.files +%defattr(-,root,root) +%{_sbindir}/* +%exclude %{_sbindir}/wirecheck +%exclude %{_sbindir}/wiretest %if %{with zfs} - cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-osd-zfs.sh -%endif -%if %{with 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 +%exclude %{_sbindir}/zfsobj2fid %endif -%else -# mark modules executable for find-debuginfo.sh -find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/%{kmoddir} -name "*.ko" -type f | \ - xargs --no-run-if-empty chmod u+x +%if %{with lustre_utils} +%if %{with servers} +%{_libexecdir}/lustre/lc_common +%{_libexecdir}/lustre/haconfig +%{_bindir}/lustre_req_history %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 + +%{_bindir}/lfs +%{_bindir}/lfs_migrate +/sbin/mount.lustre %{_libdir}/libptlctl.a %{_libdir}/libcfsutil.a %{_libdir}/liblustreapi.a %{_libdir}/liblustreapi.so +%if %{with manpages} %{_mandir}/man?/* -%{_datadir}/lustre +%endif %{_includedir}/lustre %{_includedir}/libcfs -%{_includedir}/linux/lustre_user.h -%{_libexecdir}/lustre/lc_common -%{_libexecdir}/lustre/haconfig +%endif +%{_datadir}/lustre %{_sysconfdir}/udev/rules.d/99-lustre.rules %config(noreplace) %{_sysconfdir}/ldev.conf +%config(noreplace) %{_sysconfdir}/modprobe.d/ko2iblnd.conf %if %{with lustre_modules} %files modules %defattr(-,root,root) -%{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/* +/lib/modules/%{kversion}/%{kmoddir}/* %if %{with lustre_tests} -%exclude %{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/llog_test.ko +%exclude /lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/llog_test.ko %endif %if %{with ldiskfs} -%exclude %{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/ldiskfs.ko -%exclude %{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/osd_ldiskfs.ko +%exclude /lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/ldiskfs.ko +%exclude /lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/osd_ldiskfs.ko %endif %if %{with zfs} -%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 +%exclude /lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/osd_zfs.ko %endif %doc COPYING %doc ChangeLog-lustre @@ -433,27 +443,28 @@ find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/%{kmoddir} -name "*.ko" %if %{with ldiskfs} %files osd-ldiskfs %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 +/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/ldiskfs.ko +/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/osd_ldiskfs.ko +%if %{with lustre_utils} +%files osd-ldiskfs-mount +%defattr(-,root,root) +%{_libdir}/@PACKAGE@/mount_osd_ldiskfs.so %endif %endif %if %{with zfs} %files osd-zfs %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 +/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/osd_zfs.ko +%{_sbindir}/zfsobj2fid +%if %{with lustre_utils} +%files osd-zfs-mount +%defattr(-,root,root) +%{_libdir}/@PACKAGE@/mount_osd_zfs.so %endif %endif %endif # with lustre_modules -%files source -%defattr(-,root,root) -%{_prefix}/src/lustre-%{version} - # uncomment these lines to enable deps packages # %files deps-sles # %files deps-rhel @@ -466,46 +477,29 @@ find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/%{kmoddir} -name "*.ko" %if %{with lustre_iokit} %files -n lustre-iokit %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}/parse-ior -%{_bindir}/libecho +%{_bindir}/mds-survey %{_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 %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 -%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 +%doc lustre-iokit/stats-collect/README.iokit-lstats %endif %if %{with lustre_modules} %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 @@ -539,15 +533,9 @@ if sysctl kernel.unsupported >/dev/null 2>&1 && into /etc/modprobe.d/unsupported_modules" fi -%endif %if %{with 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 @@ -582,15 +570,9 @@ if sysctl kernel.unsupported >/dev/null 2>&1 && into /etc/modprobe.d/unsupported_modules" fi %endif -%endif %if %{with 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 @@ -625,43 +607,23 @@ if sysctl kernel.unsupported >/dev/null 2>&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 %{with 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 %{with 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 @@ -725,21 +687,9 @@ if [ -x /sbin/weak-modules ]; then fi rm /var/run/%{name}-osd-zfs %endif -%endif %endif # with lustre_modules %if %{with lustre_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 - -%preun tests -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 @@ -756,7 +706,6 @@ else fi %endif %endif -%endif %clean rm -rf $RPM_BUILD_ROOT