[pkg-nvidia-devel] Bug#483378: nvidia-kernel-source: wrong patch direction?

[Tim Connors]

Package: nvidia-kernel-source
Version: 169.12-4
Severity: normal

In the latest 2 versions, the xen and other patches seem to be applied
in the wrong direction.  This is from a fresh rm -rf modules/ ; tar
xvf ... ; make-kpkg clean ....  with both the clean and configure
steps wanting to apply the patch in the wrong direction.  If I confirm
both the clean and configure patches to assume -R, then it builds
successfully (otherwise it bails because the patch step has failed).
Then because the patch has then been reversed by the time configure
finishes, the actual build of the binary modules will want to apply
the patch in the direction given, without assuming -R.  Haven't
verified whether it runs yet.


...
make[1]: Entering directory `/usr/src/modules/nvidia-kernel'
/usr/bin/make -w -f debian/rules configure
make[2]: Entering directory `/usr/src/modules/nvidia-kernel' 
# select which makefile to use. 
rm -f /usr/src/modules/nvidia-kernel/Makefile || true 
if [ 6 = 6  ]; then \ 
             ln -s Makefile.kbuild Makefile ; \ 
        fi 
if [  6 = 4  ]; then \ 
             ln -s Makefile.nvidia Makefile ; \ 
        fi 
if ! gcc-4.2 -v 2> /dev/null  ; then \ 
           echo "Compiler gcc-4.2 does not exist on the system" ; \ 
           exit 1; \ 
        fi    
if [ -f /usr/src/modules/nvidia-kernel/debian/control.template ]; then \ 
                cp  /usr/src/modules/nvidia-kernel/debian/control.template /usr/src/modules/nvidia-kernel/debian/control; \ 
        fi 
if [ "x86_64" = "x86_64" ]; then \ 
                cp /usr/src/modules/nvidia-kernel/nv-kernel.o.x86_64 /usr/src/modules/nvidia-kernel/nv-kernel.o ; \ 
        fi 
#patch for XEN 
patch -p3 < /usr/src/modules/nvidia-kernel/debian/patches/xen.patch 
patching file conftest.sh 
Reversed (or previously applied) patch detected!  Assume -R? [n] y 
patching file nv-linux.h 
Reversed (or previously applied) patch detected!  Assume -R? [n] y 
patching file nv.c
Reversed (or previously applied) patch detected!  Assume -R? [n] y
patching file os-interface.c
Reversed (or previously applied) patch detected!  Assume -R? [n] y
touch configure-stamp
make[2]: Leaving directory `/usr/src/modules/nvidia-kernel'
...

then the binary_modules:
...
/usr/bin/make -w -f debian/rules binary_modules
make[2]: Entering directory `/usr/src/modules/nvidia-kernel'
# select which makefile to use.
rm -f /usr/src/modules/nvidia-kernel/Makefile || true
if [ 6 = 6  ]; then \
             ln -s Makefile.kbuild Makefile ; \
        fi
if [  6 = 4  ]; then \
             ln -s Makefile.nvidia Makefile ; \
        fi
if ! gcc-4.2 -v 2> /dev/null  ; then \
           echo "Compiler gcc-4.2 does not exist on the system" ; \
           exit 1; \
        fi   
if [ -f /usr/src/modules/nvidia-kernel/debian/control.template ]; then \
                cp  /usr/src/modules/nvidia-kernel/debian/control.template /usr/src/modules/nvidia-kernel/debian/control; \
        fi
if [ "x86_64" = "x86_64" ]; then \
                cp /usr/src/modules/nvidia-kernel/nv-kernel.o.x86_64 /usr/src/modules/nvidia-kernel/nv-kernel.o ; \
        fi
#patch for XEN
patch -p3 < /usr/src/modules/nvidia-kernel/debian/patches/xen.patch
patching file conftest.sh
patching file nv-linux.h
patching file nv.c
patching file os-interface.c
touch configure-stamp
...

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.25 (SMP w/2 CPU cores)
Locale: LANG=en_AU, LC_CTYPE=en_AU (charmap=ISO-8859-1)
Shell: /bin/sh linked to /bin/bash

Versions of packages nvidia-kernel-source depends on:
ii  debhelper                     7.0.9      helper programs for debian/rules
ii  dpatch                        2.0.29     patch maintenance system for Debia
ii  make                          3.81-4     The GNU version of the "make" util
ii  sed                           4.1.5-8    The GNU sed stream editor

Versions of packages nvidia-kernel-source recommends:
ii  devscripts                    2.10.28    scripts to make the life of a Debi
ii  kernel-package                11.001-0.1 A utility for building Linux kerne
ii  nvidia-glx                    169.12-4   NVIDIA binary Xorg driver

-- no debconf information