Changeset e611bb9


Ignore:
Timestamp:
May 3, 2014, 1:21:12 PM (7 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
665c544
Parents:
bd99508
Message:

Fix compile error for colo and colo pages more readable

Location:
BOOK
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • BOOK/boot/mips/colo-build.xml

    rbd99508 re611bb9  
    3737    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3838    href="../../final-system/mips/colo.xml"
     39    xpointer="xpointer(//*[@os='s1'])"/>
     40
     41<screen os="s2"><userinput>cp -v stage2/Makefile{,.orig}
     42sed '/^CFLAGS/s/-Werror //' stage2/Makefile.orig > stage2/Makefile</userinput></screen>
     43
     44    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     45    href="../../final-system/mips/colo.xml"
    3946    xpointer="xpointer(//*[@os='b'])"/>
    4047
  • BOOK/boot/mips64/colo-build.xml

    rbd99508 re611bb9  
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="../mips/colo-build.xml"
     27    xpointer="xpointer(//*[@os='a'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2630    href="../../final-system/mips64/colo.xml"
    2731    xpointer="xpointer(//*[@os='p1'])"/>
     
    4145    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4246    href="../mips/colo-build.xml"
    43     xpointer="xpointer(//*[@os='a'])"/>
     47    xpointer="xpointer(//*[@os='s1'])"/>
     48
     49    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     50    href="../mips/colo-build.xml"
     51    xpointer="xpointer(//*[@os='s2'])"/>
     52
     53    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     54    href="../mips/colo-build.xml"
     55    xpointer="xpointer(//*[@os='b'])"/>
    4456
    4557<screen os="aa"><userinput>cd tools/elf2rfx
     
    5062    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5163    href="../mips/colo-build.xml"
    52     xpointer="xpointer(//*[@os='b'])"/>
     64    xpointer="xpointer(//*[@os='c'])"/>
    5365
    5466    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/final-system/mips/colo.xml

    rbd99508 re611bb9  
    3434
    3535<screen os="p4"><userinput>patch -Np1 -i ../&colo-relocation-patch;</userinput></screen>
     36
     37    <para os="s1">Disable -Werror in one of the <filename>Makefile</filename>s
     38    to prevent a compile failure:</para>
     39
     40<screen os="s2"><userinput>sed -i '/^CFLAGS/s/-Werror //' stage2/Makefile</userinput></screen>
    3641
    3742    <para os="b">Compile the Colo package:</para>
  • BOOK/final-system/mips64/colo.xml

    rbd99508 re611bb9  
    2222    <title>Installation of Colo</title>
    2323
     24    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     25    href="../mips/colo.xml"
     26    xpointer="xpointer(//*[@os='a'])"/>
     27
    2428    <para os="p1">This patch updates the Colo bootloader to build under
    2529    64 bit:</para>
     
    3741    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3842    href="../mips/colo.xml"
    39     xpointer="xpointer(//*[@os='a'])"/>
     43    xpointer="xpointer(//*[@os='s1'])"/>
     44
     45    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     46    href="../mips/colo.xml"
     47    xpointer="xpointer(//*[@os='s2'])"/>
    4048
    4149    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/introduction/mips/changelog.xml

    rbd99508 re611bb9  
    3434-->
    3535    <listitem>
     36      <para>03 May 2014</para>
     37      <itemizedlist>
     38        <listitem>
     39          <para>[Chris] - Added sed command to disable -Werror in one of
     40          Colo's Makefiles to allow it to build.</para>
     41        </listitem>
     42      </itemizedlist>
     43    </listitem>
     44
     45    <listitem>
    3646      <para>24 October 2013</para>
    3747      <itemizedlist>
  • BOOK/introduction/mips64-64/changelog.xml

    rbd99508 re611bb9  
    3434-->
    3535    <listitem>
     36      <para>03 May 2014</para>
     37      <itemizedlist>
     38        <listitem>
     39          <para>[Chris] - Added sed command to disable -Werror in one of
     40          Colo's Makefiles to allow it to build.</para>
     41        </listitem>
     42      </itemizedlist>
     43    </listitem>
     44
     45    <listitem>
    3646      <para>24 October 2013</para>
    3747      <itemizedlist>
  • BOOK/introduction/mips64/changelog.xml

    rbd99508 re611bb9  
    3434-->
    3535    <listitem>
     36      <para>03 May 2014</para>
     37      <itemizedlist>
     38        <listitem>
     39          <para>[Chris] - Added sed command to disable -Werror in one of
     40          Colo's Makefiles to allow it to build.</para>
     41        </listitem>
     42      </itemizedlist>
     43    </listitem>
     44
     45    <listitem>
    3646      <para>29 April 2014</para>
    3747      <itemizedlist>
Note: See TracChangeset for help on using the changeset viewer.