Update section on kernel compilation to refer to common package where applicable

14 files changed, 35 insertions, 14 deletions

diff --git a/build/arch-options/alpha b/build/arch-options/alpha
index 85b423779..50e77c888 100644
--- a/build/arch-options/alpha
+++ b/build/arch-options/alpha
@@ -10,6 +10,7 @@ smp_config_option="Symmetric multi-processing support"
 
 # Options below are assembled into one variable 'condition'
 # in the build scripts
+kernelpackage="classic-kpkg"
 fdisk="fdisk.txt;cfdisk.txt"
 network="supports-tftp;supports-nfsroot"
 boot=""
diff --git a/build/arch-options/arm b/build/arch-options/arm
index 45cf7cc50..d67991ec8 100644
--- a/build/arch-options/arm
+++ b/build/arch-options/arm
@@ -10,6 +10,7 @@ smp_config_option="N/A"
 
 # Options below are assembled into one variable 'condition'
 # in the build scripts
+kernelpackage="classic-kpkg"
 fdisk="fdisk.txt;cfdisk.txt"
 network="supports-tftp;supports-rarp;supports-dhcp;supports-bootp;supports-nfsroot"
 boot=""
diff --git a/build/arch-options/hppa b/build/arch-options/hppa
index dc8b49c69..498a9ed31 100644
--- a/build/arch-options/hppa
+++ b/build/arch-options/hppa
@@ -3,13 +3,14 @@
 # It is sourced by the build scripts
 
 archspec="hppa;not-i386;not-s390;not-m68k;not-powerpc;not-alpha"
-kernelversion="2.6.8"
+kernelversion="2.6.12"
 # These two options should be set if condition 'smp' is set below
 smp_config_section="Processor type and features"
 smp_config_option="Symmetric multi-processing support"
 
 # Options below are assembled into one variable 'condition'
 # in the build scripts
+kernelpackage="common-kpkg"
 fdisk="cfdisk.txt"
 network="supports-tftp;supports-dhcp;supports-bootp;supports-nfsroot"
 boot=""
diff --git a/build/arch-options/i386 b/build/arch-options/i386
index 88cd447b8..a12d1aadc 100644
--- a/build/arch-options/i386
+++ b/build/arch-options/i386
@@ -3,13 +3,14 @@
 # It is sourced by the build scripts
 
 archspec="i386;not-s390;not-m68k;not-powerpc;not-alpha"
-kernelversion="2.6.11"
+kernelversion="2.6.12"
 # These two options should be set if condition 'smp' is set below
 smp_config_section="Processor type and features"
 smp_config_option="Symmetric multi-processing support"
 
 # Options below are assembled into one variable 'condition'
 # in the build scripts
+kernelpackage="common-kpkg"
 fdisk="fdisk.txt;cfdisk.txt"
 network="supports-tftp;supports-dhcp;supports-bootp;supports-nfsroot"
 boot="supports-floppy-boot;bootable-disk;bootable-usb"
diff --git a/build/arch-options/ia64 b/build/arch-options/ia64
index 2603d966f..0c693c52c 100644
--- a/build/arch-options/ia64
+++ b/build/arch-options/ia64
@@ -3,13 +3,14 @@
 # It is sourced by the build scripts
 
 archspec="ia64;not-i386;not-s390;not-m68k;not-powerpc;not-alpha"
-kernelversion="2.4.27"
+kernelversion="2.6.12"
 # These two options should be set if condition 'smp' is set below
 smp_config_section="General setup"
 smp_config_option="SMP support"
 
 # Options below are assembled into one variable 'condition'
 # in the build scripts
+kernelpackage="common-kpkg"
 fdisk="parted.txt;cfdisk.txt"
 network="supports-tftp;supports-dhcp;supports-bootp;supports-nfsroot"
 boot=""
diff --git a/build/arch-options/m68k b/build/arch-options/m68k
index 39935fe57..097bff849 100644
--- a/build/arch-options/m68k
+++ b/build/arch-options/m68k
@@ -10,6 +10,7 @@ smp_config_option="N/A"
 
 # Options below are assembled into one variable 'condition'
 # in the build scripts
