[Kernel-handbook-general] [PATCH 5/7] Use 3.x version numbers and current flavour and featureset names in examples
Ben Hutchings
ben at decadent.org.uk
Sun Jun 3 17:39:24 UTC 2012
---
chapter-bugs.sgml | 4 ++--
chapter-common-tasks.sgml | 58 ++++++++++++++++++++++-----------------------
chapter-initramfs.sgml | 6 ++---
chapter-modules.sgml | 12 ++++++----
chapter-packaging.sgml | 21 ++++++++--------
chapter-source.sgml | 10 ++++----
debian/changelog | 2 ++
7 files changed, 59 insertions(+), 54 deletions(-)
diff --git a/chapter-bugs.sgml b/chapter-bugs.sgml
index 571bbaf..a3810f0 100644
--- a/chapter-bugs.sgml
+++ b/chapter-bugs.sgml
@@ -357,8 +357,8 @@
<em>Use the correct package to report the bug against.</em>
Please file bugs against the package containing the kernel
version where the problem occurs
- (e.g. <package>linux-image-2.6.26-2-686</package>), not
- a metapackage (e.g. <package>linux-image-2.6-686</package>).
+ (e.g. <package>linux-image-3.2.0-2-686-pae</package>), not
+ a metapackage (e.g. <package>linux-image-686-pae</package>).
</item>
<item>
<em>Bugs involving ACPI.</em> While ACPI (Advanced Control
diff --git a/chapter-common-tasks.sgml b/chapter-common-tasks.sgml
index d69231c..46566df 100644
--- a/chapter-common-tasks.sgml
+++ b/chapter-common-tasks.sgml
@@ -7,10 +7,10 @@
it is sufficient to install the latest <tt>linux-source-<em>version</em></tt>
package and unpack the source, for example:
<example>
-# apt-get install linux-source-2.6.18
-$ tar jxf /usr/src/linux-source-2.6.18.tar.bz2
+# apt-get install linux-source-3.2
+$ tar jxf /usr/src/linux-source-3.2.tar.bz2
</example>
- The unpacked source tree then will be available in <tt>linux-source-2.6.18</tt> directory.
+ The unpacked source tree then will be available in <tt>linux-source-3.2</tt> directory.
</p>
</sect>
<sect id="common-official">
@@ -32,7 +32,7 @@ $ tar jxf /usr/src/linux-source-2.6.18.tar.bz2
tree available in the
<tt>linux-2.6-<em>version</em></tt>
directory. As always, the revision part of the version
- of this package (for example, 8 in 2.6.18-8) will
+ of this package (for example, 1 in 3.2.19-1) will
determine its patchlevel with respect to the original
upstream kernel source.
</item>
@@ -94,10 +94,10 @@ $ fakeroot debian/rules source
</p>
<p>
To change the configuration before building, for example
- for the 686-bigmem flavour on i386, run the commands:
+ for the 686-pae flavour on i386, run the commands:
<example>
-$ fakeroot make -f debian/rules.gen setup_i386_none_686-bigmem
-$ make -C debian/build/build_i386_none_686-bigmem menuconfig
+$ fakeroot make -f debian/rules.gen setup_i386_none_686-pae
+$ make -C debian/build/build_i386_none_686-pae menuconfig
</example>
</p>
<p>
@@ -126,11 +126,11 @@ $ fakeroot debian/rules binary-indep
<sect1>
<heading>Building packages for one flavour</heading>
<p>
- For example, to build only the binary packages for 686
+ For example, to build only the binary packages for 686-pae
flavour on i386 architecture, use the following commands:
<example>
$ fakeroot debian/rules source
-$ fakeroot make -f debian/rules.gen binary-arch_i386_none_686
+$ fakeroot make -f debian/rules.gen binary-arch_i386_none_686-pae
</example>
The target in this command has the general form of
<tt><em>target</em>_<em>arch</em>_<em>featureset</em>_<em>flavour</em></tt>.
@@ -216,19 +216,19 @@ $ fakeroot make -f debian/rules.gen binary-arch_i386_none_real
kernel.org, or a git repository. If you have a tarball, run
a command such as:
<example>
-$ python debian/bin/genorig.py ../linux-2.6.20.tar.bz2 ../patch-2.6.21-rc6.bz2
+$ python debian/bin/genorig.py ../linux-3.4.tar.bz2 ../patch-3.5-rc1.bz2
</example>
</p>
<p>
If you have a git repository, pass the name of its
directory:
<example>
-$ python debian/bin/genorig.py ~/src/linux-2.6
+$ python debian/bin/genorig.py ~/src/linux
</example>
</p>
<p>
Either of these will generate a file such as
- <tt>../orig/linux-2.6_2.6.21~rc6.orig.tar.gz</tt>.
+ <tt>../orig/linux-2.6_3.5~rc1.orig.tar.gz</tt>.
You can then combine this tarball with the Debian packaging
by running:
<example>
@@ -254,9 +254,9 @@ $ debian/rules orig
the <tt>linux-source</tt> package and the <tt>make deb-pkg</tt>
target. First, prepare the kernel tree:
<example>
-# apt-get install linux-source-2.6.18
-$ tar xjf /usr/src/linux-source-2.6.18.tar.bz2
-$ cd linux-source-2.6.18
+# apt-get install linux-source-3.2
+$ tar xjf /usr/src/linux-source-3.2.tar.bz2
+$ cd linux-source-3.2
</example>
The kernel now needs to be configured, that is you have to
set the kernel options and select the drivers which are
@@ -296,13 +296,13 @@ $ make KDEB_PKGVERSION=custom.1.0 deb-pkg
identifier, which will get appended to the kernel package
name. Feel free to adjust it to your liking.
As a result of the build, a custom kernel package
- <tt>linux-image-2.6.18_custom.1.0_i386.deb</tt> (name will
+ <tt>linux-image-3.2.19_custom.1.0_i386.deb</tt> (name will
reflect the version of the kernel and the revision chosen in
the command line above) will be created in the directory one
level above the top of the tree. It may be installed using
<tt>dpkg</tt> just as any other package:
<example>
-# dpkg -i ../linux-image-2.6.18_custom.1.0_i386.deb
+# dpkg -i ../linux-image-3.2.19_custom.1.0_i386.deb
</example>
This command will unpack the kernel, generate the initrd if
necessary (see <ref id="initramfs"> for details), and configure
@@ -337,16 +337,16 @@ $ make KDEB_PKGVERSION=custom.1.0 deb-pkg
the kernel source from Debian packages, the "pristine" source is
downloaded using your favourite browser or using wget, as follows:
<example>
-$ wget http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2
+$ wget http://kernel.org/pub/linux/kernel/v3.x/linux-3.4.tar.bz2
</example>
The integrity of the downloaded archive may be verified by fetching
the corresponding cryptographic signature
<example>
-$ wget http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2.sign
+$ wget http://kernel.org/pub/linux/kernel/v3.x/linux-3.4.tar.bz2.sign
</example>
and running this command (<tt>gnupg</tt> package must be installed):
<example>
-$ gpg --verify linux-2.6.19.tar.bz2.sign
+$ gpg --verify linux-3.4.tar.bz2.sign
</example>
Successful verification results in output similar to the one below:
<example>
@@ -358,13 +358,13 @@ Primary key fingerprint: C75D C40A 11D7 AF88 9981 ED5B C86B A06A 517D 0F0E
</example>
After that the archive may be unpacked using
<example>
-$ tar xjf linux-2.6.19.tar.bz2
-$ cd linux-2.6.19
+$ tar xjf linux-3.4.tar.bz2
+$ cd linux-3.4
</example>
- The unpacked kernel tree (in <tt>linux-2.6.19</tt> now has to be configured.
+ The unpacked kernel tree (in <tt>linux-3.4</tt> now has to be configured.
The existing configuration file may be used as a starting point
<example>
-$ cp /boot/config-2.6.18-3-686 ./.config
+$ cp /boot/config-3.2.0-2-686-pae ./.config
</example>
After the configuration with one of the configuration frontends (invoked by <tt>make oldconfig</tt>,
<tt>make config</tt>, <tt>make menuconfig</tt>, etc) is completed, the build
@@ -379,11 +379,11 @@ $ cp /boot/config-2.6.18-3-686 ./.config
packages. For some of the most popular out-of-tree modules,
the binary Debian packages with modules built against the
stock Debian kernels are provided. For example, if you are
- running stock Debian kernel <tt>2.6.18-3-686</tt> (use the
+ running stock Debian kernel <tt>3.2.0-2-686-pae</tt> (use the
<tt>uname -r</tt> command to verify the version) from the
- <tt>linux-image-2.6.18-3-686</tt> package, and would like to
+ <tt>linux-image-3.2.0-2-686-pae</tt> package, and would like to
use the squash filesystem, all you need to do is install
- <tt>squashfs-modules-2.6.18-3-686</tt> binary package, which
+ <tt>squashfs-modules-3.2.0-2-686-pae</tt> binary package, which
provides the neccessary binary kernel modules.
</p>
@@ -399,14 +399,14 @@ $ cp /boot/config-2.6.18-3-686 ./.config
<tt>module-assistant</tt> (or <tt>m-a</tt>) script from the
<tt>module-assistant</tt> package. Typical sequence to
build a custom binary module package, matching a kernel
- <tt>2.6.18-3-686</tt> (as returned by <tt>uname -r</tt>)
+ <tt>3.2.0-2-686-pae</tt> (as returned by <tt>uname -r</tt>)
from the debianized source consists of the following steps:
</p>
<p>
Install a set of kernel headers, matching the kernel for
which the modules are going to be built:
<example>
-# apt-get install linux-headers-2.6.18-3-686
+# apt-get install linux-headers-3.2.0-2-686-pae
</example>
Install the package containing the source:
<example>
diff --git a/chapter-initramfs.sgml b/chapter-initramfs.sgml
index 58d6d88..bd64e5e 100644
--- a/chapter-initramfs.sgml
+++ b/chapter-initramfs.sgml
@@ -46,9 +46,9 @@
<tt>linux-image</tt> has been installed, the initramfs needs to
be regenerated. This is achieved by the command
<example>
-# dpkg-reconfigure linux-image-2.6.18-3-686
+# dpkg-reconfigure linux-image-3.2.0-2-686-pae
</example>
- where <tt>linux-image-2.6.18-3-686</tt> is the name of the
+ where <tt>linux-image-3.2.0-2-686-pae</tt> is the name of the
kernel package for which the initramfs regeneration is requested.
</sect>
<sect id="initramfs-exam">
@@ -59,7 +59,7 @@
compressed <tt>cpio</tt> archives, which may be extracted
using the command
<example>
-$ zcat /boot/initrd.img-2.6.18-3-686 | cpio -i
+$ zcat /boot/initrd.img-3.2.0-2-686-pae | cpio -i
</example>
It will unpack the contents of the initramfs into the current directory.
</sect>
diff --git a/chapter-modules.sgml b/chapter-modules.sgml
index d11a0f9..e1d8403 100644
--- a/chapter-modules.sgml
+++ b/chapter-modules.sgml
@@ -40,12 +40,16 @@ sbp2
use the <tt>modinfo</tt> command, for example:
<example>
# modinfo loop
-filename: /lib/modules/2.6.18-3-686/kernel/drivers/block/loop.ko
-license: GPL
+filename: /lib/modules/3.2.0-2-686-pae/kernel/drivers/block/loop.ko
+alias: devname:loop-control
+alias: char-major-10-237
alias: block-major-7-*
-vermagic: 2.6.18-3-686 SMP mod_unload 686 REGPARM gcc-4.1
+license: GPL
depends:
-parm: max_loop:Maximum number of loop devices (1-256) (int)
+intree: Y
+vermagic: 3.2.0-2-686-pae SMP mod_unload modversions 686
+parm: max_loop:Maximum number of loop devices (int)
+parm: max_part:Maximum number of partitions per loop device (int)
</example>
</p>
diff --git a/chapter-packaging.sgml b/chapter-packaging.sgml
index 619e121..e9258d4 100644
--- a/chapter-packaging.sgml
+++ b/chapter-packaging.sgml
@@ -26,10 +26,10 @@
This package contains the Debian kernel source
tarball. The patchlevel of the source is determined by the
- Debian revision of the package, for example the version 2.6.26-2
- of the package <tt>linux-source-2.6.26</tt> contains the
- version 2.6.26 of the Debian kernel source patched to
- patchlevel 2. Once the package is installed, the source
+ Debian revision of the package, for example the version 3.2.19-1
+ of the package <tt>linux-source-3.2</tt> contains the
+ version 3.2.19 of the Debian kernel source patched to
+ patchlevel 1. Once the package is installed, the source
tarball is available at
<tt>/usr/src/linux-source-<em>version</em>.tar.bz2</tt>.
</item>
@@ -86,14 +86,13 @@
the Debian kernel source are required. Again, multiple
flavours of binary images may be built from the featureset
tree. For example, the <tt>i386</tt> architecture has a number of
- different flavours, such as <tt>486</tt>, <tt>686</tt> and
- <tt>686-bigmem</tt>, built from the common Debian kernel source. It
- also contains <tt>xen</tt> and <tt>openvz</tt>
- featuresets. The source tree for
+ different flavours, such as <tt>486</tt>, <tt>686-pae</tt> and
+ <tt>amd64</tt>, built from the common Debian kernel source. It
+ also contains the <tt>rt</tt> featureset. The source tree for
building the kernels for each of these featuresets is
obtained by applying additional patches to the Debian kernel
- source. It may be used to build the <tt>xen-686</tt> and
- <tt>openvz-686</tt> binary image flavours. The names of the
+ source. It may be used to build the <tt>rt-686-pae</tt>
+ binary image flavours. The names of the
Debian binary packages incorporate the name of the flavour
and, if necessary, the name of the featureset (there is
no need to worry about the name of the architecture, since
@@ -162,7 +161,7 @@ apt-get install linux-headers-$(uname -r)
<p>
These virtual packages provide (via dependencies) the latest
binary image and matching set of header files (respectively)
- for a particular flavour. Example: <tt>linux-image-openvz-686</tt>
+ for a particular flavour. Example: <tt>linux-image-rt-686-pae</tt>
</p>
<p>
In Debian 6.0 (squeeze) and earlier, the headers
diff --git a/chapter-source.sgml b/chapter-source.sgml
index 87b33dc..17c5612 100644
--- a/chapter-source.sgml
+++ b/chapter-source.sgml
@@ -55,12 +55,12 @@
serious bugs and security holes. The Debian version of the
kernel packages has the form <tt><em>version-revision</em></tt>
where <tt><em>version</em></tt> is the upstream version of the
- kernel (like 2.6.26) and <tt><em>revision</em></tt> determines
- the patchlevel. For example, the packages with version 2.6.26-2
- are built from the <tt>linux-2.6_2.6.26.orig.tar.gz</tt> source,
- patched up to patchlevel 2. Certain packages include extra
+ kernel (like 3.2.19) and <tt><em>revision</em></tt> determines
+ the patchlevel. For example, the packages with version 3.2.19-1
+ are built from the <tt>linux-2.6_3.2.19.orig.tar.gz</tt> source,
+ patched up to patchlevel 1. Certain packages include extra
'featuresets' not included in the upstream source, such as
- <tt>xen</tt> and <tt>openvz</tt>.
+ <tt>rt</tt>.
</p>
</sect>
diff --git a/debian/changelog b/debian/changelog
index fbc9aa5..eb9f6c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ kernel-handbook (1.0.13) UNRELEASED; urgency=low
packaging changes and redundant with snapshot.debian.org
* Remove documentation of version-specific /etc/modules files, which are
no longer supported
+ * Use 3.x version numbers and current flavour and featureset names in
+ examples
-- Ben Hutchings <ben at decadent.org.uk> Fri, 16 Dec 2011 05:26:30 +0000
--
1.7.10
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 828 bytes
Desc: This is a digitally signed message part
URL: <http://lists.alioth.debian.org/pipermail/kernel-handbook-general/attachments/20120603/e6f9aff6/attachment.pgp>
More information about the Kernel-handbook-general
mailing list