[Kernel-handbook-general] [PATCH 6/7] Refer to the linux source package rather than linux-2.6

Ben Hutchings ben at decadent.org.uk
Sun Jun 3 17:42:22 UTC 2012


Add a note about the renaming for the benefit of people working with
squeeze and looking at the current handbook on the web.

Change the bug list URL to check both source packages.
---
 chapter-bugs.sgml         |    2 +-
 chapter-common-tasks.sgml |   32 +++++++++++++++++++++-----------
 chapter-packaging.sgml    |    6 +++---
 chapter-source.sgml       |   10 +++++-----
 debian/changelog          |    1 +
 5 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/chapter-bugs.sgml b/chapter-bugs.sgml
index a3810f0..f71a5be 100644
--- a/chapter-bugs.sgml
+++ b/chapter-bugs.sgml
@@ -315,7 +315,7 @@
 	  chance that it has been discussed elsewhere, and a possible
 	  solution, patch, or workaround has been proposed. If such
 	  information exists, always include the references to it in
-	  your report. Check the <url id="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=linux-2.6" name="current bug list">
+	  your report. Check the <url id="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=linux&src=linux-2.6" name="current bug list">
 	  to see whether something similar has been reported already.
 	</item>
 	<item>
diff --git a/chapter-common-tasks.sgml b/chapter-common-tasks.sgml
index 46566df..453b6ed 100644
--- a/chapter-common-tasks.sgml
+++ b/chapter-common-tasks.sgml
@@ -23,26 +23,31 @@ $ tar jxf /usr/src/linux-source-3.2.tar.bz2
 	<sect1>
 	  <heading>Preparation</heading>
 	  <p>
+	    For Debian 6.0 (squeeze) and earlier versions, substitute
+	    the source package name <tt>linux-2.6</tt> for
+	    <tt>linux</tt>.
+	  </p>
+	  <p>
 	    Run the following commands:
 	    <taglist>
-              <tag><tt>$ apt-get source linux-2.6</tt></tag>
+              <tag><tt>$ apt-get source linux</tt></tag>
 	      <item>
 		This will download and unpack the
-		<tt>linux-2.6</tt> source package, making the
+		<tt>linux</tt> source package, making the
 		tree available in the
-		<tt>linux-2.6-<em>version</em></tt>
+		<tt>linux-<em>version</em></tt>
 		directory. As always, the revision part of the version
 		of this package (for example, 1 in 3.2.19-1) will
 		determine its patchlevel with respect to the original
 		upstream kernel source.
 	      </item>
 	      <tag><tt># apt-get install build-essential fakeroot</tt></tag>
-	      <tag><tt># apt-get build-dep linux-2.6</tt></tag>
+	      <tag><tt># apt-get build-dep linux</tt></tag>
 	      <item>
 		The last two commands will install the build dependencies required by the kernel
 		build process.
 	      </item>
-	      <tag><tt>$ cd linux-2.6-<em>version</em></tt></tag>
+	      <tag><tt>$ cd linux-<em>version</em></tt></tag>
 	      <item>
 		Enter the source directory.
 	      </item>
@@ -153,16 +158,21 @@ $ fakeroot make -f debian/rules.gen binary-arch_i386_none_real
       <sect id="common-official-vcs">
         <heading>Building a development version of the Debian kernel package</heading>
 	<p>
+	  For Debian 6.0 (squeeze) and earlier versions, substitute
+	  the source package name <tt>linux-2.6</tt> for
+	  <tt>linux</tt>.
+	</p>
+	<p>
 	  To build a kernel image based on the kernel team's
 	  unreleased development version:
 	  <taglist>
 	    <tag><tt># apt-get install build-essential fakeroot rsync svn</tt></tag>
-	    <tag><tt># apt-get build-dep linux-2.6</tt></tag>
+	    <tag><tt># apt-get build-dep linux</tt></tag>
 	    <item>
 	      The last two commands will install the build
 	      dependencies required by the kernel build process.
 	    </item>
-	    <tag><tt>$ svn co svn://anonscm.debian.org/svn/kernel/dists/<em>dist</em>/linux-2.6</tt></tag>
+	    <tag><tt>$ svn co svn://anonscm.debian.org/svn/kernel/dists/<em>dist</em>/linux</tt></tag>
 	    <item>
 	      This will check out the Debian packaging.  <em>dist</em>
 	      is normally the distribution codename such as
