- up to 060618, snap of 2.6.17.14 kernel

- %{_alt_kernel} support
- use %build_kernel_modules, %install_kernel_modules macros

Changed files:
    bcm43xx.spec -> 1.14

diff --git a/bcm43xx.spec b/bcm43xx.spec
index e88a88ead9af8fcdc66e94bf9b1a1e5d60526a56..0032832f4c801245ab6e87071b2dc5aecf9f292a 100644 (file)
--- a/bcm43xx.spec
+++ b/bcm43xx.spec
@@ -10,9 +10,9 @@
 %undefine      with_smp
 %endif
 #
-%define        _snap   060416
+%define        _snap   060618
 %define        _fwcutter_ver   005
-%define        _rel    2
+%define        _rel    3
 Summary:       Broadcom BCM43xx series driver for Linux
 Summary(pl):   Sterownik do kart Broadcom BCM43xx
 Name:          bcm43xx
@@ -20,15 +20,15 @@ Version:    0.0.1
 Release:       0.20%{_snap}.%{_rel}
 License:       GPL v2
 Group:         Base/Kernel
-Source0:       http://tara.shadowpimps.net/~bcm43xx/bcm43xx-snapshots/standalone/bcm43xx/%{name}-standalone-%{_snap}.tar.bz2
-# Source0-md5: 18c875d790507269aa58ba545c98c932
+Source0:       %{name}-standalone-%{_snap}.tar.bz2
+# Source0-md5: e82bb24ac2cc5557d1648f7bd7e016cf
 Source1:       http://download.berlios.de/bcm43xx/%{name}-fwcutter-%{_fwcutter_ver}.tar.bz2
 # Source1-md5: af9d7ce9794b00f0ee73d3a6bfb321ac
 Patch0:                %{name}-local_headers.patch
 URL:           http://bcm43xx.berlios.de/
 %if %{with kernel}
-%{?with_dist_kernel:BuildRequires:     kernel-module-build >= 3:2.6.7}
-BuildRequires: rpmbuild(macros) >= 1.217
+%{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.7}
+BuildRequires: rpmbuild(macros) >= 1.326
 BuildRequires: softmac-devel
 %endif
 Requires(post,postun): /sbin/depmod
@@ -42,7 +42,7 @@ Ethernet network adapter.
 Pakiet zawiera sterownik dla Linuksa do kart sieciowych Broadcom
 BCM43xx.
 
-%package -n kernel-net-bcm43xx
+%package -n kernel%{_alt_kernel}-net-bcm43xx
 Summary:       Broadcom BCM43xx driver for Linux
 Summary(pl):   Sterownik do karty Broadcom BCM43xx dla Linuksa
 Release:       %{_rel}@%{_kernel_ver_str}
@@ -53,15 +53,15 @@ Requires(post,postun):      /sbin/depmod
 Requires(postun):      %releq_kernel_up
 %endif
 
-%description -n kernel-net-bcm43xx
+%description -n kernel%{_alt_kernel}-net-bcm43xx
 This package contains the Linux driver for the Broadcom BCM43xx
 Ethernet network adapter.
 
-%description -n kernel-net-bcm43xx -l pl
+%description -n kernel%{_alt_kernel}-net-bcm43xx -l pl
 Pakiet zawiera sterownik dla Linuksa do kart sieciowych Broadcom
 BCM43xx.
 
-%package -n kernel-smp-net-bcm43xx
+%package -n kernel%{_alt_kernel}-smp-net-bcm43xx
 Summary:       Broadcom BCM43xx driver for Linux SMP
 Summary(pl):   Sterownik do karty Broadcom BCM43xx dla Linuksa SMP
 Release:       %{_rel}@%{_kernel_ver_str}
@@ -72,11 +72,11 @@ Requires(post,postun):      /sbin/depmod
 Requires(postun):      %releq_kernel_smp
 %endif
 
