From f6d7f48f61019cbeb5728bbe497364d68e8c0813 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Wed, 4 Oct 2006 16:48:34 +0000
Subject: Upgrade to Linux-2.6.18

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7809 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 3 +++
 chapter01/whatsnew.xml  | 3 +++
 chapter03/patches.xml   | 8 --------
 chapter08/kernel.xml    | 7 -------
 packages.ent            | 6 +++---
 patches.ent             | 5 -----
 6 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 4ace9846c..f5cc22da6 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -49,6 +49,9 @@
     <listitem>
       <para>2006-10-02</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Linux-2.6.18.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to Glibc-2.5.</para>
         </listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index af3ee435e..b2ae9a0ad 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -215,6 +215,9 @@
     <listitem>
       <para>glibc-2.3.6-linux_types-1.patch</para>
     </listitem>
+    <listitem>
+      <para>linux-2.6.17.13-utf8_input-1.patch</para>
+    </listitem>
 
   </itemizedlist>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 3e2bca37e..9610dd65f 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -170,14 +170,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Linux kernel UTF-8 Composing Patch - <token>&linux-utf8-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&linux-utf8-patch;"/></para>
-        <para>MD5 sum: <literal>&linux-utf8-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Linux Libc Headers Inotify Patch - <token>&linux-inotify-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index 4ef9bb44e..7d410cabe 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -39,13 +39,6 @@
     in the kernel source tree for alternative methods to the way this book
     configures the kernel.</para>
 
-    <para>By default, the Linux kernel generates wrong sequences of bytes when
-    dead keys are used in UTF-8 keyboard mode. Also, one cannot copy and paste
-    non-ASCII characters when UTF-8 mode is active. Fix these issues with the
-    patch:</para>
-
-<screen><userinput>patch -Np1 -i ../&linux-utf8-patch;</userinput></screen>
-
     <para>Prepare for compilation by running the following command:</para>
 
 <screen><userinput>make mrproper</userinput></screen>
diff --git a/packages.ent b/packages.ent
index 5018183ca..802d88bf5 100644
--- a/packages.ent
+++ b/packages.ent
@@ -298,10 +298,10 @@
 <!ENTITY libtool-ch6-sbu "0.1 SBU">
 
 <!ENTITY linux-dl-version "2.6">
-<!ENTITY linux-version "2.6.17.13">
-<!ENTITY linux-size "40,320 KB">
+<!ENTITY linux-version "2.6.18">
+<!ENTITY linux-size "40,882 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.bz2">
-<!ENTITY linux-md5 "834885b3ad9988b966570bee92459572">
+<!ENTITY linux-md5 "296a6d150d260144639c3664d127d174">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!ENTITY linux-ch8-du "310 - 350 MB">
 <!ENTITY linux-ch8-sbu "1.5 - 3 SBU">
diff --git a/patches.ent b/patches.ent
index ac65e7eb5..eb6d04db4 100644
--- a/patches.ent
+++ b/patches.ent
@@ -90,11 +90,6 @@
 <!ENTITY kbd-gcc4_fixes-patch-size "1.4 KB">
 
 
-<!ENTITY linux-utf8-patch "linux-&linux-version;-utf8_input-1.patch">
-<!ENTITY linux-utf8-patch-md5 "af8bddc93d6b368aa4c8ecdff2d3ab76">
-<!ENTITY linux-utf8-patch-size "11 KB">
-
-
 <!ENTITY linux-inotify-patch "linux-libc-headers-&linux-libc-headers-version;-inotify-3.patch">
 <!ENTITY linux-inotify-patch-md5 "8fd71a4bd3344380bd16caf2c430fa9b">
 <!ENTITY linux-inotify-patch-size "4.7 KB">
-- 
cgit v1.2.3-54-g00ecf