Package: nvidia-graphics-modules-amd64 Severity: normal Tags: patch Hi,
so far I used a locally updated version of this package to build nvidia module packages and upload them to a local repository. Before the 2.6.29/180.44 reorganization this worked without changes (besides bumping version numbers). Now a bit more work was needed to get this working again, so here comes a patch with the neccessary changes. I also tried enabling nvidia in linux-modules-nonfree, this built packages without problems, but these are not compatible with the ones previously built from this package (different names and especially they lack a Provides: nvidia-kernel-180.44). There might be more neccessary to bring linux-modules-nonfree up-to-date with nvidia, but I couldn't find a patch anywhere and didn't want to reinvent it. Using module-assistant is not a good solution if you have several machines to be kept in sync and don't want to have m-a, kernel-headers, compiler, ... installed verywhere. Enough of reasoning why I use nvidia-graphics-modules-amd64, there are three changes neccessary to make it work with current driver and kernel. This works with an unmodified nvidia-kernel-source 180.44-2, but some of the workarounds I applied may give pointers to what has to be changed in the source package to restore make-kpkg compatibility. 1. added Build-Depends: module-assistant this is neccessary since nvidia-kernel-source debian/rules includes some makefile snippets from m-a (conditionally, but without including them some variables (e.g. VERSION) are missing and passing VERSION on the command line calling the binary-modules target (in module source) causes lots of problems 2. pass KPKG_DEST_DIR=.. when calling module source debian/rules binary-modules 3. pass HAVECONFIG=y when calling debian/rules clean in the module source otherwise clean fails miserably, this is a bug in nvidia-kernel-source Remaining changes in the attached patch are version bumps or "cosmetics" (change section, drop openvz flavor). 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
diff -Nru nvidia-graphics-modules-amd64-173.14.09+3/control.template nvidia-graphics-modules-amd64-180.44+0anbe0/control.template --- nvidia-graphics-modules-amd64-173.14.09+3/control.template 2008-08-24 09:26:21.000000000 +0200 +++ nvidia-graphics-modules-amd64-180.44+0anbe0/control.template 2009-04-24 21:21:50.000000000 +0200 @@ -7,7 +7,7 @@ Package: nvidia-kernel-#KVERS# Architecture: i386 amd64 -Provides: nvidia-kernel-173.14.09 +Provides: nvidia-kernel-180.44 Depends: nvidia-kernel-common (>= 20050829), linux-image-#KVERS# Description: NVIDIA binary kernel module for Linux #KVERS# These Xorg binary drivers provide optimized hardware acceleration of diff -Nru nvidia-graphics-modules-amd64-173.14.09+3/debian/changelog nvidia-graphics-modules-amd64-180.44+0anbe0/debian/changelog --- nvidia-graphics-modules-amd64-173.14.09+3/debian/changelog 2008-08-24 09:27:31.000000000 +0200 +++ nvidia-graphics-modules-amd64-180.44+0anbe0/debian/changelog 2009-04-24 21:38:02.000000000 +0200 @@ -1,3 +1,46 @@ +nvidia-graphics-modules-amd64 (180.44+0anbe0) unstable; urgency=low + + * AnBe NMU + * Use nvidia-kernel-source 180.44-2 + * Build for 2.6.29-1 + * Upload to unstable + * debian/control: add Build-Depends: module-assistant + * debian/rules: fix build with 180.44-2 + * drop openvz flavour + + -- Andreas Beckmann <deb...@abeckmann.de> Fri, 24 Apr 2009 21:37:46 +0200 + +nvidia-graphics-modules-amd64 (180.29+0anbe0) experimental; urgency=low + + * AnBe NMU + * Use nvidia-kernel-source 180.29-1 + * Build for 2.6.28-1 + + -- Andreas Beckmann <deb...@abeckmann.de> Fri, 06 Mar 2009 17:36:35 +0100 + +nvidia-graphics-modules-amd64 (180.06+0anbe0) experimental; urgency=low + + * AnBe NMU + * Use nvidia-kernel-source 180.06-0anbe0 + * Upload to experimental + + -- Andreas Beckmann <deb...@abeckmann.de> Sun, 30 Nov 2008 02:17:58 +0100 + +nvidia-graphics-modules-amd64 (177.82+0anbe0) unstable; urgency=low + + * AnBe NMU + * Use nvidia-kernel-source 177.82-0anbe0 + + -- Andreas Beckmann <deb...@abeckmann.de> Sat, 29 Nov 2008 14:13:10 +0100 + +nvidia-graphics-modules-amd64 (177.67+0anbe0) unstable; urgency=low + + * AnBe NMU + * Build for 2.6.26-1 + * Use nvidia-kernel-source 177.67-0anbe0 + + -- Andreas Beckmann <deb...@abeckmann.de> Thu, 28 Aug 2008 18:55:07 +0200 + nvidia-graphics-modules-amd64 (173.14.09+3) unstable; urgency=medium * Fix provides. (closes: #496283) diff -Nru nvidia-graphics-modules-amd64-173.14.09+3/debian/control nvidia-graphics-modules-amd64-180.44+0anbe0/debian/control --- nvidia-graphics-modules-amd64-173.14.09+3/debian/control 2008-08-22 23:57:38.000000000 +0200 +++ nvidia-graphics-modules-amd64-180.44+0anbe0/debian/control 2009-04-24 21:42:40.000000000 +0200 @@ -1,34 +1,21 @@ Source: nvidia-graphics-modules-amd64 -Section: non-free/x11 +Section: non-free/kernel Priority: optional Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-de...@lists.alioth.debian.org> Uploaders: Randall Donald <rdon...@debian.org> -Build-Depends: linux-headers-2.6.26-1-amd64, linux-headers-2.6.26-1-openvz-amd64, debhelper (>=4.0.0),nvidia-kernel-source (>= 173.14.09), nvidia-kernel-source (<< 173.14.10) +Build-Depends: linux-headers-2.6.29-1-amd64, debhelper (>= 4.0.0), nvidia-kernel-source (>= 180.44), nvidia-kernel-source (<< 180.45~), module-assistant Standards-Version: 3.6.2 -Package: nvidia-kernel-2.6.26-1-amd64 -Architecture: amd64 -Description: NVIDIA binary kernel module - -Package: nvidia-kernel-2.6.26-1-openvz-amd64 +Package: nvidia-kernel-2.6.29-1-amd64 Architecture: amd64 Description: NVIDIA binary kernel module Package: nvidia-kernel-2.6-amd64 Architecture: amd64 -Depends: nvidia-kernel-2.6.26-1-amd64, linux-image-2.6-amd64 +Depends: nvidia-kernel-2.6.29-1-amd64, linux-image-2.6-amd64 Description: NVIDIA binary kernel module for 2.6 series compiled for amd64 This is a metapackage to track the NVIDIA kernel module for the 2.6 kernel series. . This package tracks the module compiled against amd64 headers. - -Package: nvidia-kernel-2.6-openvz-amd64 -Architecture: amd64 -Depends: nvidia-kernel-2.6.26-1-openvz-amd64, linux-image-2.6-openvz-amd64 -Description: NVIDIA binary kernel module for 2.6 series compiled for openvz-amd64 - This is a metapackage to track the NVIDIA kernel module for - the 2.6 kernel series. - . - This package tracks the module compiled against openvz-amd64 headers. diff -Nru nvidia-graphics-modules-amd64-173.14.09+3/debian/rules nvidia-graphics-modules-amd64-180.44+0anbe0/debian/rules --- nvidia-graphics-modules-amd64-173.14.09+3/debian/rules 2008-08-17 01:06:40.000000000 +0200 +++ nvidia-graphics-modules-amd64-180.44+0anbe0/debian/rules 2009-04-24 21:27:40.000000000 +0200 @@ -19,8 +19,8 @@ sed 's/^.*(\(.*\)).*$$/\1/' \ ) -version := 2.6.26-1 -flavours := amd64 openvz-amd64 +version := 2.6.29-1 +flavours := amd64 #krevision := $(shell \ @@ -65,8 +65,8 @@ sed -e 's/^Source.*$$/Source: nvidia-graphics-modules-amd64/' debian/control.template > debian/control.template.new; \ mv debian/control.template.new debian/control.template ; \ for i in $(flavours); do \ - DO_NOT_PATCH_NV=$(DO_NOT_PATCH_NV) KERNEL_DEPENDS=y MODVERS=$(revision) KSRC=/usr/src/linux-headers-$(version)-$$i KVERS=$(version)-$$i debian/rules binary_modules ; \ - KSRC=/usr/src/linux-headers-$(version)-$$i KVERS=$(version)-$$i debian/rules clean; \ + DO_NOT_PATCH_NV=$(DO_NOT_PATCH_NV) KERNEL_DEPENDS=y MODVERS=$(revision) KSRC=/usr/src/linux-headers-$(version)-$$i KVERS=$(version)-$$i KPKG_DEST_DIR=.. debian/rules binary_modules ; \ + KSRC=/usr/src/linux-headers-$(version)-$$i KVERS=$(version)-$$i HAVECONFIG=y debian/rules clean; \ done # cd modules/nvidia-kernel-legacy; \ # sed -e 's/^Source.*$$/Source: nvidia-graphics-modules-amd64/' debian/control.template > debian/control.template.new; \ @@ -77,7 +77,7 @@ # done mv modules/*.deb . for p in *.deb; do \ - dpkg-distaddfile $$p "non-free/x11" optional; \ + dpkg-distaddfile $$p "non-free/kernel" optional; \ done mv *.deb ..