-%description -n kernel-smp-net-bcm43xx
+%description -n kernel%{_alt_kernel}-smp-net-bcm43xx
 This package contains the Linux SMP driver for the Broadcom BCM43xx
 series Ethernet Network Adapter.
 
-%description -n kernel-smp-net-bcm43xx -l pl
+%description -n kernel%{_alt_kernel}-smp-net-bcm43xx -l pl
 Pakiet zawiera sterownik dla Linuksa SMP do kart sieciowych Broadcom
 BCM43xx.
 
@@ -86,7 +86,7 @@ BCM43xx.
 sed -i 's/KBUILD_MODNAME/"bcm43xx"/' \
        drivers/net/wireless/bcm43xx/*.[hc]
 ln -s %{_includedir}/linux/softmac/net drivers/net/wireless/bcm43xx/
-mv %{name}-fwcutter-%{_fwcutter_ver}/README README.fwcutter
+mv %{name}-fwcutter-%{_fwcutter_ver}/README README
 cat > drivers/net/wireless/bcm43xx/Makefile << EOF
 CFLAGS += -DCONFIG_BCM43XX=1
 CFLAGS += -DCONFIG_BCM43XX_DMA=1
@@ -114,29 +114,7 @@ EOF
 
 %if %{with kernel}
 cd drivers/net/wireless/bcm43xx/
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
-       if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
-               exit 1
-       fi
-       install -d o/include/linux
-       ln -sf %{_kernelsrcdir}/config-$cfg o/.config
-       ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
-       ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
-
-       %if %{with dist_kernel}
-               %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-       %else
-               install -d o/include/config
-               touch o/include/config/MARKER
-               ln -sf %{_kernelsrcdir}/scripts o/scripts
-       %endif
-       %{__make} -C %{_kernelsrcdir} modules \
-               CC="%{__cc}" CPP="%{__cpp}" \
-               M=$PWD O=$PWD/o \
-               %{?with_verbose:V=1}
-
-       mv bcm43xx{,-$cfg}.ko
-done
+%build_kernel_modules -m bcm43xx
 cd -
 %endif
 
@@ -149,44 +127,40 @@ install %{name}-fwcutter-%{_fwcutter_ver}/bcm43xx-fwcutter $RPM_BUILD_ROOT%{_bin
 %endif
 
 %if %{with kernel}
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/drivers/net
-install drivers/net/wireless/bcm43xx/bcm43xx-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-       $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/net/bcm43xx.ko
-%if %{with smp} && %{with dist_kernel}
-install drivers/net/wireless/bcm43xx/bcm43xx-smp.ko \
-       $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/bcm43xx.ko
-%endif
+cd drivers/net/wireless/bcm43xx/
+%install_kernel_modules -m bcm43xx -d kernel/drivers/net
+cd -
 %endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  -n kernel-net-bcm43xx
+%post  -n kernel%{_alt_kernel}-net-bcm43xx
 %depmod %{_kernel_ver}
 
-%postun        -n kernel-net-bcm43xx
+%postun        -n kernel%{_alt_kernel}-net-bcm43xx
 %depmod %{_kernel_ver}
 
-%post  -n kernel-smp-net-bcm43xx
+%post  -n kernel%{_alt_kernel}-smp-net-bcm43xx
 %depmod %{_kernel_ver}smp
 
-%postun -n kernel-smp-net-bcm43xx
+%postun -n kernel%{_alt_kernel}-smp-net-bcm43xx
 %depmod %{_kernel_ver}smp
 
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
-%doc README README.fwcutter
+%doc README
 %attr(755,root,root) %{_bindir}/bcm43xx-fwcutter
 %endif
 
 %if %{with kernel}
-%files -n kernel-net-bcm43xx
+%files -n kernel%{_alt_kernel}-net-bcm43xx
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/bcm43xx.ko*
 
 %if %{with smp} && %{with dist_kernel}
-%files -n kernel-smp-net-bcm43xx
+%files -n kernel%{_alt_kernel}-smp-net-bcm43xx
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}smp/kernel/drivers/net/bcm43xx.ko*
 %endif