X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre.spec.in;h=59a3352174554ac8b9a8bd5ecfb4e364b7ce0e0c;hb=c26a4d72445c7ce02e370cc84932d7cc89416966;hp=979fe56b3d2242f89e1cee8b19120e68acfc7cfc;hpb=bc7e8060d34b205de65bd6d820284523ac9f4c4e;p=fs%2Flustre-release.git diff --git a/lustre.spec.in b/lustre.spec.in index 979fe56..59a3352 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -12,6 +12,7 @@ %bcond_without manpages %bcond_without shared %bcond_without static +%bcond_with systemd %if %{without servers} # --without servers overrides --with {ldiskfs|zfs} @@ -93,12 +94,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 +127,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 +148,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 +166,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 +180,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. @@ -181,7 +205,7 @@ environment for both Pacemaker and rgmanager. %package tests Summary: Lustre testing framework -Group: Development/Kernel +Group: System Environment/Kernel Provides: %{name}-tests = %{version} Requires: %{name} = %{version}, lustre-iokit Requires: %{requires_kmod_name} = %{requires_kmod_version} @@ -241,7 +265,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 @@ -277,6 +300,8 @@ fi %{!?with_zfs:--without-zfs} \ %{!?with_lnet_dlc:--disable-dlc} \ %{!?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} @@ -306,6 +331,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 @@ -319,6 +346,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} @@ -326,7 +358,11 @@ 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 @@ -358,6 +394,7 @@ if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/snmp ] ; then fi %if %{with lustre_utils} +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/lustre find $RPM_BUILD_ROOT%{_libdir}/@PACKAGE@ -name \*.la -type f -exec rm -f {} \; %endif @@ -404,11 +441,14 @@ echo '%{_sbindir}/wiretest' >>lustre-tests.files %if %{with manpages} %{_mandir}/man?/* %endif +%{_datadir}/lustre %{_includedir}/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 @@ -468,6 +508,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