X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=75a705c501f4f2072575e729532d948a82dcb1c6;hp=3e2dddbbd4b29ddf88f79cf5a57bc29646e9585e;hb=698209700faf51c227f9ba16626de5ed70fa97c8;hpb=c92afbcd4a8234994affa444d59645b80fa19ec5 diff --git a/lustre.spec.in b/lustre.spec.in index 3e2dddb..75a705c 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -5,8 +5,24 @@ %bcond_without ldiskfs %bcond_with zfs %bcond_without lustre_tests +%bcond_without lustre_utils %bcond_without lustre_iokit %bcond_without lustre_modules +%bcond_with snmp +%bcond_with gss +%bcond_with gss_keyring +%bcond_without manpages +%bcond_without shared +%bcond_without static +%bcond_with systemd + +# By default both gss and gss keyring are disabled. +# gss keyring requires the gss core. If the builder +# request gss_keyring we must enable gss core even if +# the builder attempts to disable gss. +%if %{with gss_keyring} + %define with_gss +%endif %if %{without servers} # --without servers overrides --with {ldiskfs|zfs} @@ -16,22 +32,19 @@ %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@"} - -%define buildid %(if [ -n "@BUILDID@" ]; then echo "_@BUILDID@"; fi) +%{!?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)} -%{!?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} +# We set this because kernel_module_package has its own method of identifying +# which kernel to build against, and it is unlikely that its decision will +# match with Lustre's method of selecting which kernel to build against. +# By setting this variable, we override kernel_module_package's kernel +# selection with our selection. +%{!?kernel_version: %global kernel_version %kversion} # 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 +66,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,145 +87,182 @@ %endif %endif -%if %{defined cross_path} && %{defined post_script} -%define rpm_post_base %(echo $(dirname %{cross_path})/%{lustre_name}) +%global modules_fs_path /lib/modules/%{kversion}/%{kmoddir} + +%if %{_vendor}=="redhat" || %{_vendor}=="fedora" + %global requires_yaml_name libyaml + %global requires_kmod_name kmod-%{lustre_name} + %if %{with lustre_tests} + %global requires_kmod_tests_name kmod-%{lustre_name}-tests + %endif + %global requires_kmod_version %{version} +%else #for Suse + %global requires_yaml_name libyaml-0-2 + %global requires_kmod_name %{lustre_name}-kmp + %if %{with lustre_tests} + %global requires_kmod_tests_name %{lustre_name}-tests-kmp + %endif + %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$//') + %if 0%{?suse_version} >= 1200 + %global requires_kmod_version %{version}_k%(echo %{krequires} | sed -r 'y/-/_/; s/^(2\.6\.[0-9]+)_/\\1.0_/;') + %else + %global requires_kmod_version %{version}_%(echo %{krequires} | sed -r 'y/-/_/; s/^(2\.6\.[0-9]+)_/\\1.0_/;') + %endif +%endif + +# RHEL >= 7 comes with systemd +%if 0%{?rhel} >= 7 +%define with_systemd 1 +%endif + +# Fedora >= 15 comes with systemd, but only >= 18 has +# the proper macros +%if 0%{?fedora} >= 18 +%define with_systemd 1 +%endif + +# opensuse >= 12.1 comes with systemd, but only >= 13.1 +# has the proper macros +%if 0%{?suse_version} >= 1310 +%define with_systemd 1 %endif Summary: Lustre File System Name: %{lustre_name} Version: %{version} -Release: %{fullrelease} +Release: 1%{?dist} License: GPL -Group: Utilities/System +Group: System Environment/Kernel Source: lustre-%{version}.tar.gz -URL: http://wiki.whamcloud.com/ +Source1: kmp-lustre.preamble +Source2: kmp-lustre.files +Source3: kmp-lustre-osd-ldiskfs.preamble +Source4: kmp-lustre-osd-ldiskfs.files +Source5: kmp-lustre-osd-zfs.preamble +Source6: kmp-lustre-osd-zfs.files +Source7: kmp-lustre-tests.files +URL: https://wiki.whamcloud.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} +Requires: %{requires_kmod_name} = %{requires_kmod_version} zlib +Requires: %{requires_yaml_name} +BuildRequires: libtool libyaml-devel zlib-devel %if %{with servers} Requires: lustre-osd +Requires: lustre-osd-mount +Obsoletes: lustre-client < %{version} +Provides: lustre-client = %{version}-%{release} %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 +%if %{with lustre_modules} +BuildRequires: %kernel_module_package_buildreqs +%if %{_vendor}=="redhat" +BuildRequires: redhat-rpm-config +%endif +%endif + +%if %{with systemd} +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +BuildRequires: systemd %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} -Requires: %{cross_requires} -AutoReqProv: no +%if 0%{?rhel} == 7 +# until we have achieved full kABI compatibility we need to +# restrict the kernel range that can be used to the kernel +# version from the RHEL minor release +# this is supposed to be done for kmods automatically but +# RHBZ#1467319 seems to be getting in the way +# this is true for el7.0 through el7.4 +%define preamble %{expand:%( +TMPFILE=`mktemp` +cat %{SOURCE1} > $TMPFILE +kver=%{kver} +linuxversion=${kver%%%%-*} +linuxrelease=${kver##*-} +kabiminor=${linuxrelease%%%%.*} +echo "Requires: kernel < $linuxversion-$((kabiminor+1)), kernel >= $linuxversion-$((kabiminor))" >> $TMPFILE +echo $TMPFILE +)} %else -# for SLES11, we need nothing here -%if %{_vendor}=="redhat" || %{_vendor}=="fedora" -# 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 +%define preamble %{SOURCE1} %endif -Group: Development/Kernel - -%description modules -Lustre file system, server and network drivers for Linux %{kversion}. +%kernel_module_package -n %{name} -p %preamble -f %SOURCE2 default %if %{with ldiskfs} -%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: ldiskfsprogs >= 1.42.7.wc1 -Provides: lustre-osd -Obsoletes: lustre-ldiskfs -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 +%kernel_module_package -n %{name}-osd-ldiskfs -p %SOURCE3 -f %SOURCE4 default +%if %{with lustre_utils} +%package osd-ldiskfs-mount +Summary: osd-ldiskfs-mount contains mount's ldiskfs specific dso. +Provides: lustre-osd-mount = %{version}-%{fullrelease} +Group: System Environment/Kernel + +%description osd-ldiskfs-mount +LDISKFS hooks for mount/mkfs into a dynamic library. + +%endif # with lustre_utils +%endif # with ldiskfs %if %{with 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 -%endif # with lustre_modules +%kernel_module_package -n %{name}-osd-zfs -p %SOURCE5 -f %SOURCE6 default +%if %{with lustre_utils} +%package osd-zfs-mount +Summary: osd-zfs-mount contains mount's zfs specific dso. +Provides: lustre-osd-mount = %{version}-%{fullrelease} +Group: System Environment/Kernel -%package source -Summary: Object-Based Disk storage driver source -Group: Development/Kernel +%description osd-zfs-mount +ZFS hooks for mount/mkfs into a dynamic library. -%description source -Lustre sources for further development +%endif # with lustre_utils +%endif # with zfs -# 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 -# are different on the two platforms). -# -# Instead, we can build these empty meta-packages that only include -# dependency information. These let people get the correct -# dependencies for their platform and lets them use tools like yum and -# red carpet to install the correct files. -# -# Unfortunately I have not seen this come up on the lists much, so I -# have disabled them (by commenting out their empty files section -# below) until it's clear that they resolve more confusion than they -# add. - -%package deps-sles -Summary: Lustre dependencies meta-package for SLES -Group: Utilities/System -Provides: lustre-deps = %{version} -Requires: %{name} = %{version}, sles-release -Conflicts: %{name}-deps-rhel - -%description deps-sles -This package has RPM dependencies appropriate for SLES systems. - -%package deps-rhel -Summary: Lustre dependencies meta-package for RHEL -Group: Utilities/System -Provides: lustre-deps = %{version} -Requires: %{name} = %{version}, redhat-release -Conflicts: %{name}-deps-sles - -%description deps-rhel -This package has RPM dependencies appropriate for RHEL, RHL, and FC -systems. +%endif # with lustre_modules + +%if %{with servers} +%package resource-agents +Summary: HA Resuable Cluster Resource Scripts for Lustre +Group: System Environment/Base +Requires: lustre +Requires: resource-agents +%description resource-agents +A set of scripts to operate Lustre resources in a High Availablity +environment for both Pacemaker and rgmanager. +%endif + +%if %{with lustre_tests} %package tests Summary: Lustre testing framework -Group: Development/Kernel +Group: System Environment/Kernel Provides: %{name}-tests = %{version} -Requires: %{name} = %{version}, %{name}-modules = %{version}, lustre-iokit +%if %{with lustre_iokit} +Requires: %{name} = %{version}, lustre-iokit +%else +Requires: %{name} = %{version} +%endif +Requires: %{requires_kmod_name} = %{requires_kmod_version} +Requires: %{requires_kmod_tests_name} = %{requires_kmod_version} +Requires: attr, rsync, perl, lsof, /usr/bin/getconf %description tests This package contains a set of test binaries and scripts that are intended to be used by the Lustre testing framework. +%if %{with lustre_modules} +%kernel_module_package -n %{name}-tests -f %SOURCE7 default +%endif +%endif + %if %{with lustre_iokit} %package -n lustre-iokit Summary: The Lustre IO-Kit is a collection of benchmark tools for a cluster with the Lustre file system. @@ -262,217 +308,238 @@ ln lustre/ChangeLog ChangeLog-lustre ln lnet/ChangeLog ChangeLog-lnet %build - # 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 %{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 # also remove (build|host|target) options because they will be specified # inside $CONFIGURE_ARGS +# kmod tools/scripts require %{name} directory with kernel modules %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_snmp:--disable-snmp} \ + %{!?with_gss:--disable-gss} \ + %{!?with_gss_keyring:--disable-gss-keyring} \ + %{!?with_manpages:--disable-manpages} \ + %{!?with_systemd:--with-systemdsystemunitdir=no} \ + %{?with_systemd:--with-systemdsystemunitdir=%{_unitdir}} \ + --with-linux=%{kdir} \ + --with-linux-obj=%{kobjdir} \ + --with-kmp-moddir=%{kmoddir}/%{name} + 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 +# RHEL's kernel_module_path macro expects that all the modules +# in a kmod package will be in modules_fs_path/ +# but Lustre installs all of the modules in a single pass into +# a shared location. Since this is a restriction imposed by +# RHEL, we handle this here in the spec file rather than in +# Lustre's build system. This is not expected to bother SLES's +# kernel_module_path macro. +basemodpath=$RPM_BUILD_ROOT%{modules_fs_path}/%{lustre_name} +%if %{with ldiskfs} +mkdir -p $basemodpath-osd-ldiskfs/fs +mv $basemodpath/fs/osd_ldiskfs.ko $basemodpath-osd-ldiskfs/fs/osd_ldiskfs.ko +mv $basemodpath/fs/ldiskfs.ko $basemodpath-osd-ldiskfs/fs/ldiskfs.ko +%endif +%if %{with zfs} +mkdir -p $basemodpath-osd-zfs/fs +mv $basemodpath/fs/osd_zfs.ko $basemodpath-osd-zfs/fs/osd_zfs.ko +%endif +%if %{with lustre_tests} +mkdir -p $basemodpath-tests/fs +mv $basemodpath/fs/llog_test.ko $basemodpath-tests/fs/llog_test.ko +mkdir -p $RPM_BUILD_ROOT%{_libdir}/lustre/tests/kernel/ +mv $basemodpath/fs/kinode.ko $RPM_BUILD_ROOT%{_libdir}/lustre/tests/kernel/ +%endif + +:> 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 -# 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 +# systemd is on redhat, fedora, and suse +%if %{with systemd} +echo '%{_unitdir}/lnet.service' >>lustre.files +echo '%{_unitdir}/lustre.service' >>lustre.files +%endif -cat >lustre.files <>lustre.files +%if %{with gss_keyring} +echo '%{_sysconfdir}/init.d/lsvcgss' >>lustre.files +echo '%{_sysconfdir}/sysconfig/lsvcgss' >>lustre.files +%endif +%endif -if [ -f $RPM_BUILD_ROOT%{_libdir}/libcfsutil.a ] ; then - echo '%{_libdir}/libcfsutil.a' >>lustre.files -fi +%if %{without systemd} +echo '%{_sysconfdir}/init.d/lnet' >>lustre.files +echo '%{_sysconfdir}/init.d/lustre' >>lustre.files +%endif +%endif +%if %{with gss_keyring} +echo '%config(noreplace) %{_sysconfdir}/request-key.d/lgssc.conf' >>lustre.files +%endif -if [ -f $RPM_BUILD_ROOT%{_libdir}/liblustre.so ] ; then - echo '%{_libdir}/liblustre.a' >>lustre.files - echo '%{_libdir}/liblustre.so' >>lustre.files -fi +# fc18 needs 'x' permission for library files +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 +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 -if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/snmp ] ; then - echo '%{_libdir}/lustre/snmp' >>lustre.files - echo '%{_datadir}/lustre/snmp/mibs' >>lustre.files -fi +%if %{with ldiskfs} +echo '%{_libdir}/libiam.a' >>lustre.files +%endif -# Have universal lustre headers -if [ -f $RPM_BUILD_DIR/lustre-%{version}/lustre/include/lustre/lustre_idl.h ] ; then - echo '%{_includedir}/linux/lustre_user.h' >>lustre.files -else - echo '%{_includedir}/linux/lustre_idl.h' >>lustre.files -fi +%if %{with snmp} +mkdir -p $RPM_BUILD_ROOT/%{_libdir}/lustre/snmp +echo '%{_libdir}/lustre/snmp' >>lustre.files +%endif -if [ -f $RPM_BUILD_DIR/lustre-%{version}/lustre/include/linux/lustre_types.h ] ; then - echo '%{_includedir}/linux/lustre_types.h' >>lustre.files +%if %{with lustre_utils} +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/lustre +if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre ] ; then + find $RPM_BUILD_ROOT%{_libdir}/@PACKAGE@ -name \*.la -type f -exec rm -f {} \; fi +%endif + +%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 + +rm -f $RPM_BUILD_ROOT%{_libdir}/liblustreapi.la %if %{with lustre_tests} -echo '%{_libdir}/lustre/tests/*' >lustre-tests.files +:> 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 '%{_libdir}/lustre/liblustre/tests/*' >>lustre-tests.files -fi +echo '%{_sbindir}/wirecheck' >>lustre-tests.files +echo '%{_sbindir}/wiretest' >>lustre-tests.files %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 -%if %{with zfs} - cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-osd-zfs.sh -%endif +%files -f lustre.files +%defattr(-,root,root) +%{_sbindir}/* %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 +%exclude %{_sbindir}/wirecheck +%exclude %{_sbindir}/wiretest %endif -fi +%if %{with zfs} +%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) +%{_bindir}/llobdstat +%{_bindir}/llstat +%{_bindir}/plot-llstat -%if %{with lustre_modules} -%files modules -%defattr(-,root,root) -%{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/* -%if %{with lustre_tests} -%exclude %{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/llog_test.ko +%{_bindir}/lfs +%{_bindir}/lfs_migrate +/sbin/mount.lustre +%if %{with static} +%{_libdir}/liblustreapi.a %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 +%if %{with shared} +%{_libdir}/liblustreapi.so* +%endif +%if %{with manpages} +%{_mandir}/man?/* +%endif +%{_datadir}/lustre +%{_includedir}/lustre +%{_includedir}/linux/lnet +%{_includedir}/linux/lustre +%endif +%{_sysconfdir}/udev/rules.d/99-lustre.rules +%if %{with servers} +%{_sysconfdir}/udev/rules.d/99-lustre-server.rules %endif %if %{with zfs} -%exclude %{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/osd_zfs.ko +%config(noreplace) %{_sysconfdir}/ldev.conf %endif -%if %{defined rpm_post_base} -%attr(0555, root, root) %{rpm_post_base}-modules.sh +%config(noreplace) %{_sysconfdir}/lnet.conf +%config(noreplace) %{_sysconfdir}/modprobe.d/ko2iblnd.conf +%if %{with lustre_utils} +%config(noreplace) %{_sysconfdir}/lnet_routes.conf %endif -%doc COPYING -%doc ChangeLog-lustre -%doc ChangeLog-lnet +%if %{with lustre_modules} +%if %{with shared} %if %{with ldiskfs} -%files osd-ldiskfs +%if %{with lustre_utils} +%files osd-ldiskfs-mount %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 +%{_libdir}/@PACKAGE@/mount_osd_ldiskfs.so +%endif %endif %endif +%if %{with shared} %if %{with zfs} -%files osd-zfs +%if %{with lustre_utils} +%files osd-zfs-mount %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 +%{_libdir}/@PACKAGE@/mount_osd_zfs.so +%{_sysconfdir}/zfs/zed.d/* +%endif %endif %endif -%endif # with lustre_modules -%files source -%defattr(-,root,root) -%{_prefix}/src/lustre-%{version} +%endif # with lustre_modules -# uncomment these lines to enable deps packages -# %files deps-sles -# %files deps-rhel +%if %{with servers} +%files resource-agents +%defattr(0755,root,root) +%{_prefix}/lib/ocf/resource.d/lustre/ +%endif %if %{with lustre_tests} %files tests -f lustre-tests.files @@ -482,294 +549,45 @@ 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 +%doc lustre-iokit/stats-collect/README.iokit-lstats %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 - -%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 - 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 -%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 - 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 +%if %{with systemd} +%systemd_post lnet.service +%systemd_post lustre.service %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 - 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 %{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 -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}-modules | - /usr/lib/module-init-tools/weak-modules --remove-modules -fi -# RedHat -if [ -x /sbin/weak-modules ]; then - cat /var/run/%{name}-modules | - /sbin/weak-modules --remove-modules -fi -rm /var/run/%{name}-modules - -%if %{with 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 %{with 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 +%preun +%if %{with systemd} +%systemd_preun lustre.service +%systemd_preun lnet.service %endif -%endif # with lustre_modules -%if %{with 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 - depmod -ae %{kversion} || exit 0 -fi - -%postun tests -if [ -f /boot/System.map-%{kversion} ]; then - depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0 -else - depmod -ae %{kversion} || exit 0 -fi -%endif +%postun +%if %{with systemd} +%systemd_postun_with_restart lustre.service +%systemd_postun_with_restart lnet.service %endif %clean rm -rf $RPM_BUILD_ROOT +rm -rf %{_tmppath}/kmp