SPECS: madwifi.spec - up to ng version - up to 20060304 snap - rel 1.

tiwek tiwek at pld-linux.org
Sat Mar 4 21:48:09 CET 2006


Author: tiwek                        Date: Sat Mar  4 20:48:09 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to ng version
- up to 20060304 snap
- rel 1.

---- Files affected:
SPECS:
   madwifi.spec (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: SPECS/madwifi.spec
diff -u SPECS/madwifi.spec:1.27 SPECS/madwifi.spec:1.28
--- SPECS/madwifi.spec:1.27	Thu Jan 12 21:31:40 2006
+++ SPECS/madwifi.spec	Sat Mar  4 21:48:03 2006
@@ -9,23 +9,24 @@
 %bcond_without	userspace	# don't build userspace module
 %bcond_with	verbose		# verbose build (V=1)
 
+%define		snap_year	2006
+%define		snap_month	03
+%define		snap_day	04
+%define		snap	%{snap_year}%{snap_month}%{snap_day}
+%define		snapdate	%{snap_year}-%{snap_month}-%{snap_day}
+%define		_release		1
+
 #
 Summary:	Atheros WiFi card driver
 Summary(pl):	Sterownik karty radiowej Atheros
-Name:		madwifi
-Version:	0
-%define		snap_year	2005
-%define		snap_month	11
-%define		snap_day	25
-%define		snap	%{snap_year}%{snap_month}%{snap_day}
-%define		snapdate	%{snap_year}-%{snap_month}-%{snap_day}
-%define		_rel	0.%{snap}.2
-Release:	%{_rel}
+Name:		madwifi-ng
+Version:	r1460
+Release:	%{_release}
 Epoch:		0
 License:	GPL/BSD (partial source)
 Group:		Base/Kernel
-Source0:	http://madwifi.otaku42.de/%{snap_year}/%{snap_month}/%{name}-cvs-snapshot-%{snapdate}.tar.bz2
-# Source0-md5:	edb2791b3c1df2cd5db57d6a52670d62
+Source0:	http://snapshots.madwifi.org/%{name}/%{name}-%{version}-%{snap}.tar.gz
+# Source0-md5:	51d5b9c718a78385f7f525a1ed0120e0
 URL:		http://madwifi.sf.net/
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel-module-build >= 2.6.7}
@@ -57,7 +58,7 @@
 %package -n kernel-net-madwifi
 Summary:	Linux driver for Atheros cards
 Summary(pl):	Sterownik dla Linuksa do kart Atheros
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{_release}@%{_kernel_ver_str}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 %if %{with dist_kernel}
@@ -78,7 +79,7 @@
 %package -n kernel-smp-net-madwifi
 Summary:	Linux SMP driver for %{name} cards
 Summary(pl):	Sterownik dla Linuksa SMP do kart %{name}
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{_release}@%{_kernel_ver_str}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 %if %{with dist_kernel}
@@ -97,7 +98,7 @@
 Ten pakiet zawiera moduł jądra Linuksa SMP.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}-%{version}-%{snap}
 
 %build
 %if %{with userspace}
@@ -110,48 +111,51 @@
 
 %if %{with kernel}
 # kernel module(s)
+
 for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
 	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
 		exit 1
 	fi
