SPECS: atmelwlandriver.spec - make it build with new kernel

[tommat]

Author: tommat                       Date: Mon Apr 17 13:05:37 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- make it build with new kernel

---- Files affected:
SPECS:
   atmelwlandriver.spec (1.42 -> 1.43) 

---- Diffs:

================================================================
Index: SPECS/atmelwlandriver.spec
diff -u SPECS/atmelwlandriver.spec:1.42 SPECS/atmelwlandriver.spec:1.43
--- SPECS/atmelwlandriver.spec:1.42	Sat Apr 15 01:18:47 2006
+++ SPECS/atmelwlandriver.spec	Mon Apr 17 15:05:31 2006
@@ -173,24 +173,30 @@
 		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
+	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
+	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
+
+%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
 
 	%{__make} -C %{_kernelsrcdir} clean \
 		RCS_FIND_IGNORE="-name '*.ko' -o" \
-		M=$PWD O=$PWD \
+		M=$PWD O=$PWD/o \
 		%{?with_verbose:V=1}
 	%{__make} pcmcia buildonly=release \
 		KERNEL_VERSION=%{__kernel_ver} \
-		M=$PWD O=$PWD \
+		M=$PWD O=$PWD/o \
 		%{?with_verbose:V=1}
 	%{__make} usb buildonly=release \
 		KERNEL_VERSION=%{__kernel_ver} \
-		M=$PWD O=$PWD \
+		M=$PWD O=$PWD/o \
 		%{?with_verbose:V=1}
 
 	mv -f objs/*/release/*.ko built/$cfg
@@ -204,7 +210,7 @@
 
 %{__make} lvnet \
 	OPT="%{rpmcflags} %{rpmldflags}" \
-	INCDIR=%{_includedir}
+	INCDIR=%{_includedir} \
 
 %{__make} -C src/apps/fw-upgrade atmelup \
 	CCC="%{__cc}" \
@@ -309,6 +315,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43  2006/04/17 13:05:31  tommat
+- make it build with new kernel
+
 Revision 1.42  2006/04/14 23:18:47  prism
 - typos
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/atmelwlandriver.spec?r1=1.42&r2=1.43&f=u