r4165 - in branches/testing/BOOK: chapter01 chapter03 chapter06

jeremy at linuxfromscratch.org jeremy at linuxfromscratch.org
Mon Sep 13 18:28:46 PDT 2004


Author: jeremy
Date: 2004-09-13 19:28:44 -0600 (Mon, 13 Sep 2004)
New Revision: 4165

Modified:
   branches/testing/BOOK/chapter01/changelog.xml
   branches/testing/BOOK/chapter03/patches.xml
   branches/testing/BOOK/chapter06/util-linux.xml
Log:
Changed the sed to fix util-linux compilation to a patch file, which has been submitted to patches project

Modified: branches/testing/BOOK/chapter01/changelog.xml
===================================================================
--- branches/testing/BOOK/chapter01/changelog.xml	2004-09-13 22:56:57 UTC (rev 4164)
+++ branches/testing/BOOK/chapter01/changelog.xml	2004-09-14 01:28:44 UTC (rev 4165)
@@ -66,6 +66,7 @@
 <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>vim-6.3 language files</para></listitem>
 </itemizedlist>
 </listitem>
@@ -84,6 +85,9 @@
 </itemizedlist>
 </listitem>
 
+<listitem><para>September 13th, 2004 [jeremy]: Replaced the util-linux sed
+with a patch file instead.</para></listitem>
+
 <listitem><para>September 12th, 2004 [manuel]: Fixed some URLs.</para></listitem>
 
 <listitem><para>September 10th, 2004 [manuel]: Appendix{a,b} - Changes in

Modified: branches/testing/BOOK/chapter03/patches.xml
===================================================================
--- branches/testing/BOOK/chapter03/patches.xml	2004-09-13 22:56:57 UTC (rev 4164)
+++ branches/testing/BOOK/chapter03/patches.xml	2004-09-14 01:28:44 UTC (rev 4165)
@@ -140,6 +140,12 @@
 </listitem>
 </varlistentry>
 
+<varlistentry>
+<term>Util-Linux Sfdisk Patch - 1 KB:</term> <listitem>
+<para><ulink url="&patches-root;util-linux-&util-linux-version;-sfdisk-1.patch"/></para>
+</listitem>
+</varlistentry>
+
 </variablelist>
 
 <para>In addition to the above required patches, there exist a number of

Modified: branches/testing/BOOK/chapter06/util-linux.xml
===================================================================
--- branches/testing/BOOK/chapter06/util-linux.xml	2004-09-13 22:56:57 UTC (rev 4164)
+++ branches/testing/BOOK/chapter06/util-linux.xml	2004-09-14 01:28:44 UTC (rev 4165)
@@ -47,11 +47,10 @@
 <title>Installation of Util-linux</title>
 
 <para>GCC-&gcc-version; miscompiles <command>sfdisk</command> if the
-default optimisation level is used.  The following command
+default optimisation level is used.  The following patch
 corrects the problem:</para>
 
-<screen><userinput>sed -i -e 's%^include ../MCONFIG%'\
-'&\n\nCFLAGS:=$(CFLAGS) -fno-unit-at-a-time%' fdisk/Makefile</userinput></screen>
+<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-sfdisk-1.patch</userinput></screen>
 
 <para>Prepare Util-linux for compilation:</para>
 




More information about the lfs-book mailing list