From 956dfc8bde5a57f543eb0a38ac38e1396c60f301 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Mon, 30 Jan 2012 21:19:48 +0000
Subject: Move Xz to before GRUB to allow handling compressed kernel images.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9722 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 appendices/dependencies.xml | 4 ++--
 chapter01/changelog.xml     | 4 ++++
 chapter06/chapter06.xml     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index dd5430af4..8eda55253 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -838,7 +838,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Bison, Coreutils, Diffutils, GCC, Gettext, Glibc, 
-         Grep, Make, Ncurses, Sed, and Texinfo</seg>
+         Grep, Make, Ncurses, Sed, Texinfo, and Xz</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2072,7 +2072,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Kmod, Man-DB, Udev</seg>
+          <seg>GRUB, Kmod, Man-DB, Udev</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c274933cd..727d3f9ac 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
     <listitem>
       <para>2012-01-30</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Move Xz to before GRUB so that the latter can
+          support compressed kernel images.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to Udev-180. Fixes
           <ulink url="&lfs-ticket-root;3008">#3008</ulink>.</para>
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index b1a71197a..c2eb594c7 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -54,11 +54,11 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="groff.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grub.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpipeline.xml"/>
-- 
cgit v1.2.3-54-g00ecf