SPECS: madwifi-ng.spec - 20060404 snap (r1491) - -bashizm.patch (d...

[adamg]

Author: adamg                        Date: Wed Apr  5 14:13:37 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 20060404 snap (r1491)
- -bashizm.patch (do not use source to include other files)
- module build synced with madwifi.spec
- pass KERNELPATH where needed

---- Files affected:
SPECS:
   madwifi-ng.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/madwifi-ng.spec
diff -u SPECS/madwifi-ng.spec:1.6 SPECS/madwifi-ng.spec:1.7
--- SPECS/madwifi-ng.spec:1.6	Tue Jan 10 20:09:01 2006
+++ SPECS/madwifi-ng.spec	Wed Apr  5 16:13:32 2006
@@ -13,13 +13,13 @@
 Summary(pl):	Sterownik karty radiowej Atheros
 Name:		madwifi-ng
 Version:	0
-%define		snap_year	2005
-%define		snap_month	12
-%define		snap_day	30
+%define		snap_year	2006
+%define		snap_month	04
+%define		snap_day	04
 %define		snap	%{snap_year}%{snap_month}%{snap_day}
 %define		snapdate	%{snap_year}-%{snap_month}-%{snap_day}
-%define		_rel	0.%{snap}.3
-%define		trunk	r1370
+%define		_rel	0.%{snap}.1
+%define		trunk	r1491
 Release:	%{_rel}
 Epoch:		0
 License:	GPL/BSD (partial source)
@@ -27,7 +27,8 @@
 Obsoletes:	madwifi
 Provides:	madwifi
 Source0:	http://snapshots.madwifi.org/madwifi-ng/%{name}-%{trunk}-%{snap}.tar.gz
-# Source0-md5:	3fe749bf48a7f1edffffd7be8e394b47
+# Source0-md5:	370791bb0e7d1c725df1e5874d79ecc3
+Patch0:		%{name}-bashizm.patch
 URL:		http://www.madwifi.org/
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel-module-build >= 2.6.7}
@@ -103,6 +104,7 @@
 
 %prep
 %setup -q -n madwifi-ng-%{trunk}-%{snap}
+%patch0 -p1
 
 %build
 %if %{with userspace}
@@ -118,27 +120,37 @@
 	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
-	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-	touch include/config/MARKER
+	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
+%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
+%else
+        ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} o/include/asm
+%endif
+
 #
 #	patching/creating makefile(s) (optional)
 #
+	%{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+	ln -sf ../Makefile.inc o/Makefile.inc
 	%{__make} -C %{_kernelsrcdir} clean \
+		TARGET="%{_target_base_arch}-elf" \
 		KERNELCONF="%{_kernelsrcdir}/config-$cfg" \
 		RCS_FIND_IGNORE="-name '*.ko' -o" \
-		M=$PWD O=$PWD \
+		M=$PWD O=$PWD/o \
+		KERNELPATH="%{_kernelsrcdir}" \
 		%{?with_verbose:V=1}
 	%{__make} \
 		TARGET="%{_target_base_arch}-elf" \
-		KERNELPATH=%{_kernelsrcdir} \
+		KERNELPATH="%{_kernelsrcdir}" \
 		KERNELCONF="%{_kernelsrcdir}/config-$cfg" \
 		TOOLPREFIX= \
-		O=$PWD \
+		O=$PWD/o \
 		CC="%{__cc}" CPP="%{__cpp}" \
 		%{?with_verbose:V=1}
 
@@ -162,6 +174,7 @@
 
 %{__make} install-tools \
 	KERNELCONF="%{_kernelsrcdir}/config-up" \
+	KERNELPATH="%{_kernelsrcdir}" \
 	DESTDIR=$RPM_BUILD_ROOT \
 	BINDIR=%{_bindir} \
 	MANDIR=%{_mandir}
@@ -248,6 +261,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2006/04/05 14:13:32  adamg
+- 20060404 snap (r1491)
+- -bashizm.patch (do not use source to include other files)
+- module build synced with madwifi.spec
+- pass KERNELPATH where needed
+
 Revision 1.6  2006/01/10 19:09:01  qboosh
 - unified
 
================================================================

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