SPECS (AC-branch): bcm5700.spec - merge with HEAD

glen glen at pld-linux.org
Fri Feb 15 15:26:28 CET 2008 

Author: glen                         Date: Fri Feb 15 14:26:28 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge with HEAD

---- Files affected:
SPECS:
   bcm5700.spec (1.55.2.3 -> 1.55.2.4) 

---- Diffs:

================================================================
Index: SPECS/bcm5700.spec
diff -u SPECS/bcm5700.spec:1.55.2.3 SPECS/bcm5700.spec:1.55.2.4
--- SPECS/bcm5700.spec:1.55.2.3	Fri Feb  8 19:35:15 2008
+++ SPECS/bcm5700.spec	Fri Feb 15 15:26:22 2008
@@ -31,7 +31,7 @@
 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)
 
@@ -39,10 +39,14 @@
 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
@@ -58,9 +62,13 @@
 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
@@ -76,46 +84,18 @@
 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
@@ -127,13 +107,7 @@
 %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
@@ -178,6 +152,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.55.2.4  2008-02-15 14:26:22  glen
+- merge with HEAD
+
 Revision 1.55.2.3  2008-02-08 18:35:15  qboosh
 - updated comment
 
@@ -252,7 +229,7 @@
 - rel 1
 
 Revision 1.35  2004/08/06 12:13:35  pluto
-- main pkg. without %%{_kernel_ver_str}.
+- main pkg. without %{_kernel_ver_str}.
 
 Revision 1.34  2004/08/06 12:05:43  pluto
 - md5.
@@ -281,7 +258,7 @@
 - massive attack s/pld.org.pl/pld-linux.org/
 
 Revision 1.26  2003/05/16 08:33:42  trojan
-- fixed depmod in %%post and %%postun when build with _without_dist_kernel
+- fixed depmod in %post and %postun when build with _without_dist_kernel
 
 Revision 1.25  2003/05/14 14:42:43  qboosh
 - added depmod options so modules can be installed for kernel other than running
@@ -297,10 +274,10 @@
 
 Revision 1.21  2003/03/03 20:57:19  marcus
 - updated to version 2.2.19 (from Compaq SoftPack)
-(Ra - updates/general STBR)
+  (Ra - updates/general STBR)
 
 Revision 1.20  2002/11/27 21:10:39  juandon
-- new %%doc
+- new %doc
 
 Revision 1.19  2002/11/17 18:31:50  kloczek
 - release 11: rebuild against kernel 2.2.22-6.
@@ -334,7 +311,7 @@
 - use kgcc_package macro
 
 Revision 1.10  2002/02/26 15:11:06  qboosh
-- use %%kgcc macro
+- use %kgcc macro
 
 Revision 1.9  2002/02/26 13:22:24  qboosh
 - use requires_releq_kernel_{up,smp} macros, BR: egcs, release 4
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/bcm5700.spec?r1=1.55.2.3&r2=1.55.2.4&f=u

More information about the pld-cvs-commit mailing list