Package: nvidia-kernel-source
Version: 185.18.14-1
Severity: normal
Tags: patch

Hi,

there are two copies of the same nv-kernel.o in nvidia-kernel-source
(amd64), the *.o.i386 variant is actually a copy of the *.o.x86_64:

file /usr/src/modules/nvidia-kernel/*.o.*
/usr/src/modules/nvidia-kernel/nv-kernel.o.i386:   ELF 64-bit LSB
relocatable, x86-64, version 1 (SYSV), not stripped
/usr/src/modules/nvidia-kernel/nv-kernel.o.x86_64: ELF 64-bit LSB
relocatable, x86-64, version 1 (SYSV), not stripped

The attached patch for debian/rules fixes this.


Andreas


-- System Information:
Debian Release: squeeze/sid
  APT prefers testing
  APT policy: (800, 'testing'), (800, 'stable'), (600, 'unstable'), (130, 
'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.28-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=C, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Index: debian/rules
===================================================================
--- debian/rules	(revision 671)
+++ debian/rules	(revision 672)
@@ -129,8 +129,9 @@
 		rm $(CURDIR)/debian/temp/modules/nvidia-kernel/makefile
 
 		# We want both 32 and 64 bit versions of nv-kernel.o
-	    cp $(CURDIR)/$(dirname_x86_64)/usr/src/nv/nv-kernel.o $(CURDIR)/debian/temp/modules/nvidia-kernel/nv-kernel.o.x86_64
-		mv $(CURDIR)/debian/temp/modules/nvidia-kernel/nv-kernel.o $(CURDIR)/debian/temp/modules/nvidia-kernel/nv-kernel.o.i386
+	cp $(CURDIR)/$(dirname_x86)/usr/src/nv/nv-kernel.o $(CURDIR)/debian/temp/modules/nvidia-kernel/nv-kernel.o.i386
+	cp $(CURDIR)/$(dirname_x86_64)/usr/src/nv/nv-kernel.o $(CURDIR)/debian/temp/modules/nvidia-kernel/nv-kernel.o.x86_64
+	rm -f $(CURDIR)/debian/temp/modules/nvidia-kernel/nv-kernel.o
 
 		# and then make Makefile.kbuild actually use our names
 		sed -i -e 's/nv-kernel.o$$/nv-kernel.o$$(NVARCH)/' $(CURDIR)/debian/temp/modules/nvidia-kernel/Makefile.kbuild

Reply via email to