packages (LINUX_2_6_16): bnx2/bnx2.spec - build for 2.6.16 kernel

[glen]

Author: glen                         Date: Tue Feb  8 09:14:54 2011 GMT
Module: packages                      Tag: LINUX_2_6_16
---- Log message:
- build for 2.6.16 kernel

---- Files affected:
packages/bnx2:
   bnx2.spec (1.2 -> 1.2.2.1) 

---- Diffs:

================================================================
Index: packages/bnx2/bnx2.spec
diff -u packages/bnx2/bnx2.spec:1.2 packages/bnx2/bnx2.spec:1.2.2.1
--- packages/bnx2/bnx2.spec:1.2	Tue Jan 25 08:32:44 2011
+++ packages/bnx2/bnx2.spec	Tue Feb  8 10:14:48 2011
@@ -4,12 +4,14 @@
 #
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
+%bcond_without	smp		# don't build SMP module
+%bcond_without	up		# don't build UP module
 %bcond_with	verbose		# verbose build (V=1)
 
 # nothing to be placed to debuginfo package
 %define		_enable_debug_packages	0
 
-%define		rel	0.1
+%define		rel	1
 %define		pname	bnx2
 Summary:	Broadcom NetXtreme II Gigabit ethernet driver
 Name:		%{pname}%{_alt_kernel}
@@ -21,7 +23,7 @@
 # download: brcm_dd_nic_netxtreme2-*.tgz
 Source0:	ftp://download2.boulder.ibm.com/ecc/sar/CMA/XSA/brcm_dd_nic_netxtreme2-%{version}_1.52.16_sles11_32-64.tgz
 # Source0-md5:	29b93ae8c6ba423687b1268285a7befb
-%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.27}
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.16}
 BuildRequires:	rpm-utils
 BuildRequires:	rpmbuild(macros) >= 1.379
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -38,8 +40,9 @@
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 %if %{with dist_kernel}
-%requires_releq_kernel
-Requires(postun):	%releq_kernel
+%requires_releq_kernel_up
+%{?with_dist_kernel:Requires:	kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
+Requires(postun):	%releq_kernel_up
 %endif
 
 %description -n kernel%{_alt_kernel}-net-bnx2
@@ -47,6 +50,23 @@
 driver for the Broadcom NetXtreme II BCM5706/BCM5708/5709/5716
 10/100/1000/2500/10000 Mbps PCIX/PCIE Ethernet Network Controller.
 
+%package -n kernel%{_alt_kernel}-smp-net-bnx2
+Summary:	Linux driver for bnx2
+Summary(pl.UTF-8):	Sterownik dla Linuksa do bnx2
+Release:	%{rel}@%{_kernel_ver_str}
+Group:		Base/Kernel
+Requires(post,postun):	/sbin/depmod
+%if %{with dist_kernel}
+%requires_releq_kernel_smp
+%{?with_dist_kernel:Requires:	kernel%{_alt_kernel}-smp(vermagic) = %{_kernel_ver}}
+Requires(postun):	%releq_kernel_smp
+%endif
+
+%description -n kernel%{_alt_kernel}-smp-net-bnx2
+This package contains the Broadcom NetXtreme II Gigabit ethernet
+driver for the Broadcom NetXtreme II BCM5706/BCM5708/5709/5716
+10/100/1000/2500/10000 Mbps PCIX/PCIE Ethernet Network Controller.
+
 %prep
 %setup -qc
 rpm2cpio sles11/noarch/update/SUSE-SLES/11/sources/brcm-netxtreme2-sles11-*.src.rpm | cpio -dimu
@@ -55,11 +75,11 @@
 
 %build
 %build_kernel_modules -m bnx2 -C bnx2/src \
-	EXTRA_CFLAGS="-DHAVE_IP_HDR -DHAVE_LE32 -DNEW_SKB -DHAVE_BOOL"
+	EXTRA_CFLAGS="-DHAVE_LE32 -DNEW_SKB"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%install_kernel_modules -m bnx2/src/bnx2 -d kernel/net
+%install_kernel_modules -m bnx2/src/bnx2 -d kernel/net -n %{pname} -s current
 
 %post	-n kernel%{_alt_kernel}-net-bnx2
 %depmod %{_kernel_ver}
@@ -67,13 +87,30 @@
 %postun	-n kernel%{_alt_kernel}-net-bnx2
 %depmod %{_kernel_ver}
 
+%post	-n kernel%{_alt_kernel}-smp-net-bnx2
+%depmod %{_kernel_ver}
+
+%postun	-n kernel%{_alt_kernel}-smp-net-bnx2
+%depmod %{_kernel_ver}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%if %{with up}
 %files -n kernel%{_alt_kernel}-net-bnx2
 %defattr(644,root,root,755)
 %doc bnx2/{README.TXT,RELEASE.TXT,ChangeLog}
+%config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/%{_kernel_ver}/bnx2.conf
 /lib/modules/%{_kernel_ver}/kernel/net/*.ko*
+%endif
+
+%if %{with smp}
+%files -n kernel%{_alt_kernel}-smp-net-bnx2
+%defattr(644,root,root,755)
+%doc bnx2/{README.TXT,RELEASE.TXT,ChangeLog}
+%config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/%{_kernel_ver}smp/bnx2.conf
+/lib/modules/%{_kernel_ver}smp/kernel/net/*.ko*
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -81,6 +118,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2.2.1  2011/02/08 09:14:48  glen
+- build for 2.6.16 kernel
+
 Revision 1.2  2011/01/25 07:32:44  glen
 - up to 2.0.8e
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bnx2/bnx2.spec?r1=1.2&r2=1.2.2.1&f=u