- unconditional patches list

[packages/X11-driver-nvidia-legacy.git] / X11-driver-nvidia-legacy.spec

diff --git a/X11-driver-nvidia-legacy.spec b/X11-driver-nvidia-legacy.spec
index d67cdfaa3d9bc63b58f5fafdc2d8d8cadac9ff20..d06d8bb692eb90fd07db30ef2b2e38ba72d5790a 100644 (file)
--- a/X11-driver-nvidia-legacy.spec
+++ b/X11-driver-nvidia-legacy.spec
@@ -5,11 +5,11 @@
 %bcond_without kernel          # without kernel packages
 %bcond_with    verbose         # verbose build (V=1)
 #
-### NOT CHANGE THIS #################
+### DON'T CHANGE THIS ###############
 %define                _nv_ver         1.0
 %define                _nv_rel         7174
 %define                _min_x11        6.7.0
-%define                _rel            4
+%define                _rel            6
 #####################################
 #
 %define                oldname         X11-driver-nvidia
@@ -30,6 +30,7 @@ Source1:      http://download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}-%{_nv_rel}/N
 Patch0:                %{name}-gcc34.patch
 Patch1:                %{name}-GL.patch
 Patch2:                %{name}-conftest.patch
+Patch3:                %{name}-verbose.patch
 # http://www.minion.de/files/1.0-6629/
 URL:           http://www.nvidia.com/object/linux.html
 BuildRequires: grep
@@ -183,6 +184,9 @@ rm -rf NVIDIA-Linux-x86*-%{_nv_ver}-%{_nv_rel}-pkg*
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%if %{with verbose}
+%patch3 -p1
+%endif
 sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
 
 %build
@@ -193,24 +197,22 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
        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
+        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
+        %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
        %{__make} -C %{_kernelsrcdir} clean \
                RCS_FIND_IGNORE="-name '*.ko' -o -name nv-kernel.o -o" \
                SYSSRC=%{_kernelsrcdir} \
                SYSOUT=$PWD \
-               M=$PWD O=$PWD \
+               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 \
+               M=$PWD O=$PWD/o \
                %{?with_verbose:V=1}
        mv nvidia.ko nvidia-$cfg.ko
 done