-	rm -rf include/{linux,config,asm}
-	install -d include/{linux,config}
-	ln -sf %{_kernelsrcdir}/config-$cfg .config
-	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-%ifarch ppc ppc64
-        install -d include/asm
-        [ ! -d %{_kernelsrcdir}/include/asm-powerpc ] || ln -sf %{_kernelsrcdir}/include/asm-powerpc/* include/asm
-        [ ! -d %{_kernelsrcdir}/include/asm-%{_target_base_arch} ] || ln -snf %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* include/asm
+	rm -rf o/
+	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
+	ln -sfn %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+%if %{with dist_kernel}
+	%{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
 %else
-        ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+	install -d o/include/config
+	touch o/include/config/MARKER
+	ln -sf %{_kernelsrcdir}/scripts o/scripts
 %endif
-	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-	touch include/config/MARKER
+
+
 #
 #	patching/creating makefile(s) (optional)
 #
-	%{__make} -C %{_kernelsrcdir} clean \
-		KERNELCONF="%{_kernelsrcdir}/config-$cfg" \
-		RCS_FIND_IGNORE="-name '*.ko' -o" \
-		M=$PWD O=$PWD \
-		KERNELPATH="%{_kernelsrcdir}" \
-		%{?with_verbose:V=1}
-	%{__make} \
-		TARGET="%{_target_base_arch}-elf" \
-		KERNELPATH=%{_kernelsrcdir} \
-		KERNELCONF="%{_kernelsrcdir}/config-$cfg" \
-		TOOLPREFIX= \
-		O=$PWD \
-		CC="%{__cc}" CPP="%{__cpp}" \
-		%{?with_verbose:V=1}
-
-	mv ath/ath_pci{,-$cfg}.ko
-	mv ath_hal/ath_hal{,-$cfg}.ko
-	mv ath_rate/sample/ath_rate_sample{,-$cfg}.ko
-	for i in wlan_wep wlan_xauth wlan_acl wlan_ccmp wlan_tkip wlan; do
-		mv net80211/$i{,-$cfg}.ko
+
+       %{__make} -C %{_kernelsrcdir} clean \
+                KERNELCONF="%{_kernelsrcdir}/config-$cfg" \
+                RCS_FIND_IGNORE="-name '*.ko' -o" \
+                M=$PWD O=$PWD \
+                %{?with_verbose:V=1}
+
+        %{__make} \
+                TARGET="%{_target_base_arch}-elf" \
+                KERNELPATH=%{_kernelsrcdir} \
+                KERNELCONF="%{_kernelsrcdir}/config-$cfg" \
+                TOOLPREFIX= \
+                O=$PWD/o \
+                CC="%{__cc}" CPP="%{__cpp}" \
+                %{?with_verbose:V=1}
+
+
+
+	for i in `find . -name "*.ko" ! -name "*-smp.ko" `; do
+		mv $i `basename $i .ko`-$cfg.ko
 	done
+	
 done
 %endif
 
@@ -172,7 +176,8 @@
 	KERNELCONF="%{_kernelsrcdir}/config-up" \
 	KERNELPATH="%{_kernelsrcdir}" \
 	DESTDIR=$RPM_BUILD_ROOT \
-	BINDIR=%{_bindir}
+	BINDIR=%{_bindir} \
+	MANDIR=%{_mandir}	
 
 install -d $RPM_BUILD_ROOT%{_includedir}/madwifi/net80211
 install -d $RPM_BUILD_ROOT%{_includedir}/madwifi/include/sys
@@ -182,33 +187,20 @@
 %endif
 
 %if %{with kernel}
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/net
-install ath/ath_pci-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/ath_pci.ko
-install ath_hal/ath_hal-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/ath_hal.ko
-install ath_rate/sample/ath_rate_sample-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/ath_rate_sample.ko
-for i in wlan_wep wlan_xauth wlan_acl wlan_ccmp wlan_tkip wlan; do
-	install net80211/$i-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-		$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/$i.ko
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net
+for i in `find . -name "*-up.ko"`; do
+	install $i $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/`basename $i -up.ko`.ko
 done
 %if %{with smp} && %{with dist_kernel}
-install ath/ath_pci-smp.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/net/ath_pci.ko
-install ath_hal/ath_hal-smp.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/net/ath_hal.ko
-install ath_rate/sample/ath_rate_sample-smp.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/net/ath_rate_sample.ko
-for i in wlan_wep wlan_xauth wlan_acl wlan_ccmp wlan_tkip wlan; do
-	install net80211/$i-smp.ko \
-		$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/net/$i.ko
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/net
+for i in `find . -name "*-smp.ko"`; do
+	install $i $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/net/`basename $i -smp.ko`.ko
 done
 %endif
 %endif
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+# rm -rf $RPM_BUILD_ROOT
 
 %post	-n kernel-net-madwifi
 %depmod %{_kernel_ver}
@@ -228,6 +220,8 @@
 %doc COPYRIGHT README
 %attr(755,root,root) %{_bindir}/80211*
 %attr(755,root,root) %{_bindir}/ath*
+%attr(755,root,root) %{_bindir}/wlan*
+%{_mandir}/man8/*
 
 %files devel
 %defattr(644,root,root,755)
@@ -252,6 +246,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2006/03/04 20:48:03  tiwek
+- up to ng version
+- up to 20060304 snap
+- rel 1.
+
 Revision 1.27  2006/01/12 20:31:40  arekm
 - rel .2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/madwifi.spec?r1=1.27&r2=1.28&f=u



More information about the pld-cvs-commit mailing list