Package: fglrx-kernel-src
Severity: wishlist
Tags: patch
A friend was installing the fglrx driver on his machine following the
documentation provided (thank you!), and started following the
instructions in the README.Debian file, without realising that the
different methods (a to d) were exclusive and the preferred one was
actually the _last_ one in the document.
I propose the instructions be re-ordered based on their ease-of-use and
likelihood of Just Working, so I put them in this order:
a: module-assistant (was d)
b: make-kpkg (was c)
c: make.sh (was a)
d: kernel makefile (was b)
My main plan was to put the recommended module-assistant method first, I
don't particularly mind if you disagree with my ordering of the other
three methods :)
The patch is a bit unclear because of the whitespace handling. I simply
reordered them and reworded the paragraph before the four options.
Thanks for your good work.
-Ted
diff -ruN fglrx-driver-8.24.8/debian/fglrx-kernel-src.README.Debian
fglrx-driver-8.24.8-new/debian/fglrx-kernel-src.README.Debian
--- fglrx-driver-8.24.8/debian/fglrx-kernel-src.README.Debian 2006-08-22
21:24:59.000000000 +1000
+++ fglrx-driver-8.24.8-new/debian/fglrx-kernel-src.README.Debian
2006-08-22 21:34:07.000000000 +1000
@@ -13,42 +13,35 @@
*** Make sure to remove any old /usr/src/modules/fglrx* directory
*** after an upgrade of the sources package.
-You can build the kernel module in several ways. Choose one, preferably
-the module-assistant command.
+You can build the kernel module in several ways. The module-assistant
+method is usually easiest.
-a) Build with the supplied make.sh script
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-This will build a module that matches the running kernel; you need to have
-the correct kernel source and configuration in place.
-
- $ cd /usr/src/modules/fglrx
- $ ./make.sh
+a) Build with module-assistant (recommended)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+If you have never built modules with module-assistant before, you should
+prepare the build environment by running:
-Provided that the module was compiled without error, become root and
-install it:
+ # module-assistant prepare
- $ mkdir /lib/modules/$(uname -r)/misc
- $ cp fglrx.ko /lib/modules/$(uname -r)/misc/
- $ depmod -ae
+In the usual environment, module-assistant should detect all
+requirements. Example (assuming that you build for the running kernel):
-b) Build with the kernel's makefile (only on kernel 2.6.x)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-This will build a module that matches the kernel sources you start from.
+ # module-assistant a-i fglrx
-If you are unable to build a working module in any other way, please try
-this method and install the module by hand. If this module works, building
-it with make-kpkg is just a matter of using the correct parameters.
+module-assistant will unpack the sources for you, if necessary. Make sure
+to remove any old /usr/src/modules/fglrx directory after an upgrade of
+the fglrx package, because module-assistant will not do that for you.
- $ cd /usr/src/kernel-source-2.x.y
- $ make SUBDIRS=/usr/src/modules/fglrx modules
+If you prefer to build the packages with m-a from your own user account
+(with ~/src/linux being the kernel source):
- (replace /usr/src/kernel-source-2.x.y with the path to your kernel
- sources)
+ $ mkdir -p ~/src/modass
+ $ module-assistant -u ~/src/modass -k ~/src/linux install fglrx
-Provided that the module was compiled without error, become root and
-install it as shown in the previous section.
+Note: A detailed explanation of module-assistant is beyond the scope
+of this document. Please refer to the module-assistant documentation.
-c) Build with the make-kpkg command
+b) Build with the make-kpkg command
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
make-kpkg is provided by the kernel-package Debian package.
@@ -64,30 +57,37 @@
$ dpkg -i /usr/src/fglrx-kernel-2.x.y_<version>_<arch>.deb
-d) Build with module-assistant (recommended)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-If you have never built modules with module-assistant before, you should
-prepare the build environment by running:
+c) Build with the supplied make.sh script
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+This will build a module that matches the running kernel; you need to have
+the correct kernel source and configuration in place.
- # module-assistant prepare
+ $ cd /usr/src/modules/fglrx
+ $ ./make.sh
-In the usual environment, module-assistant should detect all
-requirements. Example (assuming that you build for the running kernel):
+Provided that the module was compiled without error, become root and
+install it:
- # module-assistant a-i fglrx
+ $ mkdir /lib/modules/$(uname -r)/misc
+ $ cp fglrx.ko /lib/modules/$(uname -r)/misc/
+ $ depmod -ae
-module-assistant will unpack the sources for you, if necessary. Make sure
-to remove any old /usr/src/modules/fglrx directory after an upgrade of
-the fglrx package, because module-assistant will not do that for you.
+d) Build with the kernel's makefile (only on kernel 2.6.x)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+This will build a module that matches the kernel sources you start from.
-If you prefer to build the packages with m-a from your own user account
-(with ~/src/linux being the kernel source):
+If you are unable to build a working module in any other way, please try
+this method and install the module by hand. If this module works, building
+it with make-kpkg is just a matter of using the correct parameters.
- $ mkdir -p ~/src/modass
- $ module-assistant -u ~/src/modass -k ~/src/linux install fglrx
+ $ cd /usr/src/kernel-source-2.x.y
+ $ make SUBDIRS=/usr/src/modules/fglrx modules
-Note: A detailed explanation of module-assistant is beyond the scope
-of this document. Please refer to the module-assistant documentation.
+ (replace /usr/src/kernel-source-2.x.y with the path to your kernel
+ sources)
+
+Provided that the module was compiled without error, become root and
+install it as shown in the previous section.
Loading the kernel module
