cvs commit: LFS/BOOK/chapter06 grub.xml

winkie at linuxfromscratch.org winkie at linuxfromscratch.org
Fri Jun 11 08:49:18 PDT 2004


winkie      04/06/11 09:49:18

  Modified:    BOOK/chapter01 changelog.xml
               BOOK/chapter03 patches.xml
               BOOK/chapter06 grub.xml
  Log:
  Dropped GRUB hack in favor of the real upstream fix
  
  Revision  Changes    Path
  1.801     +4 -0      LFS/BOOK/chapter01/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter01/changelog.xml,v
  retrieving revision 1.800
  retrieving revision 1.801
  diff -u -r1.800 -r1.801
  --- changelog.xml	11 Jun 2004 14:31:57 -0000	1.800
  +++ changelog.xml	11 Jun 2004 15:49:18 -0000	1.801
  @@ -59,6 +59,7 @@
   <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>
  @@ -106,6 +107,9 @@
   </itemizedlist>
   </listitem>
   
  +<listitem><para>June 11, 2004 [winkie]: Dropped hackish GRUB instructions in
  +favor of a patch from upstream.</para></listitem>
  +
   <listitem><para>June 11, 2004 [winkie]: Force Readline to link against Ncurses.
   </para></listitem>
   
  
  
  
  1.18      +7 -0      LFS/BOOK/chapter03/patches.xml
  
  Index: patches.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter03/patches.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- patches.xml	11 Jun 2004 11:19:41 -0000	1.17
  +++ patches.xml	11 Jun 2004 15:49:18 -0000	1.18
  @@ -64,6 +64,13 @@
   </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.17      +5 -6      LFS/BOOK/chapter06/grub.xml
  
  Index: grub.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/grub.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- grub.xml	24 May 2004 21:37:21 -0000	1.16
  +++ grub.xml	11 Jun 2004 15:49:18 -0000	1.17
  @@ -34,15 +34,14 @@
   such as CFLAGS and CXXFLAGS, we recommend un-setting them when building
   Grub.</para>
   
  -<para>First prepare Grub for compilation:</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>./configure --prefix=/usr</userinput></screen>
  +<screen><userinput>patch -Np1 -i ../grub-&grub-version;-gcc34-1.patch</userinput></screen>
   
  -<para>A few of the files comprising Grub have issues with optimizations done
  -by GCC 3.4. Compile these few files with known-good optimizations:</para>
  +<para>Prepare Grub for compilation:</para>
   
  -<screen><userinput>make -C stage2 STAGE2_CFLAGS=-O2 \
  -    pre_stage2_exec-builtins.o pre_stage2_exec-serial.o</userinput></screen>
  +<screen><userinput>./configure --prefix=/usr</userinput></screen>
   
   <para>Now compile the rest of the package:</para>
   
  
  
  



More information about the lfs-book mailing list