+kernelpackage="classic-kpkg"
 fdisk="atari-fdisk.txt;mac-fdisk.txt;amiga-fdisk.txt;pmac-fdisk.txt"
 network="supports-tftp;supports-rarp;supports-dhcp;supports-bootp;supports-nfsroot"
 boot="supports-floppy-boot;bootable-disk"
diff --git a/build/arch-options/mips b/build/arch-options/mips
index 3a8495bf7..4b1a3e00a 100644
--- a/build/arch-options/mips
+++ b/build/arch-options/mips
@@ -10,6 +10,7 @@ smp_config_option="N/A"
 
 # Options below are assembled into one variable 'condition'
 # in the build scripts
+kernelpackage="classic-kpkg"
 fdisk="fdisk.txt;cfdisk.txt"
 network="supports-tftp;supports-dhcp;supports-nfsroot"
 boot=""
diff --git a/build/arch-options/mipsel b/build/arch-options/mipsel
index 85912a8b0..d97c26586 100644
--- a/build/arch-options/mipsel
+++ b/build/arch-options/mipsel
@@ -10,6 +10,7 @@ smp_config_option="N/A"
 
 # Options below are assembled into one variable 'condition'
 # in the build scripts
+kernelpackage="classic-kpkg"
 fdisk="fdisk.txt;cfdisk.txt"
 network="supports-tftp;supports-dhcp;supports-bootp;supports-nfsroot"
 boot=""
diff --git a/build/arch-options/powerpc b/build/arch-options/powerpc
index 7cbb2830f..b27c0dfc1 100644
--- a/build/arch-options/powerpc
+++ b/build/arch-options/powerpc
@@ -3,13 +3,14 @@
 # It is sourced by the build scripts
 
 archspec="powerpc;not-s390;not-m68k;not-i386;not-alpha"
-kernelversion="2.6.8"
+kernelversion="2.6.12"
 # These two options should be set if condition 'smp' is set below
 smp_config_section="Platform support"
 smp_config_option="Symmetric multi-processing support"
 
 # Options below are assembled into one variable 'condition'
 # in the build scripts
+kernelpackage="common-kpkg"
 fdisk="mac-fdisk.txt;cfdisk.txt"
 network="supports-tftp;supports-dhcp;supports-bootp;supports-nfsroot"
 boot="supports-floppy-boot;bootable-disk;bootable-usb"
diff --git a/build/arch-options/s390 b/build/arch-options/s390
index b523cbc6f..b2f8b0953 100644
--- a/build/arch-options/s390
+++ b/build/arch-options/s390
@@ -10,6 +10,7 @@ smp_config_option="Symmetric multi-processing support"
 
 # Options below are assembled into one variable 'condition'
 # in the build scripts
+kernelpackage="classic-kpkg"
 fdisk="fdasd.txt;dasdfmt.txt"
 network=""
 boot=""
diff --git a/build/arch-options/sparc b/build/arch-options/sparc
index 2de87b242..1505e55c3 100644
--- a/build/arch-options/sparc
+++ b/build/arch-options/sparc
@@ -3,13 +3,14 @@
 # It is sourced by the build scripts
 
 archspec="sparc;not-i386;not-s390;not-m68k;not-powerpc;not-alpha"
-kernelversion="2.4.27"
+kernelversion="2.6.12"
 # These two options should be set if condition 'smp' is set below
 smp_config_section="General setup"
 smp_config_option="Symmetric multi-processing support"
 
 # Options below are assembled into one variable 'condition'
 # in the build scripts
+kernelpackage="common-kpkg"
 fdisk="fdisk.txt"
 network="supports-tftp;supports-rarp;supports-dhcp;supports-bootp;supports-nfsroot"
 boot="supports-floppy-boot"
