[Kernel-handbook-general] [PATCH 4/7] Update explanation of source directories for quilted linux package

[Ben Hutchings]

---
 chapter-common-tasks.sgml |   27 ++++++++++++++++++++-------
 debian/changelog          |    1 +
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/chapter-common-tasks.sgml b/chapter-common-tasks.sgml
index 887ca46..b5192d1 100644
--- a/chapter-common-tasks.sgml
+++ b/chapter-common-tasks.sgml
@@ -86,16 +86,29 @@ $ fakeroot make -f debian/rules.real install-linux-base
 	  <heading>Applying patches or configuration changes</heading>
 	  <p>
 	    It is possible to apply extra patches to the source before
-	    starting the build. First, you should apply the existing
-	    patches by running:
+	    starting the build.  In the <tt>linux</tt> source package,
+	    The default (non-featureset) patches are automatically
+	    applied in the top level directory.  If you are building
+	    the <tt>linux-2.6</tt> source package or building with a
+	    featureset, you should first apply the existing patches by
+	    running:
 	    <example>
 $ fakeroot debian/rules source
 	    </example>
-	    You will then find the patched source in the subdirectories
-	    <tt>debian/build/source_<em>arch</em>_none</tt> (default) and
-	    <tt>debian/build/source_<em>arch</em>_<em>featureset</em></tt>
-	    (featuresets added).  You should apply the extra patches in
-	    the appropriate subdirectory.
+	    The patched source appears in the following directories.
+	    <taglist>
+	      <tag>linux default source:</tag>
+	      <item>top level</item>
+	      <tag>linux source with featureset:</tag>
+	      <item><tt>debian/build/source_<em>featureset</em></tt></item>
+	      <tag><tt>linux-2.6</tt> default source:</tag>
+	      <item><tt>debian/build/source_<em>arch</em>_none</tt></item>
+	      <tag><tt>linux-2.6</tt> source with featureset:</tag>
+	      <item><tt>debian/build/source_<em>arch</em>_<em>featureset</em></tt></item>
+	    </taglist>
+	    You should apply the extra patches in the appropriate
+	    directory. In the <tt>linux</tt> source package you can
+	    use the <tt>quilt</tt> utility to do this.
 	  </p>
 	  <p>
 	    To change the configuration before building, for example
diff --git a/debian/changelog b/debian/changelog
index b24a944..898cebb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ kernel-handbook (1.0.13) UNRELEASED; urgency=low
   * Refer to the linux source package rather than linux-2.6
   * Remove outdated advice to try disabling ACPI and IRQ routing options
   * Remove an unnecessary version qualification
+  * Update explanation of source directories for quilted linux package
 
  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 16 Dec 2011 05:26:30 +0000
 
-- 
1.7.10.4



-------------- 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/20120617/fff9e88f/attachment.pgp>