- merge with HEAD

Changed files:
    bcm5700.spec -> 1.55.2.4

diff --git a/bcm5700.spec b/bcm5700.spec
index ffb81997eaaaf0def3cb7607e3ea9a3cc355d573..b845a88de568ae88dc9888906519371aa3c29c54 100644 (file)
--- a/bcm5700.spec
+++ b/bcm5700.spec
@@ -30,7 +30,7 @@ Source1:      %{name}-Makefile
 URL:           http://www.broadcom.com/drivers/downloaddrivers.php
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:     kernel-module-build >= 3:2.6.7}
-BuildRequires: rpmbuild(macros) >= 1.153
+BuildRequires: rpmbuild(macros) >= 1.379
 %endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -38,10 +38,14 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 This package contains the Linux driver for the Broadcom's NetXtreme
 BCM57xx Network Interface Cards.
 
+Note: this driver is obsoleted by Broadcom, use tg3 instead.
+
 %description -l pl.UTF-8
 Pakiet zawiera sterownik dla Linuksa do kart sieciowych Broadcom
 BCM57xx.
 
+Uwaga: ten sterownik Broadcomu jest przestarzały, należy używać tg3.
+
 %package -n kernel-net-bcm5700
 Summary:       Linux SMP driver for the Broadcom's NetXtreme BCM57xx Network Interface Cards
 Summary(pl.UTF-8):     Sterownik dla Linuksa SMP do kart sieciowych Broadcom BCM57xx
@@ -57,9 +61,13 @@ Requires(postun):    %releq_kernel_up
 Linux driver for the Broadcom's NetXtreme BCM57xx Network Interface
 Cards.
 
+Note: this driver is obsoleted by Broadcom, use tg3 instead.
+
 %description -n kernel-net-bcm5700 -l pl.UTF-8
 Sterownik dla Linuksa do kart sieciowych Broadcom BCM57xx.
 
+Uwaga: ten sterownik Broadcomu jest przestarzały, należy używać tg3.
+
 %package -n kernel-smp-net-bcm5700
 Summary:       Linux SMP driver for the Broadcom's NetXtreme BCM57xx Network Interface Cards
 Summary(pl.UTF-8):     Sterownik dla Linuksa SMP do kart sieciowych Broadcom BCM57xx
@@ -75,46 +83,18 @@ Requires(postun):   %releq_kernel_smp
 Linux SMP driver for the Broadcom's NetXtreme BCM57xx Network
 Interface Cards.
 
+Note: this driver is obsoleted by Broadcom, use tg3 instead.
+
 %description -n kernel-smp-net-bcm5700 -l pl.UTF-8
 Sterownik dla Linuksa SMP do kart sieciowych Broadcom BCM57xx.
 
+Uwaga: ten sterownik Broadcomu jest przestarzały, należy używać tg3.
+
 %prep
 %setup -q
 
 %build
-cd src
-
-%if %{with kernel}
-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
-       %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-
-       install %{SOURCE1} Makefile
-
-       %{__make} -C %{_kernelsrcdir} clean \
-               RCS_FIND_IGNORE="-name '*.ko' -o" \
-               M=$PWD O=$PWD/o \
-               %{?with_verbose:V=1}
-       %{__make} -C %{_kernelsrcdir} modules \
-               %{?debug:DBG=1} \
-%if "%{_target_base_arch}" != "%{_arch}"
-               ARCH=%{_target_base_arch} \
-               CROSS_COMPILE=%{_target_base_cpu}-pld-linux- \
-%endif
-               HOSTCC="%{__cc}" \
-               CPP="%{__cpp}" \
-               M=$PWD O=$PWD/o \
-               %{?with_verbose:V=1}
-
-       mv bcm5700{,-$cfg}.ko
-done
-%endif
+%build_kernel_modules -C src -m bcm5700
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -126,13 +106,7 @@ install bcm5700.4 $RPM_BUILD_ROOT%{_mandir}/man4
 %endif
 
 %if %{with kernel}
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/drivers/net
-install bcm5700-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-       $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/net/bcm5700.ko
-%if %{with smp} && %{with dist_kernel}
-install bcm5700-smp.ko \
-       $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/bcm5700.ko
-%endif
+%install_kernel_modules -m bcm5700 -d kernel/drivers/net
 %endif
 
 %clean