SPECS: kernel-net-rtl8180-sa2400.spec - removed smp, new kernel mo...

Sat Apr 14 22:48:29 CEST 2007

Author: zbyniu                       Date: Sat Apr 14 20:48:29 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- removed smp, new kernel module build macros
- patch against 2.6.20 (and maybe .19)

---- Files affected:
SPECS:
   kernel-net-rtl8180-sa2400.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SPECS/kernel-net-rtl8180-sa2400.spec
diff -u SPECS/kernel-net-rtl8180-sa2400.spec:1.16 SPECS/kernel-net-rtl8180-sa2400.spec:1.17

--- SPECS/kernel-net-rtl8180-sa2400.spec:1.16	Tue Feb 13 09:06:37 2007
+++ SPECS/kernel-net-rtl8180-sa2400.spec	Sat Apr 14 22:48:23 2007
@@ -3,7 +3,6 @@
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_without	kernel		# don't build kernel modules
-%bcond_without	smp		# don't build SMP module
 %bcond_with	verbose		# verbose build (V=1)
 #
 %define		_rtl8180_name	rtl8180
@@ -19,12 +18,13 @@
 Source0:	http://dl.sourceforge.net/rtl8180-sa2400/%{_rtl8180_name}-%{version}.tar.gz
 # Source0-md5:	11f24f693f9661a8bef0305ace663e4a
 Patch0:		%{_specname}-kernel-2.6.12.patch
-Patch01:	%{_specname}-module-params.patch
+Patch1:		%{_specname}-module-params.patch
+Patch2:		%{_specname}-2.6.20.patch
 URL:		http://rtl8180-sa2400.sourceforge.net
 %if %{with kernel}
-%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
-%{?with_dist_kernel:%requires_releq_kernel_up}
-BuildRequires:	rpmbuild(macros) >= 1.153
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
+%{?with_dist_kernel:%requires_releq_kernel}
+BuildRequires:	rpmbuild(macros) >= 1.379
 Requires(post,postun):	/sbin/depmod
 %{?with_dist_kernel:Requires(postun):	kernel%{_alt_kernel}}
 %endif
@@ -33,86 +33,36 @@
 %description
 This is a Linux driver for WLAN cards based on rtl8180.
 
-This package contains Linux UP module.
-
 %description -l pl.UTF-8
 Sterownik dla Linuksa do kart bezprzewodowych opartych na układzie
 rtl8180.
 
-Ten pakiet zawiera moduł jądra Linuksa UP.
-
-%package -n kernel%{_alt_kernel}-smp-net-rtl8180
-Summary:	Linux SMP driver for WLAN cards based on rtl8180
-Summary(pl.UTF-8):	Sterownik dla Linuksa SMP do kart bezprzewodowych opartych na układzie rtl8180
-Release:	%{_rel}@%{_kernel_ver_str}
-Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_smp}
-Requires(post,postun):	/sbin/depmod
-%{?with_dist_kernel:Requires(postun):	kernel%{_alt_kernel}-smp}
-
-%description -n kernel%{_alt_kernel}-smp-net-rtl8180
-This is a Linux driver for WLAN cards based on rtl8180.
-
-This package contains Linux SMP module.
-
-%description -n kernel%{_alt_kernel}-smp-net-rtl8180 -l pl.UTF-8
-Sterownik dla Linuksa do kart bezprzewodowych opartych na układzie
-rtl8180.
-
-Ten pakiet zawiera moduł jądra Linuksa SMP.
-
 %prep
 %setup -q -n %{_rtl8180_name}-%{version}
-
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
+
+cat > Makefile << EOF
+obj-m += r8180.o ieee80211-r8180.o ieee80211_crypt-r8180.o ieee80211_crypt_wep-r8180.o 
+
+r8180-objs := r8180_core.o r8180_sa2400.o r8180_93cx6.o r8180_wx.o r8180_max2820.o r8180_gct.o
+ieee80211-r8180-objs := ieee80211_rx.o ieee80211_tx.o ieee80211_wx.o ieee80211_module.o
+ieee80211_crypt-r8180-objs := ieee80211_crypt.o
+ieee80211_crypt_wep-r8180-objs := ieee80211_crypt_wep.o
+
+CFLAGS += -DCONFIG_MODULE_NAME_SOME_OPTION=1
+%{?debug:CFLAGS += -DCONFIG_MODULE_NAME_DEBUG=1}
+EOF
 
 %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
-	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
-%if %{with dist_kernel}
-	%{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-%else
-	install -d o/include/config
-	touch o/include/config/MARKER
-	ln -sf %{_kernelsrcdir}/scripts o/scripts
-%endif
-	%{__make} -C %{_kernelsrcdir} clean \
-		RCS_FIND_IGNORE="-name '*.ko' -o" \
-		M=$PWD O=$PWD/o KSRC=$PWD/o\
-		%{?with_verbose:V=1}
-	%{__make} -C %{_kernelsrcdir} modules \
-		M=$PWD O=$PWD/o KSRC=$PWD/o\
-		%{?with_verbose:V=1}
-	for i in ieee80211-r8180 ieee80211_crypt-r8180 ieee80211_crypt_wep-r8180 \
-		r8180; do
-		mv $i{,-$cfg}.ko
-	done
-done
+%build_kernel_modules -m ieee80211-r8180,ieee80211_crypt-r8180,ieee80211_crypt_wep-r8180,r8180
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
-for i in ieee80211-r8180 ieee80211_crypt-r8180 ieee80211_crypt_wep-r8180 \
-	r8180; do
-install $i-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/$i.ko
-done
-%if %{with smp} && %{with dist_kernel}
-for i in ieee80211-r8180 ieee80211_crypt-r8180 ieee80211_crypt_wep-r8180 \
-	r8180; do
-install $i-smp.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/$i.ko
-done
-%endif
+%install_kernel_modules -m ieee80211-r8180,ieee80211_crypt-r8180 -d kernel/drivers/net/wireless
+%install_kernel_modules -m ieee80211_crypt_wep-r8180,r8180 -d kernel/drivers/net/wireless
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -123,21 +73,9 @@
 %postun
 %depmod %{_kernel_ver}
 
-%post -n kernel%{_alt_kernel}-smp-net-rtl8180
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-net-rtl8180
-%depmod %{_kernel_ver}smp
-
 %files
 %defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/misc/*.ko*
-
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-net-rtl8180
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/misc/*.ko*
-%endif
+/lib/modules/%{_kernel_ver}/kernel/drivers/net/wireless/*.ko*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -145,6 +83,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2007/04/14 20:48:23  zbyniu
+- removed smp, new kernel module build macros
+- patch against 2.6.20 (and maybe .19)
+
 Revision 1.16  2007/02/13 08:06:37  glen
 - tabs in preamble
 
@@ -200,4 +142,3 @@
 Revision 1.1  2005/03/30 15:15:17  aniolek
 - initial in PLD
 - rel. 0.1
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-net-rtl8180-sa2400.spec?r1=1.16&r2=1.17&f=u

