SPECS: kernel-net-zd1211.spec - builds

[arekm]

Author: arekm                        Date: Sun Oct  9 09:44:05 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- builds

---- Files affected:
SPECS:
   kernel-net-zd1211.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/kernel-net-zd1211.spec
diff -u SPECS/kernel-net-zd1211.spec:1.10 SPECS/kernel-net-zd1211.spec:1.11
--- SPECS/kernel-net-zd1211.spec:1.10	Sun Oct  9 10:38:33 2005
+++ SPECS/kernel-net-zd1211.spec	Sun Oct  9 11:44:00 2005
@@ -18,6 +18,7 @@
 License:	GPL v2
 Source0:	%{_zd1211_name}.tar.gz
 # Source0-md5:	7f5ae904b60df48cd2a15777d3c94049
+Patch0:		%{name}-build.patch
 URL:		http://zd1211.ath.cx/
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel-module-build >= 2.6.7}
@@ -61,6 +62,7 @@
 
 %prep
 %setup -q -n %{_zd1211_name}
+%patch0 -p1
 
 %build
 # kernel module(s)
@@ -68,24 +70,27 @@
 	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
 		exit 1
 	fi
-	rm -rf include
-	install -d include/{linux,config}
-	ln -sf %{_kernelsrcdir}/config-$cfg .config
-	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-	ln -sf %{_kernelsrcdir}/include/linux/version.h include/linux/version.h
-	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-	touch include/config/MARKER
-	%{__make} -C %{_kernelsrcdir} clean \
-		RCS_FIND_IGNORE="-name '*.ko' -o" \
-		M=$PWD O=$PWD \
-		%{?with_verbose:V=1}
-	%{__make} -C %{_kernelsrcdir} modules \
-		M=$PWD O=$PWD \
-		CC="%{__cc}" CPP="%{__cpp}" \
-		%{?with_verbose:V=1}
-	for i in zd1211_mod; do
-		mv $i{,-$cfg}.ko
+	for t in zd1211 zd1211b; do
+		rm -rf include
+		install -d include/{linux,config}
+		ln -sf %{_kernelsrcdir}/config-$cfg .config
+		ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
+		ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+		ln -sf %{_kernelsrcdir}/include/linux/version.h include/linux/version.h
+		ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
+		touch include/config/MARKER
+		%{__make} -C %{_kernelsrcdir} clean \
+			RCS_FIND_IGNORE="-name '*.ko' -o" \
+			M=$PWD O=$PWD \
+			%{?with_verbose:V=1}
+		%{__make} -C %{_kernelsrcdir} modules \
+			`[ "$t" = "zd1211" ] && echo ZD1211REV_B=0 || echo ZD1211REV_B=1` \
+			M=$PWD O=$PWD \
+			CC="%{__cc}" CPP="%{__cpp}" \
+			%{?with_verbose:V=1}
+		for i in $t; do
+			mv $i{,-$cfg}.ko
+		done
 	done
 done
 
@@ -93,12 +98,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/drivers/usb/net
-for i in zd1211_mod; do
+for i in zd1211 zd1211b; do
 	install $i-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
 		$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/usb/net/$i.ko
 done
 %if %{with smp} && %{with dist_kernel}
-for i in zd1211_mod; do
+for i in zd1211 zd1211b; do
 	install $i-smp.ko \
 		$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/usb/net/$i.ko
 done
@@ -135,6 +140,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2005/10/09 09:44:00  arekm
+- builds
+
 Revision 1.10  2005/10/09 08:38:33  arekm
 - started work on new ver
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-net-zd1211.spec?r1=1.10&r2=1.11&f=u