cvs commit: LFS/BOOK/chapter08 grub.xml

winkie at linuxfromscratch.org winkie at linuxfromscratch.org
Mon Jun 14 08:17:44 PDT 2004


winkie      04/06/14 09:17:44

  Modified:    BOOK     general.ent
               BOOK/chapter01 changelog.xml
               BOOK/chapter03 patches.xml
               BOOK/chapter06 grub.xml
               BOOK/chapter08 grub.xml
  Log:
  Upgraded to GRUB 0.95
  
  Revision  Changes    Path
  1.45      +3 -3      LFS/BOOK/general.ent
  
  Index: general.ent
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/general.ent,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- general.ent	13 Jun 2004 16:19:59 -0000	1.44
  +++ general.ent	14 Jun 2004 15:17:44 -0000	1.45
  @@ -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">
  
  
  
  1.807     +4 -1      LFS/BOOK/chapter01/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter01/changelog.xml,v
  retrieving revision 1.806
  retrieving revision 1.807
  diff -u -r1.806 -r1.807
  --- changelog.xml	13 Jun 2004 18:24:29 -0000	1.806
  +++ changelog.xml	14 Jun 2004 15:17:44 -0000	1.807
  @@ -41,7 +41,6 @@
   <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 @@
   </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>
   
  
  
  
  1.20      +0 -7      LFS/BOOK/chapter03/patches.xml
  
  Index: patches.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter03/patches.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- patches.xml	13 Jun 2004 16:20:00 -0000	1.19
  +++ patches.xml	14 Jun 2004 15:17:44 -0000	1.20
  @@ -64,13 +64,6 @@
   </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>
  
  
  
  1.18      +0 -5      LFS/BOOK/chapter06/grub.xml
  
  Index: grub.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/grub.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- grub.xml	11 Jun 2004 15:49:18 -0000	1.17
  +++ grub.xml	14 Jun 2004 15:17:44 -0000	1.18
  @@ -34,11 +34,6 @@
   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>
  
  
  
  1.24      +1 -1      LFS/BOOK/chapter08/grub.xml
  
  Index: grub.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter08/grub.xml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- grub.xml	4 May 2004 17:34:59 -0000	1.23
  +++ grub.xml	14 Jun 2004 15:17:44 -0000	1.24
  @@ -94,7 +94,7 @@
   # 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>
  
  
  



More information about the lfs-book mailing list