X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=855d4357629bafe9baaaa0d33bfdfe718e72b62a;hp=4b0ff1838cec9d4fcb90ee96f85db2c8d86cc312;hb=a8dcf372f430c308d3e96fb506563068d0a80c2d;hpb=8636d7cc03d5277a13b114dca2a9fc65834e49c7 diff --git a/lustre.spec.in b/lustre.spec.in index 4b0ff18..855d435 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -9,9 +9,11 @@ %bcond_without lustre_iokit %bcond_without lustre_modules %bcond_with lnet_dlc +%bcond_with snmp %bcond_without manpages %bcond_without shared %bcond_without static +%bcond_with systemd %if %{without servers} # --without servers overrides --with {ldiskfs|zfs} @@ -80,11 +82,15 @@ %if %{_vendor}=="redhat" || %{_vendor}=="fedora" %global requires_kmod_name kmod-%{lustre_name} - %global requires_kmod_tests_name kmod-%{lustre_name}-tests + %if %{with lustre_tests} + %global requires_kmod_tests_name kmod-%{lustre_name}-tests + %endif %global requires_kmod_version %{version} %else #for Suse %global requires_kmod_name %{lustre_name}-kmp - %global requires_kmod_tests_name %{lustre_name}-tests-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_/;') @@ -93,12 +99,29 @@ %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: 1%{?dist} License: GPL -Group: Utilities/System +Group: System Environment/Kernel Source: lustre-%{version}.tar.gz Source1: kmp-lustre.preamble Source2: kmp-lustre.files @@ -109,13 +132,12 @@ Source6: kmp-lustre-osd-zfs.files Source7: kmp-lustre-tests.files 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: %{requires_kmod_name} = %{requires_kmod_version} BuildRequires: libtool %if %{with servers} Requires: lustre-osd Requires: lustre-osd-mount +Obsoletes: lustre-client < %{version} Provides: lustre-client = %{version}-%{release} %endif # GSS requires this: BuildRequires: pkgconfig, libgssapi-devel >= 0.10 @@ -131,6 +153,13 @@ 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. @@ -142,8 +171,8 @@ Userspace tools and files for the Lustre file system. %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 +Provides: lustre-osd-mount = %{version}-%{fullrelease} +Group: System Environment/Kernel %description osd-ldiskfs-mount LDISKFS hooks for mount/mkfs into a dynamic library. @@ -156,8 +185,8 @@ LDISKFS hooks for mount/mkfs into a dynamic library. %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 +Provides: lustre-osd-mount = %{version}-%{fullrelease} +Group: System Environment/Kernel %description osd-zfs-mount ZFS hooks for mount/mkfs into a dynamic library. @@ -167,11 +196,28 @@ ZFS hooks for mount/mkfs into a dynamic library. %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} +%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 @@ -183,6 +229,7 @@ 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 @@ -229,7 +276,6 @@ 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 @@ -264,7 +310,10 @@ fi %{!?with_servers:--disable-server} \ %{!?with_zfs:--without-zfs} \ %{!?with_lnet_dlc:--disable-dlc} \ + %{!?with_snmp:--disable-snmp} \ %{!?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} @@ -294,6 +343,8 @@ mv $basemodpath/fs/osd_zfs.ko $basemodpath-osd-zfs/fs/osd_zfs.ko %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 @@ -307,6 +358,11 @@ echo '%{_sysconfdir}/ha.d/resource.d/Lustre.ha_v2' >>lustre.files echo '%{_sysconfdir}/ha.d/resource.d/Lustre' >>lustre.files %endif +# systemd is on redhat, fedora, and suse +%if %{with systemd} +echo '%{_unitdir}/lnet.service' >>lustre.files +%endif + %if %{_vendor}=="redhat" # The following scripts are Red Hat specific %if %{with servers} @@ -314,10 +370,19 @@ echo '%{_sysconfdir}/sysconfig/lustre' >>lustre.files echo '%{_sysconfdir}/sysconfig/lsvcgss' >>lustre.files echo '%{_sysconfdir}/init.d/lustre' >>lustre.files %endif + +%if %{without systemd} echo '%{_sysconfdir}/init.d/lnet' >>lustre.files +%endif + echo '%{_sysconfdir}/init.d/lsvcgss' >>lustre.files %endif +%if %{with servers} +mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/ocf/resource.d/lustre/ +install -m 0755 contrib/scripts/pacemaker/* $RPM_BUILD_ROOT%{_prefix}/lib/ocf/resource.d/lustre/ +%endif + # fc18 needs 'x' permission for library files find $RPM_BUILD_ROOT -name \*.so -type f -exec chmod +x {} \; @@ -336,12 +401,16 @@ echo '%attr(-, root, root) %{_libdir}/liblnetconfig.so.*' >>lustre.files echo '%{_libdir}/libiam.a' >>lustre.files %endif -if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/snmp ] ; then - echo '%{_libdir}/lustre/snmp' >>lustre.files -fi +%if %{with snmp} +mkdir -p $RPM_BUILD_ROOT/%{_libdir}/lustre/snmp +echo '%{_libdir}/lustre/snmp' >>lustre.files +%endif %if %{with lustre_utils} -find $RPM_BUILD_ROOT%{_libdir}/@PACKAGE@ -name \*.la -type f -exec rm -f {} \; +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} @@ -361,8 +430,10 @@ echo '%{_sbindir}/wiretest' >>lustre-tests.files %files -f lustre.files %defattr(-,root,root) %{_sbindir}/* +%if %{with lustre_tests} %exclude %{_sbindir}/wirecheck %exclude %{_sbindir}/wiretest +%endif %if %{with zfs} %exclude %{_sbindir}/zfsobj2fid %endif @@ -387,17 +458,23 @@ echo '%{_sbindir}/wiretest' >>lustre-tests.files %if %{with manpages} %{_mandir}/man?/* %endif +%{_datadir}/lustre %{_includedir}/lustre +%{_includedir}/linux/lnet +%{_includedir}/linux/lustre %endif -%{_datadir}/lustre %{_sysconfdir}/udev/rules.d/99-lustre.rules %config(noreplace) %{_sysconfdir}/ldev.conf +%if %{with lnet_dlc} +%config(noreplace) %{_sysconfdir}/lnet.conf +%endif %config(noreplace) %{_sysconfdir}/modprobe.d/ko2iblnd.conf %if %{with lustre_utils} %config(noreplace) %{_sysconfdir}/lnet_routes.conf %endif %if %{with lustre_modules} +%if %{with shared} %if %{with ldiskfs} %if %{with lustre_utils} %files osd-ldiskfs-mount @@ -405,7 +482,9 @@ echo '%{_sbindir}/wiretest' >>lustre-tests.files %{_libdir}/@PACKAGE@/mount_osd_ldiskfs.so %endif %endif +%endif +%if %{with shared} %if %{with zfs} %if %{with lustre_utils} %files osd-zfs-mount @@ -413,9 +492,16 @@ echo '%{_sbindir}/wiretest' >>lustre-tests.files %{_libdir}/@PACKAGE@/mount_osd_zfs.so %endif %endif +%endif %endif # with lustre_modules +%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 %defattr(-,root,root) @@ -445,6 +531,21 @@ echo '%{_sbindir}/wiretest' >>lustre-tests.files %doc lustre-iokit/stats-collect/README.iokit-lstats %endif +%post +%if %{with systemd} +%systemd_post lnet.service +%endif + +%preun +%if %{with systemd} +%systemd_preun lnet.service +%endif + +%postun +%if %{with systemd} +%systemd_postun_with_restart lnet.service +%endif + %clean rm -rf $RPM_BUILD_ROOT rm -rf %{_tmppath}/kmp