- added suport for building both up and smp modules in separated packages

  (build smp subpackage is ifdefed because seems building drbd with for SMP
  is broken),
- move kernel module to kernel-{,smp}-block-drbd subpackages.

Changed files:
    drbd.spec -> 1.4

diff --git a/drbd.spec b/drbd.spec
index 5c87866b964a53a19d91ff5f6b51aa49cb618153..3270b87435bae837b8c4b3f187981bfde3d84f84 100644 (file)
--- a/drbd.spec
+++ b/drbd.spec
@@ -1,7 +1,5 @@
 %define                _kernel_ver     %(grep UTS_RELEASE %{_kernelsrcdir}/include/linux/version.h 2>/dev/null | cut -d'"' -f2)
 %define                _kernel24       %(echo %{_kernel_ver} | grep -q '2\.[012]\.' ; echo $?)
-%define                smpstr          %{?_with_smp:smp}%{!?_with_smp:up}
-%define                smp             %{?_with_smp:1}%{!?_with_smp:0}
 
 %define                rel             1
 
@@ -9,7 +7,7 @@ Summary:        drbd is a block device designed to build high availibility clusters
 Summary(pl):   drbd jest urz±dzeniem blokowym dla klastrów o wysokiej niezawodno¶ci
 Name:          drbd
 Version:       0.5.8
-Release:       %{rel}@%{_kernel_ver}%{smpstr}
+Release:       %{rel}@%{_kernel_ver}
 License:       GPL
 Group:         Base/Kernel
 Group(de):     Grundsätzlich/Kern
@@ -17,9 +15,7 @@ Group(pl):    Podstawowe/J
 Source0:       http://www.complang.tuwien.ac.at/reisner/drbd/download/%{name}-%{version}.tar.gz
 Patch0:                %{name}-kernel24.patch
 URL:           http://www.complang.tuwien.ac.at/reisner/drbd/
-Prereq:                /sbin/depmod
 Conflicts:     kernel < %{_kernel_ver}, kernel > %{_kernel_ver}
-Conflicts:     kernel-%{?_with_smp:up}%{!?_with_smp:smp}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -45,9 +41,51 @@ Requires:    %{name} = %{version}
 %description -n drbdsetup
 Setup tool and init scripts for DRBD.
 
-%description -n drbdsetup -l pl
+%description -l pl -n drbdsetup
 Narzêdzie konfiguracyjne i skrypty startowe dla DRBD.
 
+%package -n kernel-block-drbd
+Summary:       kernel module with drbd - a block device designed to build high availibility clusters
+Summary(pl):   Modu³ kernela do drbd - urz±dzenia blokowego dla klastrów o wysokiej niezawodno¶ci
+Group:         Base/Kernel
+Group(de):     Grundsätzlich/Kern
+Group(pl):     Podstawowe/J±dro
+Prereq:                /sbin/depmod
+Conflicts:     kernel-smp-block-drbd
+Conflicts:     kernel < %{_kernel_ver}
+Conflicts:     kernel > %{_kernel_ver}
+
+%description -n kernel-block-drbd
+drbd is a block device which is designed to build high availability
+clusters. This is done by mirroring a whole block device via (a
+dedicated) network. You could see it as a network RAID1.
+
+%description -l pl -n kernel-block-drbd
+drbd jest urz±dzeniem blokowym zaprojektowanym dla klastrów o wysokiej
+niezawodno¶ci. drbd dzia³a jako mirroring ca³ego urz±dzenia blokowego
+przez (dedykowan±) sieæ. Mo¿e byæ widoczny jako sieciowy RAID1.
+
+%package -n kernel-smp-block-drbd
+Summary:       SMP kernel module with drbd - a block device designed to build high availibility clusters
+Summary(pl):   Modu³ kernela SMP do drbd - urz±dzenia blokowego dla klastrów o wysokiej niezawodno¶ci
+Group:         Base/Kernel
+Group(de):     Grundsätzlich/Kern
+Group(pl):     Podstawowe/J±dro
+Prereq:                /sbin/depmod
+Conflicts:     kernel-block-drbd
+Conflicts:     kernel < %{_kernel_ver}
+Conflicts:     kernel > %{_kernel_ver}
+
+%description -n kernel-smp-block-drbd
+drbd is a block device which is designed to build high availability
+clusters. This is done by mirroring a whole block device via (a
+dedicated) network. You could see it as a network RAID1.
+
+%description -l pl -n kernel-smp-block-drbd
+drbd jest urz±dzeniem blokowym zaprojektowanym dla klastrów o wysokiej
+niezawodno¶ci. drbd dzia³a jako mirroring ca³ego urz±dzenia blokowego
+przez (dedykowan±) sieæ. Mo¿e byæ widoczny jako sieciowy RAID1.
+
 %prep
 %setup -q -n %{name}
 %if %{_kernel24}
