SPECS: kernel-net-hostap.spec - up to 0.4.7 - new build system, NFY

[dzeus]

Author: dzeus                        Date: Sat Apr 22 15:22:46 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 0.4.7
- new build system, NFY

---- Files affected:
SPECS:
   kernel-net-hostap.spec (1.26 -> 1.27) 

---- Diffs:

================================================================
Index: SPECS/kernel-net-hostap.spec
diff -u SPECS/kernel-net-hostap.spec:1.26 SPECS/kernel-net-hostap.spec:1.27
--- SPECS/kernel-net-hostap.spec:1.26	Wed Apr 12 14:15:40 2006
+++ SPECS/kernel-net-hostap.spec	Sat Apr 22 17:22:40 2006
@@ -5,22 +5,22 @@
 %bcond_without	smp		# don't build SMP module
 %bcond_with	verbose		# verbose build (V=1)
 #
-%define		rel	1
+%define		rel	0.1
 Summary:	HostAP kernel drivers
 Summary(es):	Driveres del núcleo de HostAP
 Summary(pl):	Sterowniki HostAP dla jądra Linuksa
 Name:		kernel-net-hostap
-Version:	0.4.0
+Version:	0.4.7
 Release:	%{rel}@%{_kernel_ver_str}
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	http://hostap.epitest.fi/releases/hostap-driver-%{version}.tar.gz
-# Source0-md5:	aceb13fcdbe7c59b36318c2444346a27
+# Source0-md5:	ee495686cf27011b4e401963c2c7f62a
 Patch0:		%{name}-flash.patch
 URL:		http://hostap.epitest.fi/
 BuildRequires:	%{kgcc_package}
 %if %{with dist_kernel}
-BuildRequires:	kernel-module-build >= 3:2.6.7
+BuildRequires:	kernel-module-build >= 3:2.6.14
 %requires_releq_kernel_up
 %endif
 BuildRequires:	rpmbuild(macros) >= 1.153
@@ -106,29 +106,41 @@
 %patch0 -p0
 
 %build
+# kernel module(s)
 cd driver/modules
-rm -rf built
-mkdir -p built/{nondist,smp,up}
 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
-	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
-	%{__make} -C %{_kernelsrcdir} clean \
-		RCS_FIND_IGNORE="-name '*.ko' -o" \
-		M=$PWD O=$PWD \
-		%{?with_verbose:V=1}
-	%{__make} -C %{_kernelsrcdir} modules \
-		CC="%{__cc}" CPP="%{__cpp}" \
-		M=$PWD O=$PWD \
-		%{?with_verbose:V=1}
-	mv *.ko built/$cfg
+        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} -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
+#
+#       patching/creating makefile(s) (optional)
+#
+        %{__make} -C %{_kernelsrcdir} clean \
+                RCS_FIND_IGNORE="-name '*.ko' -o" \
+                SYSSRC=%{_kernelsrcdir} \
+                SYSOUT=$PWD/o \
+                M=$PWD O=$PWD/o \
+                %{?with_verbose:V=1}
+        %{__make} -C %{_kernelsrcdir} modules \
+                CC="%{__cc}" CPP="%{__cpp}" \
+                SYSSRC=%{_kernelsrcdir} \
+                SYSOUT=$PWD/o \
+                M=$PWD O=$PWD/o \
+                %{?with_verbose:V=1}
+
+#        mv hostap.ko modules/$cfg/
+	mv hostap{,-$cfg}.ko
 done
 
 %install
@@ -217,6 +229,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2006/04/22 15:22:40  dzeus
+- up to 0.4.7
+- new build system, NFY
+
 Revision 1.26  2006/04/12 12:15:40  glen
 - add kernel epoch, adapterized
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-net-hostap.spec?r1=1.26&r2=1.27&f=u