diff options
| -rw-r--r-- | chapter01/changelog.xml | 5 | ||||
| -rw-r--r-- | chapter03/patches.xml | 7 | ||||
| -rw-r--r-- | chapter06/grub.xml | 5 | ||||
| -rw-r--r-- | chapter08/grub.xml | 2 | ||||
| -rw-r--r-- | general.ent | 6 |
5 files changed, 8 insertions, 17 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 00f2b48b8..f2b16682a 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -41,7 +41,6 @@ first a summary, then a detailed log.</para> <itemizedlist> <listitem><para>coreutils-5.2.1-suppress_hostname_uptime_kill_su-1.patch</para></listitem> <listitem><para>flex-2.5.31-debian_fixes-2.patch</para></listitem> -<listitem><para>grub-0.94-gcc34-1.patch</para></listitem> <listitem><para>hotplug-2004_04_01</para></listitem> <listitem><para>hotplug-2004_04_01-bogus_deps-1.patch</para></listitem> <listitem><para>hotplug-2004_04_01-device-2.patch</para></listitem> @@ -76,6 +75,10 @@ first a summary, then a detailed log.</para> </itemizedlist> </listitem> +<listitem><para>June 14, 2004 [winkie]: Upgraded to GRUB 0.95. Removed the +<quote>--no-mem-option</quote> argument from GRUB's +<filename>menu.lst</filename>, since it is now the default.</para></listitem> + <listitem><para>June 13, 2004 [alexander]: Security: added linux-2.6.6-fpu-1.patch</para></listitem> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 5c025070a..47e4c8dca 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -64,13 +64,6 @@ following:</para> </varlistentry> <varlistentry> -<term>GRUB GCC 3.4 Compatibility Patch - 1 KB:</term> -<listitem> -<para><ulink url="&patches-root;grub-&grub-version;-gcc34-1.patch"/></para> -</listitem> -</varlistentry> - -<varlistentry> <term>Hotplug Bogus Dependencies Patch- 1 KB:</term> <listitem> <para><ulink url="&patches-root;hotplug-&hotplug-version;-bogus_deps-1.patch"/></para> diff --git a/chapter06/grub.xml b/chapter06/grub.xml index e7175e231..2c5875b74 100644 --- a/chapter06/grub.xml +++ b/chapter06/grub.xml @@ -34,11 +34,6 @@ have defined any environment variables that override default optimizations, such as CFLAGS and CXXFLAGS, we recommend un-setting them when building Grub.</para> -<para>This package also has issues with being compiled by GCC 3.4, which we -fix by applying the following patch:</para> - -<screen><userinput>patch -Np1 -i ../grub-&grub-version;-gcc34-1.patch</userinput></screen> - <para>Prepare Grub for compilation:</para> <screen><userinput>./configure --prefix=/usr</userinput></screen> diff --git a/chapter08/grub.xml b/chapter08/grub.xml index 4db1dbfef..c8ab79d53 100644 --- a/chapter08/grub.xml +++ b/chapter08/grub.xml @@ -94,7 +94,7 @@ color green/black light-green/black # The first entry is for LFS. title LFS &version; root (hd0,3) -kernel --no-mem-option /boot/lfskernel-&linux-version; root=/dev/hda4 +kernel /boot/lfskernel-&linux-version; root=/dev/hda4 <userinput>EOF</userinput></screen> <note><para>By default, Grub will automatically pass a <quote>mem=xxx</quote> diff --git a/general.ent b/general.ent index 332239469..36ada74ea 100644 --- a/general.ent +++ b/general.ent @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!ENTITY version "CVS-20040613"> -<!ENTITY releasedate "June 13, 2004"> +<!ENTITY version "CVS-20040614"> +<!ENTITY releasedate "June 14, 2004"> <!ENTITY milestone "6.0"> <!ENTITY lfs-root "http://www.linuxfromscratch.org/"> @@ -37,7 +37,7 @@ <!ENTITY glibc-version "2.3.4-20040529"> <!ENTITY grep-version "2.5.1"> <!ENTITY groff-version "1.19.1"> -<!ENTITY grub-version "0.94"> +<!ENTITY grub-version "0.95"> <!ENTITY gzip-version "1.3.5"> <!ENTITY hotplug-version "2004_04_01"> <!ENTITY iana-etc-version "1.00"> |