SPECS (AC-branch): bcm5700.spec - updated from LINUX_2_6_22 branch, old one...

glen glen at pld-linux.org
Thu Jul 3 13:30:49 CEST 2008 

Author: glen                         Date: Thu Jul  3 11:30:49 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- updated from LINUX_2_6_22 branch, old one in LINUX_2_6_16 branch

---- Files affected:
SPECS:
   bcm5700.spec (1.55.2.9 -> 1.55.2.10) 

---- Diffs:

================================================================
Index: SPECS/bcm5700.spec
diff -u SPECS/bcm5700.spec:1.55.2.9 SPECS/bcm5700.spec:1.55.2.10
--- SPECS/bcm5700.spec:1.55.2.9	Fri Feb 15 16:18:56 2008
+++ SPECS/bcm5700.spec	Thu Jul  3 13:30:43 2008
@@ -3,8 +3,6 @@
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_without	kernel		# don't build kernel modules
-%bcond_without	up		# don't build UP module
-%bcond_without	smp		# don't build SMP module
 %bcond_without	userspace	# don't build userspace programs
 %bcond_with	verbose		# verbose build (V=1)
 
@@ -14,26 +12,30 @@
 %if "%{_alt_kernel}" != "%{nil}"
 %undefine	with_userspace
 %endif
-
-%ifarch sparc
-%undefine	with_smp
+%if %{without userspace}
+# nothing to be placed to debuginfo package
+%define		_enable_debug_packages	0
 %endif
 
+%define		rel	4
 %define		pname	bcm5700
 Summary:	Linux driver for the Broadcom's NetXtreme BCM57xx Network Interface Cards
 Summary(pl.UTF-8):	Sterownik dla Linuksa do kart sieciowych Broadcom NetXtreme BCM57xx
 Name:		%{pname}%{_alt_kernel}
 Version:	8.3.14
-Release:	3
+Release:	%{rel}
 License:	GPL v2
 Group:		Base/Kernel
 # extracted from http://www.broadcom.com/docs/driver_download/570x/linux-8.3.14.zip
 Source0:	%{pname}-%{version}.tar.gz
 # Source0-md5:	6dd814821f26ad67c7d7ce61c5275ca0
 Source1:	%{pname}-Makefile
+Patch0:		%{pname}-2.6.22.patch
 URL:		http://www.broadcom.com/drivers/downloaddrivers.php
-%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.14}
-BuildRequires:	rpmbuild(macros) >= 1.379
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
+BuildRequires:	rpmbuild(macros) >= 1.452
+# broken build
+ExcludeArch:	%{x8664} alpha sparc64 ppc64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -51,9 +53,10 @@
 %package -n kernel%{_alt_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
+Release:	%{rel}@%{_kernel_vermagic}
 Group:		Base/Kernel
-%{?with_dist_kernel:Requires:	kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
 Requires(post,postun):	/sbin/depmod
+%{?with_dist_kernel:Requires:	kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
 
 %description -n kernel%{_alt_kernel}-net-bcm5700
 Linux driver for the Broadcom's NetXtreme BCM57xx Network Interface
@@ -66,26 +69,9 @@
 
 Uwaga: ten sterownik Broadcomu jest przestarzały, należy używać tg3.
 
-%package -n kernel%{_alt_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
-Group:		Base/Kernel
-%{?with_dist_kernel:Requires:	kernel%{_alt_kernel}-smp(vermagic) = %{_kernel_ver}}
-Requires(post,postun):	/sbin/depmod
-
-%description -n kernel%{_alt_kernel}-smp-net-bcm5700
-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%{_alt_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 -n %{pname}-%{version}
+%patch0 -p1
 
 mv src/Makefile{,.orig}
 cat > src/Makefile << EOF
@@ -119,12 +105,6 @@
 %postun	-n kernel%{_alt_kernel}-net-bcm5700
 %depmod %{_kernel_ver}
 
-%post	-n kernel%{_alt_kernel}-smp-net-bcm5700
-%depmod %{_kernel_ver}smp
-
-%postun	-n kernel%{_alt_kernel}-smp-net-bcm5700
-%depmod %{_kernel_ver}smp
-
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
@@ -133,53 +113,64 @@
 %endif
 
 %if %{with kernel}
-%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-net-bcm5700
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/bcm5700.ko*
 %endif
 
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-net-bcm5700
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/bcm5700.ko*
-%endif
-%endif
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.55.2.9  2008/02/15 15:18:56  glen
-- release 3
+Revision 1.55.2.10  2008/07/03 11:30:43  glen
+- updated from LINUX_2_6_22 branch, old one in LINUX_2_6_16 branch
+
+Revision 1.65.2.4  2008-04-04 17:54:57  glen
+- #if defined(CONFIG_SPARC64) || defined(CONFIG_X86_64) ||defined(CONFIG_PPC64)
+
+Revision 1.65.2.3  2008-04-04 17:52:36  glen
+- disable broken arch
+
+Revision 1.65.2.2  2008-04-03 20:31:03  glen
+- release 4
+
+Revision 1.65.2.1  2008-04-03 20:30:24  glen
+- AC deps
+
+Revision 1.65  2008-04-03 20:28:14  glen
+- no debuginfo as no userspace tools
+
+Revision 1.64  2008-04-03 20:17:07  glen
+- actually apply patch0
 
-Revision 1.55.2.8  2008-02-15 15:18:28  glen
-- fix alt_kernel build, rewrite Makefile so it would build also on alpha
+Revision 1.63  2008-04-03 20:07:51  glen
+- no more smp
 
-Revision 1.55.2.7  2008-02-15 14:33:13  glen
-- more alt_kernel
+Revision 1.62  2008-02-15 15:38:41  glen
+- alt kernel fix, buildfix
 
-Revision 1.55.2.6  2008-02-15 14:32:13  glen
-- alt kernel stuff
+Revision 1.61  2008-02-15 14:37:21  glen
+- alt_kernel stuff merge from AC-branch
 
-Revision 1.55.2.5  2008-02-15 14:28:43  glen
-- use vermagic for kernel deps
+Revision 1.60  2008-02-08 18:45:35  qboosh
+- unified note
 
-Revision 1.55.2.4  2008-02-15 14:26:22  glen
-- merge with HEAD
+Revision 1.59  2008-02-08 11:25:40  gotar
+- note about newer tg3 driver
 
-Revision 1.55.2.3  2008-02-08 18:35:15  qboosh
-- updated comment
+Revision 1.58  2007-09-09 22:22:05  zbyniu
+- macro in patch name
 
-Revision 1.55.2.2  2008-02-08 07:58:04  marcus
-- md5 updated
+Revision 1.57  2007/09/09 22:15:49  zbyniu
+- up to 8.3.14; cleanups
+- patch against kernel 2.6.22
 
-Revision 1.55.2.1  2008-02-08 07:53:32  marcus
-- up to 8.3.14 for Ac
+Revision 1.56  2007/04/12 15:16:20  shadzik
+- proper kernel-module-build version
 
-Revision 1.55  2007-03-14 00:13:57  glen
+Revision 1.55  2007/03/14 00:13:57  glen
 - up bcond
 
 Revision 1.54  2007/02/12 21:23:49  glen
================================================================

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

More information about the pld-cvs-commit mailing list