[pkg-nvidia-devel] r882 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog control nvidia-glx.README.Debian nvidia-kernel-source.README.Debian.in rules
rra at users.alioth.debian.org
rra at users.alioth.debian.org
Mon May 10 01:11:10 UTC 2010
Author: rra
Date: Mon May 10 01:11:08 2010
New Revision: 882
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=882
Log:
Additional cleanup of the DKMS changes
[ Andreas Beckmann ]
- n-k-dkms should Depends: n-k-common, shouldn't it?
- n-k-dkms should Conflicts: n-k-legacy-ABCxx-dkms - these packages are
coming soon (hopefully) and only one n-k*-dkms can provide nvidia.ko
at a time, otherwise we get conflicts
- use a few more variables and less hardcoded paths when building the
kernel source tarballs
* nvidia-kernel-source.README.Debian: mention dkms and m-a before
everything else, drop some very outdated information
Modified:
packages/nvidia-graphics-drivers/trunk/debian/changelog
packages/nvidia-graphics-drivers/trunk/debian/control
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.README.Debian
packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian.in
packages/nvidia-graphics-drivers/trunk/debian/rules
Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=882&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Mon May 10 01:11:08 2010
@@ -128,6 +128,8 @@
uscan --report && dch -v <version> && debian/rules get-orig-source
* fix-2.6.33-build.patch: remove, fixed by upstream in 195.36.24
* libcuda1.symbols: update for symbol changes in 195.xx
+ * nvidia-kernel-source.README.Debian: mention dkms and m-a before everything
+ else, drop some very outdated information
* debian/rules.defs, debian/rules: add variable/placeholder LEGACY
and new subst vars nvidia:Legacy and nvidia:LegacyDesc
Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=882&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Mon May 10 01:11:08 2010
@@ -82,9 +82,13 @@
Package: nvidia-kernel-dkms
Section: non-free/kernel
Architecture: i386 amd64
-Depends: ${misc:Depends}, dkms
+Depends: ${misc:Depends}, dkms, nvidia-kernel-common
Recommends: nvidia-glx (>= ${nvidia:Version})
Provides: nvidia-kernel-${nvidia:Version}
+Conflicts:
+ nvidia-kernel-legacy-71xx-dkms,
+ nvidia-kernel-legacy-96xx-dkms,
+ nvidia-kernel-legacy-173xx-dkms,
Description: NVIDIA binary kernel module DKMS source
This package builds the NVIDIA Xorg binary kernel module needed by
nvidia-glx, using DKMS. The kernel module will be built for your running
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.README.Debian
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.README.Debian?rev=882&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.README.Debian (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.README.Debian Mon May 10 01:11:08 2010
@@ -17,7 +17,7 @@
Using the nvidia X driver requires some user modification.
- First, modify your /etc/X11/XF86Config-4 or /etc/X11/xorg.conf
+ First, modify your /etc/X11/xorg.conf
Minimum requirements:
In Section "Module"
@@ -33,8 +33,9 @@
Chapter 12: Configuring AGP is an important section.
-Also note all users using GLX must be in group video. (i.e. adduser <user>
-video)
+Also note all users using GLX must be in group video:
+
+ adduser <user> video
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian.in?rev=882&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian.in Mon May 10 01:11:08 2010
@@ -5,33 +5,52 @@
INTRODUCTION:
-----------------------------------------------------------------------
-Welcome to Debian NVIDIA packages. This document contains notes on the
+Welcome to Debian NVIDIA packages. This document contains notes on the
kernel module interface for the NVIDIA driver offering.
KERNEL MODULE INSTRUCTIONS:
-----------------------------------------------------------------------
-There are TWO ways to build the nvidia-kernel package. Which one depends on
-your situation with your kernel.
+ METHOD #1: automatically, via dkms - Dynamic Kernel Module Support
- METHOD #1: You are running a Debian supplied kernel or built a
+ * Easiest and recommended method.
+ * DKMS will take care of building a new module whenever the driver
+ or your kernel is updated.
+ * Install the package nvidia-kernel-dkms instead of
+ nvidia-kernel-source.
+ * STOP reading this file.
+
+ METHOD #2: manually, using module-assistant
+
+ * Requires a Debian supplied kernel or a kernel where you built a
+ corresponding linux-headers-KVERS package.
+ * Run this command every time your kernel or the driver was updated:
+
+ module-assistant auto-install nvidia
+
+ * For more information on module-assistant, see its man page and package
+ documentation.
+ * STOP reading this file.
+
+There are TWO more ways to build the nvidia-kernel package manually / via
+make-kpkg.
+Which one depends on your situation with your kernel.
+
+ METHOD #3: You are running a Debian supplied kernel or built a
linux-headers package along with your own self-built kernel.
- METHOD #2: You are running your own self-built kernel built from kernel
+ METHOD #4: You are running your own self-built kernel built from kernel
source.
*** An additional method is to use module-assistant
-(e.g. module-assistant auto-install nvidia)
-For more information on module-assistant, see it's man page and package
-documentation,
Which method you choose really depends on what kernel headers you wish to
use, those from a kernel-headers package or those from kernel
source (from which you built your own kernel).
As mentioned above, if you are running a Debian supplied kernel you will
-probably want to choose METHOD #1. If you compile your own kernels, METHOD #2.
+probably want to choose METHOD #3. If you compile your own kernels, METHOD #4.
@@ -42,24 +61,14 @@
/usr violates the FHS.
-SUPPORT FOR 2.6 KERNELS:
-------------------------
-As of 1.0.5336-1, NVIDIA includes support for a 2.6 kernel. No extra steps are
-required.
-
-HOTPLUG SUPPORT:
-------------------------
-As of version 1.0.5336-8 there is hotplug/udev module loading support provided.
-
-
-METHOD #1 Using a linux-headers or kernel-headers package
+METHOD #3 Using a linux-headers or kernel-headers package
***********************************************************************
As root (or using fakeroot)
1. cd /usr/src
tar xjvf nvidia-kernel.tar.bz2 -C <YOUR BUILD LOCATION>
- (It will install in <YOU BUILD LOCATION>/modules)
+ (It will install in <YOUR BUILD LOCATION>/modules)
- or -
tar xjvf nvidia-kernel.tar.bz2 (if building in /usr/src)
@@ -71,8 +80,6 @@
3. Download and install package: linux-headers-2.6.14-2-k7
It will install in /usr/src/
- Note that packages prior to 2.6.12 used the kernel- prefix rather than
- linux-
Make sure your kernel image and headers have matching release numbers to
avoid possible problems in packages built from different sources.
@@ -101,9 +108,9 @@
dpkg -i ../nvidia-kernel-2.6.14-2-k7_#VERSION#-1+_.Custom_i386.deb
( or similar filename )
-Now see GENERAL NOTES below method #2
+Now see GENERAL NOTES below method #4
-METHOD #2: Using your own kernel source headers
+METHOD #4: Using your own kernel source headers
***********************************************************************
To build the nvidia-kernel deb you need to first make sure you have
@@ -112,7 +119,7 @@
As root
1. cd /usr/src
tar xjvf nvidia-kernel.tar.bz2 -C <YOUR BUILD LOCATION>
- (It will install in <YOU BUILD LOCATION>/modules)
+ (It will install in <YOUR BUILD LOCATION>/modules)
- or -
tar xjvf nvidia-kernel.tar.bz2 (if building in /usr/src)
@@ -160,8 +167,8 @@
Also note for AGP issues and further information please see the NVIDIA
README file (README.gz) in the nvidia-glx package
-An old nvidia.o might be already loaded (run 'lsmod' to check) so
-do 'rmmod nvidia.o' to remove the module from memory.
+An old nvidia.ko might be already loaded (run 'lsmod' to check) so
+do 'rmmod nvidia' to remove the module from memory.
For any news on this package check http://bugs.debian.org/nvidia-kernel-source
Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=882&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Mon May 10 01:11:08 2010
@@ -25,6 +25,8 @@
AUTOCLEAN = $(filter-out $(AUTOKEEP),$(AUTOGEN))
module_source = debian/nvidia-kernel-source/usr/src/modules/nvidia-kernel
+module_tbz = $(subst /modules/,/,$(module_source)).tar.bz2
+dkms_source = debian/nvidia-kernel-dkms/usr/src/nvidia-$(version)
.PHONY: autogen configure
autogen: $(AUTOGEN)
@@ -43,17 +45,13 @@
touch $@
-# build kernel module source tarball
-module-source-stamp: configure
- dh_testdir
-
.PHONY: binary binary-arch binary-indep build clean install
binary binary-arch binary-indep build clean install:
dh $@
override_dh_auto_clean:
rm -f NVIDIA-Linux NVIDIA-Linux-i386 NVIDIA-Linux-amd64
- rm -fr $(dirname_x86) $(dirname_x86_64) nvidia-kernel.tar.bz2
+ rm -fr $(dirname_x86) $(dirname_x86_64)
rm -fr debian/temp
override_dh_clean:
@@ -62,13 +60,12 @@
$(MAKE) -f debian/rules $(AUTOKEEP)
override_dh_auto_configure: configure
-override_dh_auto_build: module-source-stamp
+# Build two kernel module source tarballs for use with
+# - module-assistant and make-kpkg
+# - dkms
override_dh_auto_install:
- dh_auto_install
-
- # Module source code.
- mkdir -p $(module_source)/debian
+ mkdir -p $(module_source)
cp -a NVIDIA-Linux/usr/src/nv/* $(module_source)/
cp -a NVIDIA-Linux/usr/share/doc/NVIDIA_Changelog $(module_source)/
@@ -78,7 +75,7 @@
# We want both 32 and 64 bit versions of nv-kernel.o. Do not use a
# name matching *.o to prevent accidental deletion by some clean
- # target
+ # target.
cp -a NVIDIA-Linux-i386/usr/src/nv/nv-kernel.o \
$(module_source)/nv-kernel.o.i386
cp -a NVIDIA-Linux-amd64/usr/src/nv/nv-kernel.o \
@@ -92,24 +89,25 @@
cp -a debian/bug-script $(module_source)/debian/
# Fix permissions.
- chmod -R a-sx,u=rwX,go=rX debian/nvidia-kernel-source/usr/src
+ chmod -R a-sx,u=rwX,go=rX $(module_source)/../..
chmod a+x $(module_source)/debian/rules
chmod a+x $(module_source)/conftest.sh
# Build the tarball.
- tar cfj debian/nvidia-kernel-source/usr/src/nvidia-kernel.tar.bz2 \
- --owner=root --group=src -C debian/nvidia-kernel-source/usr/src \
+ tar cfj $(module_tbz) \
+ --owner=root --group=src -C $(module_source)/../.. \
--exclude '*.in' --exclude '.svn' modules
- tar tfvj debian/nvidia-kernel-source/usr/src/nvidia-kernel.tar.bz2
+ tar tfvj $(module_tbz)
# Use the nvidia-kernel-source source to create the DKMS tree.
- mkdir -p debian/nvidia-kernel-dkms/usr/src
- mv $(module_source) debian/nvidia-kernel-dkms/usr/src/nvidia-$(version)
- cd debian/nvidia-kernel-dkms/usr/src/nvidia-$(version) \
+ mkdir -p $(dir $(dkms_source))
+ mv $(module_source) $(dkms_source)
+ rmdir $(dir $(module_source))
+ cd $(dkms_source) \
&& QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null push -a \
&& rm -rf .pc debian
+ ls -la $(dkms_source)
dh_dkms -V $(version)
- rmdir debian/nvidia-kernel-source/usr/src/modules
override_dh_installchangelogs:
dh_installchangelogs NVIDIA-Linux/usr/share/doc/NVIDIA_Changelog
More information about the Pkg-nvidia-devel
mailing list