SPECS: kernel-video-drm.spec - update to new kernel build. closes ...

[glen]

Author: glen                         Date: Mon Mar 27 17:43:51 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- update to new kernel build. closes #5771

---- Files affected:
SPECS:
   kernel-video-drm.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: SPECS/kernel-video-drm.spec
diff -u SPECS/kernel-video-drm.spec:1.19 SPECS/kernel-video-drm.spec:1.20
--- SPECS/kernel-video-drm.spec:1.19	Sat Mar 25 15:23:21 2006
+++ SPECS/kernel-video-drm.spec	Mon Mar 27 19:43:46 2006
@@ -26,8 +26,8 @@
 # Source0-md5:	a82d473de399da966b2562e67faedcaf
 URL:		http://dri.freedesktop.org/wiki/DRM
 %if %{with kernel}
-%{?with_dist_kernel:BuildRequires:	kernel-module-build >= 2.6.7}
-BuildRequires:	rpmbuild(macros) >= 1.217
+%{?with_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.14}
+BuildRequires:	rpmbuild(macros) >= 1.286
 %endif
 Requires(post,postun):	/sbin/depmod
 %if %{with dist_kernel}
@@ -74,7 +74,7 @@
 %setup -q -n drm
 
 %build
-  %if %{with kernel}
+%if %{with kernel}
 
 cd linux-core
 install -d {ko-up,ko-smp}
@@ -84,19 +84,26 @@
 	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
 		exit 1
 	fi
-	rm -rf include/{linux,config,asm}
-        rm -f .config
-	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
-	touch include/config/MARKER
 
-	%{__make} M="$PWD" O="$PWD" drm_pciids.h
+	rm -f *.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
+%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} modules \
 		CC="%{__cc}" CPP="%{__cpp}" \
-		M="$PWD" O="$PWD" \
-		SUBDIRS="$PWD" DRMSRCDIR="$PWD" \
+		SYSSRC=%{_kernelsrcdir} \
+		SYSOUT=$PWD/o \
+		M=$PWD O=$PWD/o \
+		DRMSRCDIR="$PWD" LINUXDIR=%{_kernelsrcdir} \
 		%{?with_verbose:V=1}
 
 	mv *.ko ko-$cfg
@@ -149,6 +156,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2006/03/27 17:43:46  glen
+- update to new kernel build. closes #5771
+
 Revision 1.19  2006/03/25 14:23:21  kolodko
 - rm pciids.patch (forgoten by author)
 
================================================================

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