Przeglądaj źródła

Upgraded unstable to Util-Linux-2.12d, changed from sed fix to patch for the sfdisk problem

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@4179 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Jeremy Utley 21 lat temu
rodzic
commit
22d95f830d
4 zmienionych plików z 15 dodań i 5 usunięć
  1. 5 1
      chapter01/changelog.xml
  2. 6 0
      chapter03/patches.xml
  3. 1 1
      chapter06/util-linux.xml
  4. 3 3
      general.ent

+ 5 - 1
chapter01/changelog.xml

@@ -44,7 +44,7 @@ first a summary, then a detailed log.</para>
 <listitem><para>sed-4.1.2</para></listitem>
 <listitem><para>tar-1.14</para></listitem>
 <listitem><para>tcl-8.4.7</para></listitem>
-<listitem><para>util-linux-2.12c</para></listitem>
+<listitem><para>util-linux-2.12d</para></listitem>
 <listitem><para>vim-6.3</para></listitem>
 </itemizedlist>
 </listitem>
@@ -73,6 +73,7 @@ first a summary, then a detailed log.</para>
 <listitem><para>udev-config-1.permissions</para></listitem>
 <listitem><para>udev-config-1.rules</para></listitem>
 <listitem><para>util-linux-2.12a-kernel_headers-1.patch</para></listitem>
+<listitem><para>util-linux-2.12d-sfdisk-1.patch</para></listitem>
 <listitem><para>vim-6.3 language files</para></listitem>
 <listitem><para>zlib-1.2.1-security-1.patch</para></listitem>
 </itemizedlist>
@@ -94,6 +95,9 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>September 20th, 2004 [jeremy]: Upgraded to Util-Linux 2.12d,
+and replaced the sed with a patch to fix the sfdisk problem</para></listitem>
+
 <listitem><para>September 14th, 2004 [jim]: Removed reference to
 sysklogd.</para></listitem>
 

+ 6 - 0
chapter03/patches.xml

@@ -155,6 +155,12 @@ following:</para>
 </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>
+
 <varlistentry>
 <term>Zlib Security Patch - 1KB:</term> <listitem>
 <para><ulink url="&patches-root;zlib-&zlib-version;-security-1.patch"/></para>

+ 1 - 1
chapter06/util-linux.xml

@@ -47,7 +47,7 @@ mkdir -p /var/lib/hwclock</userinput></screen>
 default optimisation level is used.  The following command prevents the
 problematic optimisation pass from being used.</para>
 
-<screen><userinput>sed -i -e 's%^include ../MCONFIG%&amp;\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>
 

+ 3 - 3
general.ent

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20040914">
-<!ENTITY releasedate "September 14, 2004">
+<!ENTITY version "SVN-20040920">
+<!ENTITY releasedate "September 20, 2004">
 <!ENTITY milestone "6.1">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
@@ -68,7 +68,7 @@
 <!ENTITY tar-version "1.14">
 <!ENTITY tcl-version "8.4.7">
 <!ENTITY texinfo-version "4.7">
-<!ENTITY util-linux-version "2.12c">
+<!ENTITY util-linux-version "2.12d">
 <!ENTITY udev-version "030">
 <!ENTITY vim-version "6.3">
 <!ENTITY zlib-version "1.2.1">