SPECS: rt2x00.spec - %{_alt_kernel} support - use %build_kernel_mo...

sparky sparky at pld-linux.org
Mon Nov 13 19:01:51 CET 2006 

Author: sparky                       Date: Mon Nov 13 18:01:51 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- %{_alt_kernel} support
- use %build_kernel_modules, %install_kernel_modules macros
- added Makefile patch

---- Files affected:
SPECS:
   rt2x00.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: SPECS/rt2x00.spec
diff -u SPECS/rt2x00.spec:1.19 SPECS/rt2x00.spec:1.20
--- SPECS/rt2x00.spec:1.19	Wed Sep  6 15:48:33 2006
+++ SPECS/rt2x00.spec	Mon Nov 13 19:01:45 2006
@@ -21,9 +21,10 @@
 Source0:	http://rt2x00.serialmonkey.com/%{name}-cvs-daily.tar.gz
 # Source0-md5:	8f9aff9f03633d35e9bd21ead8a29706
 Patch0:		%{name}-config.patch
+Patch1:		%{name}-Makefile.patch
 URL:		http://rt2x00.serialmonkey.com/
-%{?with_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.17}
-BuildRequires:	rpmbuild(macros) >= 1.217
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.17}
+BuildRequires:	rpmbuild(macros) >= 1.326
 Requires(post,postun):	/sbin/depmod
 %if %{with dist_kernel}
 %requires_releq_kernel_up
@@ -31,13 +32,15 @@
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define	modules	80211,crc-itu-t,rate_control,rfkill,rt2400pci,rt2500pci,rt2500usb,rt61pci,rt73usb
+
 %description
 A configuartion tool for WLAN cards based on RT2x00 chipsets.
 
 %description -l pl
 Narzędzie konfiguracujne do kart WLAN opartych na układach RT2x00.
 
-%package -n kernel-net-rt2x00
+%package -n kernel%{_alt_kernel}-net-rt2x00
 Summary:	Linux kernel driver for WLAN cards based on RT2x00 chipsets
 Summary(pl):	Sterownik jądra Linuksa dla kart WLAN opartych na układach RT2x00
 Release:	%{_rel}@%{_kernel_ver_str}
@@ -48,13 +51,13 @@
 Requires(postun):	%releq_kernel_up
 %endif
 
-%description -n kernel-net-rt2x00
+%description -n kernel%{_alt_kernel}-net-rt2x00
 This is a Linux driver for WLAN cards based on RT2x00 chipsets.
 
-%description -n kernel-net-rt2x00 -l pl
+%description -n kernel%{_alt_kernel}-net-rt2x00 -l pl
 Sterownik jądra Linuksa dla kart WLAN opartych na układach RT2x00.
 
-%package -n kernel-smp-net-rt2x00
+%package -n kernel%{_alt_kernel}-smp-net-rt2x00
 Summary:	Linux SMP kernel driver for WLAN cards based on RT2x00 chipsets
 Summary(pl):	Sterownik jądra Linuksa SMP dla kart WLAN opartych na układach RT2x00
 Release:	%{_rel}@%{_kernel_ver_str}
@@ -65,12 +68,12 @@
 Requires(postun):	%releq_kernel_smp
 %endif
 
-%description -n kernel-smp-net-rt2x00
+%description -n kernel%{_alt_kernel}-smp-net-rt2x00
 This is a Linux driver for WLAN cards based on RT2x00 chipsets.
 
 This package contains Linux SMP module.
 
-%description -n kernel-smp-net-rt2x00 -l pl
+%description -n kernel%{_alt_kernel}-smp-net-rt2x00 -l pl
 Sterownik jądra Linuksa dla kart WLAN opartych na układach RT2x00.
 
 Ten pakiet zawiera moduł jądra Linuksa SMP.
@@ -78,80 +81,38 @@
 %prep
 %setup -q -n %{name}-cvs-%{_snap}
 %patch0 -p1
+%patch1 -p1
 
 %build
-# 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 o/include
-	install -d o/include/{linux,config}
-	ln -sf %{_kernelsrcdir}/config-$cfg o/.config
-	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
-%ifarch ppc ppc64
-	install -d o/include/asm
-	[ ! -d %{_kernelsrcdir}/include/asm-powerpc ] || ln -sf %{_kernelsrcdir}/include/asm-powerpc/* o/include/asm
-	[ ! -d %{_kernelsrcdir}/include/asm-%{_target_base_arch}/ ] || ln -snf %{_kernelsrcdir}/include/asm-%{_target_base_arch} o/include/asm
-%else
-	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} o/include/asm
-%endif
-	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
-	touch o/include/config/MARKER
-	%{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-	%{__make} clean \
-		KERNDIR=$PWD/o 
-	./rt2x00_config.sh rt2x00_config.h
-	%{__make} -C %{_kernelsrcdir} modules \
-		KERNDIR=$PWD/o \
-		SUBDIRS=$PWD \
-%if "%{_target_base_arch}" != "%{_arch}"
-		ARCH=%{_target_base_arch} \
-		CROSS_COMPILE=%{_target_base_cpu}-pld-linux- \
-%endif
-		HOSTCC="%{__cc}" \
-		M=$PWD O=$PWD/o \
-		%{?with_verbose:V=1}
-	mkdir o-$cfg
-	mv *.ko o-$cfg/
-done
-cd -
+./rt2x00_config.sh rt2x00_config.h
+%build_kernel_modules -m %{modules}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/drivers/net/wireless
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
-if [ $cfg = up -o $cfg = nondist ]; then
-	ocfg=''
-else
-	ocfg=$cfg
-fi
-install o-$cfg/*.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}$ocfg/kernel/drivers/net/wireless
-done
+%install_kernel_modules -m %{modules} -d kernel/drivers/net/wireless
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -n kernel-net-rt2x00
+%post -n kernel%{_alt_kernel}-net-rt2x00
 %depmod %{_kernel_ver}
 
-%postun -n kernel-net-rt2x00
+%postun -n kernel%{_alt_kernel}-net-rt2x00
 %depmod %{_kernel_ver}
 
-%post -n kernel-smp-net-rt2x00
+%post -n kernel%{_alt_kernel}-smp-net-rt2x00
 %depmod %{_kernel_ver}smp
 
-%postun -n kernel-smp-net-rt2x00
+%postun -n kernel%{_alt_kernel}-smp-net-rt2x00
 %depmod %{_kernel_ver}smp
 
-%files -n kernel-net-rt2x00
+%files -n kernel%{_alt_kernel}-net-rt2x00
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/wireless/*.ko*
 
 %if %{with smp} && %{with dist_kernel}
-%files -n kernel-smp-net-rt2x00
+%files -n kernel%{_alt_kernel}-smp-net-rt2x00
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}smp/kernel/drivers/net/wireless/*.ko*
 %endif
@@ -162,6 +123,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2006/11/13 18:01:45  sparky
+- %{_alt_kernel} support
+- use %build_kernel_modules, %install_kernel_modules macros
+- added Makefile patch
+
 Revision 1.19  2006/09/06 13:48:33  sparky
 - mass atack: -j1 for make scripts
 
@@ -198,7 +164,7 @@
 Revision 1.8  2006/05/15 12:39:57  wiget
 - updated to 2006051313 cvs snapshot
 - build.patch not needed now
-NOTE: this uses (and provides) Devicescape IEEE80211 stack.
+  NOTE: this uses (and provides) Devicescape IEEE80211 stack.
       You can't set some parameters (like keys) using standard
       wireless-tools package.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/rt2x00.spec?r1=1.19&r2=1.20&f=u

More information about the pld-cvs-commit mailing list