From 307d0a23a321bb7ee2879a43c1f012924ef8239e Mon Sep 17 00:00:00 2001
From: Jeremy Utley <jeremy@linuxfromscratch.org>
Date: Sun, 26 Dec 2004 01:04:56 +0000
Subject: [PATCH] Upgraded unstable to util-linux-2.12p - added Alexander's
 patch as adapted from the debian cramfs utilities package

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@4458 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml  | 5 ++---
 chapter03/patches.xml    | 6 ++++++
 chapter06/util-linux.xml | 5 +++++
 general.ent              | 2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index fab8e5f4c..ccbc18dbe 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -28,16 +28,15 @@ of the LFS Book.</para>
 <listitem><para>sysvinit-2.86</para></listitem>
 <listitem><para>tcl-8.4.9</para></listitem>
 <listitem><para>udev-049</para></listitem>
-<listitem><para>util-linux-2.12l</para></listitem>
+<listitem><para>util-linux-2.12p</para></listitem>
 </itemizedlist>
 </listitem>
 
-<!--
 <listitem><para>Added:</para>
 <itemizedlist>
+<listitem><para>util-linux-2.12p-cramfs-1.patch</para></listitem>
 </itemizedlist>
 </listitem>
---> 
 
 <listitem><para>Removed:</para>
 <itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index e6060645c..7875036f2 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -141,6 +141,12 @@ following:</para>
 </listitem>
 </varlistentry>
 
+<varlistentry>
+<term>Util-linux Cramfs Patch - 2kb:</term> <listitem>
+<para><ulink url="&patches-root;util-linux-&util-linux-version;-cramfs-1.patch"/></para>
+</listitem>
+</varlistentry>
+
 </variablelist>
 
 <!--
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index ab65e24e7..3e1ca3082 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -32,6 +32,11 @@ mkdir -p /var/lib/hwclock</userinput></screen>
 <sect2 role="installation">
 <title>Installation of Util-linux</title>
 
+<para>Util-linux has a compilation error against newer versions of the
+linux-libc-headers.  The following patch properly fixes that issue</para>
+
+<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-cramfs-1.patch</userinput></screen>
+
 <para>Prepare Util-linux for compilation:</para>
 
 <screen><userinput>./configure</userinput></screen>
diff --git a/general.ent b/general.ent
index 10529d8f6..65f3138e2 100644
--- a/general.ent
+++ b/general.ent
@@ -67,7 +67,7 @@
 <!ENTITY tar-version "1.14">
 <!ENTITY tcl-version "8.4.9">
 <!ENTITY texinfo-version "4.7">
-<!ENTITY util-linux-version "2.12l">
+<!ENTITY util-linux-version "2.12p">
 <!ENTITY udev-version "049">
 <!ENTITY vim-version "6.3">
 <!ENTITY zlib-version "1.2.2">