aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Utley <jeremy@linuxfromscratch.org>2004-09-23 18:23:07 +0000
committerJeremy Utley <jeremy@linuxfromscratch.org>2004-09-23 18:23:07 +0000
commitb09cc8e88e20501ba49cb680346138016488b6f0 (patch)
treecd6d266b3133eb2e544bf5c3eb4c9ed00c0a56c8
parentdff7de7d3a44806a2cd67bccdea780f8a00b0363 (diff)
Upgraded testing to the new, proper patch to util-linux to fix the sfdisk problem.
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/testing/BOOK@4199 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml5
-rw-r--r--chapter03/patches.xml2
-rw-r--r--chapter06/util-linux.xml2
-rw-r--r--general.ent4
4 files changed, 8 insertions, 5 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 09a840a16..6acd21ebe 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -67,7 +67,7 @@ first a summary, then a detailed log.</para>
<listitem><para>udev-030</para></listitem>
<listitem><para>udev-config-1.permissions</para></listitem>
<listitem><para>udev-config-1.rules</para></listitem>
-<listitem><para>util-linux-2.12b-sfdisk-1.patch</para></listitem>
+<listitem><para>util-linux-2.12b-sfdisk-2.patch</para></listitem>
<listitem><para>vim-6.3 language files</para></listitem>
<listitem><para>zlib-1.2.1-security-1.patch</para></listitem>
</itemizedlist>
@@ -87,6 +87,9 @@ first a summary, then a detailed log.</para>
</itemizedlist>
</listitem>
+<listitem><para>September 23rd, 2004 [jeremy]: Changed the util-linux patch to
+the new, corrected fix, courtesy of Jim Gifford and Greg Schafer</para></listitem>
+
<listitem><para>September 13th, 2004 [jeremy]: Added the security patch for
Zlib</para></listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 57d7c8f9c..ba2a5fd5b 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -148,7 +148,7 @@ needed to build an LFS system:</para>
<varlistentry>
<term>Util-Linux Sfdisk Patch - 1 KB:</term> <listitem>
-<para><ulink url="&patches-root;util-linux-&util-linux-version;-sfdisk-1.patch"/></para>
+<para><ulink url="&patches-root;util-linux-&util-linux-version;-sfdisk-2.patch"/></para>
</listitem>
</varlistentry>
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 88163cc63..229baa01d 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -50,7 +50,7 @@ mkdir -p /var/lib/hwclock</userinput></screen>
default optimisation level is used. The following patch
corrects the problem:</para>
-<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-sfdisk-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-sfdisk-2.patch</userinput></screen>
<para>Prepare Util-linux for compilation:</para>
diff --git a/general.ent b/general.ent
index 7dffb2933..f9fb0ac93 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "6.0-testing-20040913">
-<!ENTITY releasedate "September 13, 2004">
+<!ENTITY version "6.0-testing-20040923">
+<!ENTITY releasedate "September 23, 2004">
<!ENTITY lfs-root "http://www.linuxfromscratch.org/">
<!ENTITY blfs-root "&lfs-root;blfs/">