@@ -170,9 +180,9 @@ $ fakeroot make -f debian/rules.gen binary-arch_i386_none_real
 	      latest version, usually based on an upstream release
 	      candidate, use <tt>trunk</tt>.
 	    </item>
-	    <tag><tt>$ apt-get source -d linux-2.6</tt></tag>
+	    <tag><tt>$ apt-get source -d linux</tt></tag>
 	    <item>
-	      This will download the <tt>linux-2.6</tt> upstream
+	      This will download the <tt>linux</tt> upstream
 	      source (and the last released Debian patches).
 	      Depending on which version you are trying to build,
 	      you might need to override APT's version selection
@@ -180,7 +190,7 @@ $ fakeroot make -f debian/rules.gen binary-arch_i386_none_real
 	      <url id="http://people.debian.org"
 	      name="people.debian.org"> instead.
 	    </item>
-	    <tag><tt>$ cd linux-2.6</tt></tag>
+	    <tag><tt>$ cd linux</tt></tag>
 	    <tag><tt>$ debian/rules orig</tt></tag>
 	    <item>
 	      This unpacks the upstream source and merges it with
@@ -228,7 +238,7 @@ $ python debian/bin/genorig.py ~/src/linux
 	</p>
 	<p>
 	  Either of these will generate a file such as
-	  <tt>../orig/linux-2.6_3.5~rc1.orig.tar.gz</tt>.
+	  <tt>../orig/linux_3.5~rc1.orig.tar.gz</tt>.
 	  You can then combine this tarball with the Debian packaging
 	  by running:
 	  <example>
diff --git a/chapter-packaging.sgml b/chapter-packaging.sgml
index e9258d4..f03c9f7 100644
--- a/chapter-packaging.sgml
+++ b/chapter-packaging.sgml
@@ -9,12 +9,12 @@
       architectures as possible, starting with 2.6.12 the kernel team
       introduced a new packaging scheme. In it most of the
       kernel-related binary packages are built from a single source
-      package <tt>linux-2.6</tt>. The 
-      <tt>linux-2.6</tt> source package supports building of kernel
+      package <tt>linux</tt>. The 
+      <tt>linux</tt> source package supports building of kernel
       images and headers for all currently supported
       architectures. Subsequent sections of this chapter document the
       naming and contents of the binary packages built from the
-      <tt>linux-2.6</tt> source package.
+      <tt>linux</tt> source package.
 
     </p>
     <sect id="arch-indep">
diff --git a/chapter-source.sgml b/chapter-source.sgml
index 17c5612..1e1aba6 100644
--- a/chapter-source.sgml
+++ b/chapter-source.sgml
@@ -14,7 +14,7 @@
       Guidelines (DFSG), parts of the kernel are removed in order to
       distribute the source in the <tt>main</tt> section of the Debian
       archive. Such removal produces
-      <tt>linux-2.6_<em>version</em>.orig.tar.gz</tt> tarball, which
+      <tt>linux_<em>version</em>.orig.tar.gz</tt> tarball, which
       serves as the original upstream source. <em>version</em>
       is the actual upstream version.
 
@@ -48,16 +48,16 @@
 
       The source from which the Debian binary kernels are built is
       obtained by taking the source from
-      <tt>linux-2.6_<em>version</em>.orig.tar.gz</tt> (that
+      <tt>linux_<em>version</em>.orig.tar.gz</tt> (that
       is, pristine kernel source with problematic parts removed)
       and applying a set of Debian
       patches. These patches typically implement essential fixes for
       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 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,
+      kernel (like 3.2.20) and <tt><em>revision</em></tt> determines
+      the patchlevel. For example, the packages with version 3.2.20-1
+      are built from the <tt>linux_3.2.20.orig.tar.gz</tt> source,
       patched up to patchlevel 1. Certain packages include extra
       'featuresets' not included in the upstream source, such as
       <tt>rt</tt>.
diff --git a/debian/changelog b/debian/changelog
index eb9f6c6..65b6d5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ kernel-handbook (1.0.13) UNRELEASED; urgency=low
     no longer supported
   * Use 3.x version numbers and current flavour and featureset names in
     examples
+  * Refer to the linux source package rather than linux-2.6
 
  -- 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/052ad2d3/attachment-0001.pgp>


More information about the Kernel-handbook-general mailing list