- updated kernel modules build system

[packages/zfs.git] / zfs.spec

diff --git a/zfs.spec b/zfs.spec
index 91704876030f46d0e64a9b20e4a8be83ba293a13..9f01db04b108cc8895d5014d215d0abdb2300b5b 100644 (file)
--- a/zfs.spec
+++ b/zfs.spec
@@ -1,15 +1,10 @@
 # TODO: PLDify init script
 #
 # Conditional build:
-%bcond_without dist_kernel     # allow non-distribution kernel
 %bcond_without kernel          # don't build kernel modules
 %bcond_without userspace       # don't build userspace programs
 %bcond_with    verbose         # verbose build (V=1)
 #
-%if %{without kernel}
-%undefine      with_dist_kernel
-%endif
-
 # The goal here is to have main, userspace, package built once with
 # simple release number, and only rebuild kernel packages with kernel
 # version as part of release number, without the need to bump release
@@ -19,17 +14,6 @@
 exit 1
 %endif
 
-%if "%{_alt_kernel}" != "%{nil}"
-%if 0%{?build_kernels:1}
-%{error:alt_kernel and build_kernels are mutually exclusive}
-exit 1
-%endif
-%undefine      with_userspace
-%global                _build_kernels          %{alt_kernel}
-%else
-%global                _build_kernels          %{?build_kernels:,%{?build_kernels}}
-%endif
-
 %if %{without userspace}
 # nothing to be placed to debuginfo package
 %define                _enable_debug_packages  0
@@ -37,12 +21,8 @@ exit 1
 
 %define                _duplicate_files_terminate_build        0
 
-%define                kbrs    %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo "BuildRequires:kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2" ; done)
-%define                kpkg    %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%kernel_pkg ; done)
-%define                bkpkg   %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%build_kernel_pkg ; done)
-
 %define        pname   zfs
-%define        rel     1
+%define        rel     4
 Summary:       Native Linux port of the ZFS filesystem
 Summary(pl.UTF-8):     Natywny linuksowy port systemu plików ZFS
 Name:          %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
@@ -53,14 +33,15 @@ Group:              Applications/System
 Source0:       http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/%{pname}-%{version}.tar.gz
 # Source0-md5: 5bcc32c122934d421eba68e16826637d
 Patch0:                %{pname}-link.patch
+Patch1:                linux-3.18.patch
 URL:           http://zfsonlinux.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: libtool
+BuildRequires: rpmbuild(macros) >= 1.701
 %if %{with kernel}
-BuildRequires: kernel%{_alt_kernel}-spl-devel >= 0.6.3
-BuildRequires: rpmbuild(macros) >= 1.379
-%{?with_dist_kernel:%{expand:%kbrs}}
+%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}
+%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-spl-devel >= 0.6.3}
 %endif
 %if %{with userspace}
 BuildRequires: libblkid-devel
@@ -163,10 +144,8 @@ Summary(pl.UTF-8): ZFS - moduły jądra Linuksa\
 Release:       %{rel}@%{_kernel_ver_str}\
 Group:         Base/Kernel\
 Requires(post,postun): /sbin/depmod\
-%if %{with dist_kernel}\
 %requires_releq_kernel\
 Requires(postun):      %releq_kernel\
-%endif\
 \
 %description -n kernel%{_alt_kernel}-zfs\
 ZFS Linux kernel modules.\
@@ -179,10 +158,8 @@ Summary:   ZFS Linux kernel headers\
 Summary(pl.UTF-8):     ZFS - pliki nagłówkowe jądra Linuksa\
 Release:       %{rel}@%{_kernel_ver_str}\
 Group:         Development/Building\
-%if %{with dist_kernel}\
 Requires:      kernel%{_alt_kernel}-headers\
 Requires:      kernel-zfs-common-devel\
-%endif\
 \
 %description -n kernel%{_alt_kernel}-zfs-devel\
 ZFS Linux kernel headers configured for PLD kernel%{_alt_kernel},\
@@ -230,11 +207,12 @@ p=`pwd`\
 %{__make} install DESTDIR=$p/installed INSTALL_MOD_DIR=misc\
 %{nil}
 
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
 
 %prep
 %setup -q -n %{pname}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -242,7 +220,7 @@ p=`pwd`\
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%{?with_kernel:%{expand:%bkpkg}}
+%{?with_kernel:%{expand:%build_kernel_packages}}
 
 %if %{with userspace}
 %configure \
@@ -389,6 +367,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with kernel}
 %files -n kernel-zfs-common-devel
 %defattr(644,root,root,755)
+%dir /usr/src/zfs-%{version}
 /usr/src/zfs-%{version}/include
 /usr/src/zfs-%{version}/zfs.release.in
 /usr/src/zfs-%{version}/zfs_config.h.in