diff options
| author | Jeremy Utley <jeremy@linuxfromscratch.org> | 2004-09-20 08:51:31 +0000 |
|---|---|---|
| committer | Jeremy Utley <jeremy@linuxfromscratch.org> | 2004-09-20 08:51:31 +0000 |
| commit | 22d95f830d40ba881ada1869595d2cce5c762246 (patch) | |
| tree | 40fec0bcaaac2250bfb48815b44d5f7cad054451 | |
| parent | 3879ebc975aacd894f9d55b6f0a352c8ef260a1f (diff) | |
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
| -rw-r--r-- | chapter01/changelog.xml | 6 | ||||
| -rw-r--r-- | chapter03/patches.xml | 6 | ||||
| -rw-r--r-- | chapter06/util-linux.xml | 2 | ||||
| -rw-r--r-- | general.ent | 6 |
4 files changed, 15 insertions, 5 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 0ebd451f8..c3e7b4b21 100644 --- a/chapter01/changelog.xml +++ b/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> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 9835a180f..fccd76718 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -156,6 +156,12 @@ following:</para> </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> </listitem> diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml index a9ffdf088..7e1da38a5 100644 --- a/chapter06/util-linux.xml +++ b/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%&\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> diff --git a/general.ent b/general.ent index 5050095f7..e2f978e47 100644 --- a/general.ent +++ b/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"> |