SPECS: X11-driver-nvidia.spec - modules building (new way)

charles charles at pld-linux.org
Sat Feb 11 13:03:11 CET 2006


Author: charles                      Date: Sat Feb 11 12:03:11 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- modules building (new way)

---- Files affected:
SPECS:
   X11-driver-nvidia.spec (1.62 -> 1.63) 

---- Diffs:

================================================================
Index: SPECS/X11-driver-nvidia.spec
diff -u SPECS/X11-driver-nvidia.spec:1.62 SPECS/X11-driver-nvidia.spec:1.63
--- SPECS/X11-driver-nvidia.spec:1.62	Tue Jan 31 14:39:00 2006
+++ SPECS/X11-driver-nvidia.spec	Sat Feb 11 13:03:05 2006
@@ -202,27 +202,27 @@
 	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
-%if %{without dist_kernel}
-	ln -sf %{_kernelsrcdir}/scripts
+	install -d o/include/{linux,config}
+	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
+	ln -sf %{_kernelsrcdir}/scripts o/scripts
+	touch o/include/config/MARKER
 %endif
-	touch include/config/MARKER
 	%{__make} -C %{_kernelsrcdir} clean \
 		RCS_FIND_IGNORE="-name '*.ko' -o -name nv-kernel.o -o" \
 		SYSSRC=%{_kernelsrcdir} \
-		SYSOUT=$PWD \
-		M=$PWD O=$PWD \
+		SYSOUT=$PWD/o \
+		M=$PWD O=$PWD/o \
 		%{?with_verbose:V=1}
 	%{__make} -C %{_kernelsrcdir} modules \
 		CC="%{__cc}" CPP="%{__cpp}" \
 		SYSSRC=%{_kernelsrcdir} \
-		SYSOUT=$PWD \
-		M=$PWD O=$PWD \
+		SYSOUT=$PWD/o \
+		M=$PWD O=$PWD/o \
 		%{?with_verbose:V=1}
 	mv nvidia.ko nvidia-$cfg.ko
 done
@@ -367,6 +367,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.63  2006/02/11 12:03:05  charles
+- modules building (new way)
+
 Revision 1.62  2006/01/31 13:39:00  charles
 - ln %{_kernelsrcdir}/scripts for without dist_kernel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/X11-driver-nvidia.spec?r1=1.62&r2=1.63&f=u



More information about the pld-cvs-commit mailing list