X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=ef4c45f3ee81feaf9eb096fee13e7ffa2510d1d6;hp=c2b6ce1d30bb2ef5ac2da6107c0bf16c559a024c;hb=0c8d53e17be600c99e4a8f96062f39306c3ccad8;hpb=f77c82e1e5abaada7fa7615d25afb6f2133b8c15 diff --git a/lustre.spec.in b/lustre.spec.in index c2b6ce1..ef4c45f 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -35,17 +35,6 @@ # selection with our selection. %{!?kernel_version: %global kernel_version %kversion} -%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 - -%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- # erator needs to be disabled @@ -91,9 +80,12 @@ %if %{_vendor}=="redhat" || %{_vendor}=="fedora" %global requires_kmod_name kmod-%{lustre_name} + %global requires_kmod_tests_name kmod-%{lustre_name}-tests %global requires_kmod_version %{version} %else #for Suse %global requires_kmod_name %{lustre_name}-kmp + %global requires_kmod_tests_name %{lustre_name}-tests-kmp + %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 @@ -104,7 +96,7 @@ Summary: Lustre File System Name: %{lustre_name} Version: %{version} -Release: %{fullrelease} +Release: 1%{?dist} License: GPL Group: Utilities/System Source: lustre-%{version}.tar.gz @@ -124,7 +116,7 @@ BuildRequires: libtool %if %{with servers} Requires: lustre-osd Requires: lustre-osd-mount -Provides: lustre-client = %{version}-%{fullrelease} +Provides: lustre-client = %{version}-%{release} %endif # GSS requires this: BuildRequires: pkgconfig, libgssapi-devel >= 0.10 %if %{_vendor}=="redhat" || %{_vendor}=="fedora" @@ -133,6 +125,7 @@ BuildRequires: libselinux-devel Requires: libselinux %endif %if %{with lustre_modules} +BuildRequires: %kernel_module_package_buildreqs %if %{_vendor}=="redhat" BuildRequires: redhat-rpm-config %endif @@ -142,9 +135,6 @@ BuildRequires: redhat-rpm-config Userspace tools and files for the Lustre file system. %if %{with lustre_modules} -%kernel_module_package_buildreqs - -# Lustre modules %kernel_module_package -n %{name} -p %SOURCE1 -f %SOURCE2 default %if %{with ldiskfs} @@ -177,46 +167,13 @@ ZFS hooks for mount/mkfs into a dynamic library. %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 -# 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. - %package tests Summary: Lustre testing framework Group: Development/Kernel Provides: %{name}-tests = %{version} -Requires: %{name} = %{version}, %{requires_kmod_name} = %{requires_kmod_version}, lustre-iokit +Requires: %{name} = %{version}, lustre-iokit +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 @@ -224,7 +181,7 @@ 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 +%kernel_module_package -n %{name}-tests -f %SOURCE7 default %endif %if %{with lustre_iokit} @@ -308,7 +265,6 @@ fi %{!?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}/%{name} @@ -384,8 +340,9 @@ if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/snmp ] ; then echo '%{_libdir}/lustre/snmp' >>lustre.files fi -find $RPM_BUILD_ROOT%{_libdir}/@PACKAGE@ \ - -name \*.la -type f -exec rm -f {} \; +%if %{with lustre_utils} +find $RPM_BUILD_ROOT%{_libdir}/@PACKAGE@ -name \*.la -type f -exec rm -f {} \; +%endif %if %{with lustre_modules} # mark modules executable for find-debuginfo.sh @@ -393,10 +350,10 @@ find $RPM_BUILD_ROOT/lib/modules -name \*.ko -type f -exec chmod u+x {} \; %endif %if %{with lustre_tests} +:> lustre-tests.files 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 %endif @@ -431,7 +388,6 @@ echo '%{_sbindir}/wiretest' >>lustre-tests.files %{_mandir}/man?/* %endif %{_includedir}/lustre -%{_includedir}/libcfs %endif %{_datadir}/lustre %{_sysconfdir}/udev/rules.d/99-lustre.rules @@ -458,10 +414,6 @@ echo '%{_sbindir}/wiretest' >>lustre-tests.files %endif # with lustre_modules -# uncomment these lines to enable deps packages -# %files deps-sles -# %files deps-rhel - %if %{with lustre_tests} %files tests -f lustre-tests.files %defattr(-,root,root)