diff --git a/build/buildone.sh b/build/buildone.sh
index 62281da04..b4bbcd1e4 100755
--- a/build/buildone.sh
+++ b/build/buildone.sh
@@ -67,7 +67,7 @@ create_profiled () {
     . arch-options/$arch
 
     # Join all architecture options into one big variable
-    condition="$fdisk;$network;$boot;$smp;$other;$goodies;$unofficial_build;$status;$manual_release"
+    condition="$kernelpackage;$fdisk;$network;$boot;$smp;$other;$goodies;$unofficial_build;$status;$manual_release"
     # Add build options for the manual
     condition="$condition;$unofficial_build;$status;$manual_release;$manual_target"
 
diff --git a/build/entities/urls.ent b/build/entities/urls.ent
index 924ca30ac..65930bd7d 100644
--- a/build/entities/urls.ent
+++ b/build/entities/urls.ent
@@ -138,6 +138,8 @@
 <!-- Debian Reference -->
 <!ENTITY url-debian-reference "http://&www-debian-org;/doc/user-manuals#quick-reference">
 
+<!-- Debian Linux Kernel Handbook -->
+<!ENTITY url-kernel-handbook "http://kernel-handbook.alioth.debian.org/">
 
 <!--
   misc
diff --git a/en/post-install/kernel-baking.xml b/en/post-install/kernel-baking.xml
index 9d02ce08a..807910bfb 100644
--- a/en/post-install/kernel-baking.xml
+++ b/en/post-install/kernel-baking.xml
@@ -56,10 +56,11 @@ Don't be afraid to try compiling the kernel.  It's fun and profitable.
 </para><para>
 
 To compile a kernel the Debian way, you need some packages:
-<classname>kernel-package</classname>,
-<classname>kernel-source-&kernelversion;</classname> (the most recent version
-at the time of this writing), <classname>fakeroot</classname> and a
-few others which are probably already installed (see
+<classname>fakeroot</classname>, <classname>kernel-package</classname>,
+<phrase condition="classic-kpkg"><classname>kernel-source-&kernelversion;</classname>
+(the most recent version at the time of this writing)</phrase>
+<phrase condition="common-kpkg"><classname>linux-source-2.6</classname></phrase>
+and a few others which are probably already installed (see
 <filename>/usr/share/doc/kernel-package/README.gz</filename> for the
 complete list).
 
@@ -77,8 +78,9 @@ Note that you don't <emphasis>have</emphasis> to compile your kernel
 the <quote>Debian way</quote>; but we find that using the packaging system
 to manage your kernel is actually safer and easier.  In fact, you can get
 your kernel sources right from Linus instead of
-<classname>kernel-source-&kernelversion;</classname>, yet still use the
-<classname>kernel-package</classname> compilation method.
+<phrase condition="classic-kpkg"><classname>kernel-source-&kernelversion;</classname>,</phrase>
+<phrase condition="common-kpkg"><classname>linux-source-2.6</classname>,</phrase>
+yet still use the <classname>kernel-package</classname> compilation method.
 
 </para><para>
 
@@ -103,8 +105,11 @@ permissions.
 </footnote>. We'll also assume that your kernel version is
 &kernelversion;. Make sure you are in the directory to where you want to
 unpack the kernel sources, extract them using <userinput>tar xjf
-/usr/src/kernel-source-&kernelversion;.tar.bz2</userinput> and change
-to the directory <filename>kernel-source-&kernelversion;</filename>
+<phrase condition="classic-kpkg">/usr/src/kernel-source-&kernelversion;.tar.bz2</phrase>
+<phrase condition="common-kpkg">/usr/src/linux-source-&kernelversion;.tar.bz2</phrase></userinput>
+and change to the directory
+<phrase condition="classic-kpkg"><filename>kernel-source-&kernelversion;</filename></phrase>
+<phrase condition="common-kpkg"><filename>linux-source-&kernelversion;</filename></phrase>
 that will have been created.
 
 </para><para>
@@ -174,6 +179,9 @@ above step may have produced, then <userinput>shutdown -r now</userinput>.
 
 </para><para>
 
+<phrase condition="etch">For more information on Debian kernels and kernel
+compilation, see the <ulink url="&url-kernel-handbook;">Debian Linux Kernel
+Handbook</ulink>.</phrase>
 For more information on <classname>kernel-package</classname>, read
 the fine documentation in <filename>/usr/share/doc/kernel-package</filename>.