@@ -55,9 +93,23 @@ Narz
 %endif
 
 %build
-%if %{smp}
-SMP="-D__SMP__"
+%if 0
+%{__make} \
+%ifarch %{ix86}
+       KAF_i386="%{rpmcflags} -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fomit-frame-pointer" \
+%else
+%ifarch %{alpha}
+       KAF_alpha="%{rpmcfalgs} -ffixed8 -mno-fp-regs" \
+%endif
 %endif
+       SMPFLAG="-D__SMP__" \
+       KERNVER="%{_kernel_ver}" \
+       INCLUDE="-I%{_kernelsrcdir}/include" \
+       DEBUGFLAGS="%{rpmcflags} %{?debug:-DDBG}"
+
+mv drbd/drbd.o drbd-smp.o
+%endif
+
 %{__make} \
 %ifarch %{ix86}
        KAF_i386="%{rpmcflags} -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fomit-frame-pointer" \
@@ -66,7 +118,7 @@ SMP="-D__SMP__"
        KAF_alpha="%{rpmcfalgs} -ffixed8 -mno-fp-regs" \
 %endif
 %endif
-       SMPFLAG="$SMP" \
+       SMPFLAG="" \
        KERNVER="%{_kernel_ver}" \
        INCLUDE="-I%{_kernelsrcdir}/include" \
        DEBUGFLAGS="%{rpmcflags} %{?debug:-DDBG}"
@@ -77,11 +129,17 @@ install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man{5,8},%{_sysconfdir}} \
        $RPM_BUILD_ROOT{/etc/rc.d/init.d,/etc/ha.d/resource.d}
 
 %if %{_kernel24}
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
-install drbd/drbd.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
+install drbd/drbd.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/drbd.o
+%if 0
+install drbd-smp.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/drbd.o
+%endif
 %else
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/block
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/block
 install drbd/drbd.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/block
+%if 0
+install drbd-smp.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/block/drbd.o
+%endif
 %endif
 
 install user/drbdsetup $RPM_BUILD_ROOT%{_sbindir}
@@ -97,10 +155,16 @@ gzip -9nf ChangeLog README TODO
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
+%post   -n kernel-block-drbd
+/sbin/depmod -a
+
+%postun -n kernel-block-drbd
 /sbin/depmod -a
 
-%postun
+%post   -n kernel-smp-block-drbd
+/sbin/depmod -a
+
+%postun -n kernel-smp-block-drbd
 /sbin/depmod -a
 
 %post -n drbdsetup
@@ -109,7 +173,7 @@ chkconfig --add drbd
 %preun -n drbdsetup
 chkconfig --del drbd
 
-%files
+%files -n kernel-block-drbd
 %defattr(644,root,root,755)
 %doc *.gz
 %if %{_kernel24}
@@ -118,6 +182,17 @@ chkconfig --del drbd
 /lib/modules/%{_kernel_ver}/block/drbd.o
 %endif
 
+%if 0
+%files -n kernel-smp-block-drbd
+%defattr(644,root,root,755)
+%doc *.gz
+%if %{_kernel24}
+/lib/modules/%{_kernel_ver}smp/misc/drbd.o
+%else
+/lib/modules/%{_kernel_ver}smp/block/drbd.o
+%endif
+%endif
+
 %files -n drbdsetup
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/drbdsetup