Changeset 162e1b4 for BOOK


Ignore:
Timestamp:
Jan 20, 2012, 2:15:38 PM (13 years ago)
Author:
Jonathan Norman <jon@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
ff6796f
Parents:
91b8781 (diff), a5f7c53e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Updated Yaboot to 1.3.17 for Master

Location:
BOOK
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • BOOK/boot/ppc/yaboot-build.xml

    r91b8781 r162e1b4  
    3333    loader. It also tries to change user and group ownership for the installed
    3434    files to <systemitem class="username">root</systemitem>, which the
    35     <systemitem class="username">clfs</systemitem> user cannot do. The following
    36     command fixes both issues:</para>
     35    <systemitem class="username">clfs</systemitem> user cannot do. It will also
     36    fail due to a compile warning with the -Werror flag on.   The following
     37    command fixes these issues:</para>
    3738
    3839<screen><userinput>cp -v Makefile{,.orig}
    3940sed -e "s/\(strip \)/${CLFS_TARGET}-\1/" \
    4041    -e 's/-o root -g root//' \
     42    -e 's/-Werror//' \
    4143    Makefile.orig &gt; Makefile</userinput></screen>
    4244

  • BOOK/boot/ppc64/yaboot-build.xml

    r91b8781 r162e1b4  
    4343            -e "s/\(strip \)/${CLFS_TARGET}-\1/" \
    4444            -e 's/-o root -g root//' \
     45            -e 's/-Werror//' \
    4546    Makefile.orig &gt; Makefile</userinput></screen>
    4647

  • BOOK/final-system/ppc/yaboot.xml

    r91b8781 r162e1b4  
    3131
    3232<screen os="b"><userinput>sed -i 's%/usr/local%/usr%' man/*</userinput></screen>
     33
     34    <para os="aa"> Prevent the build from failing due to warnings with
     35    the following sed:</para>
     36
     37<screen os="ba"><userinput>sed -i 's%-Werror%%' Makefile</userinput></screen>
    3338
    3439    <para os="c">Compile the package:</para>

  • BOOK/final-system/ppc64/yaboot.xml

    r91b8781 r162e1b4  
    2424    <para>Existing multilib distributions alter gcc to default to 32-bit
    2525    output.  Because our gcc defaults to 64-bit, we need to pass appropriate
    26     options to both the compiler and the linker.  The Makefile already
    27     overrides any CC and ignores LDFLAGS in favour of its own variables, so we
    28     need to use the following seds for a successful compile and install.</para>
     26    options to both the compiler and the linker.  To prevent the build from
     27    failing due to compiler warnings, the -Werror flag is removed.  The
     28    Makefile already overrides any CC and ignores LDFLAGS in favour of
     29    its own variables, so we need to use the following seds for a
     30    successful compile and install.</para>
    2931
    3032<screen><userinput>sed -i -e "s/\(-print-libgcc-file-name\)/${BUILD32} \1/" \
     33    -e "s/-Werror//" \
    3134    -e "s/\(-Bstatic\)/-melf32ppclinux \1/" Makefile
    3235</userinput></screen>
    … …  
    4144          variable and inserts the flag to force <command>gcc</command> to
    4245          create 32-bit code when compiling yaboot.</para>
     46        </listitem>
     47      </varlistentry>
     48      <varlistentry>
     49        <term><parameter>"s/-Werror//"</parameter></term>
     50        <listitem>
     51          <para>This deletes the -Werror flag from the Makefile.</para>
    4352        </listitem>
    4453      </varlistentry>

  • BOOK/general.ent

    r91b8781 r162e1b4  
    11<?xml version="1.0" encoding="ISO-8859-1"?>
    22
    3 <!ENTITY month "12"> <!-- Use two digits -->
    4 <!ENTITY month_name "December">
    5 <!ENTITY day "10"> <!-- Use two digits -->
    6 <!ENTITY year "2011"> <!-- Use four digits -->
     3<!ENTITY month "01"> <!-- Use two digits -->
     4<!ENTITY month_name "January">
     5<!ENTITY day "20"> <!-- Use two digits -->
     6<!ENTITY year "2012"> <!-- Use four digits -->
    77
    88<!ENTITY releasedate "&month_name; &day;, &year;">

  • BOOK/introduction/ppc/changelog.xml

    r91b8781 r162e1b4  
    3333
    3434-->
     35    <listitem>
     36      <para>January 20, 2012</para>
     37      <itemizedlist>
     38        <listitem>
     39          <para>[Jonathan] - Updated Yaboot from 1.3.14 to 1.3.17 thanks to Code Monkey.</para>
     40        </listitem>
     41      </itemizedlist>
     42    </listitem>
    3543
    3644    <listitem>

  • BOOK/introduction/ppc64/changelog.xml

    r91b8781 r162e1b4  
    3333
    3434-->
     35    <listitem>
     36      <para>January 20, 2012</para>
     37      <itemizedlist>
     38        <listitem>
     39          <para>[Jonathan] - Updated Yaboot from 1.3.14 to 1.3.17 thanks to Code Monkey.</para>
     40        </listitem>
     41      </itemizedlist>
     42    </listitem>
    3543
    3644    <listitem>

  • BOOK/packages.ent

    r91b8781 r162e1b4  
    461461<!ENTITY xz-home "http://tukaani.org/xz/">
    462462
    463 <!ENTITY yaboot-version "1.3.14">
    464 <!ENTITY yaboot-size "213 KB">
     463<!ENTITY yaboot-version "1.3.17">
     464<!ENTITY yaboot-size "219 KB">
    465465<!ENTITY yaboot-url "http://yaboot.ozlabs.org/releases/yaboot-&yaboot-version;.tar.gz">
    466 <!ENTITY yaboot-md5 "9b1246c474eeb37f61081ad762563b35">
     466<!ENTITY yaboot-md5 "f599f52d1887a86fd798252d2946f635">
    467467<!ENTITY yaboot-home "http://yaboot.ozlabs.org">
    468468
Note: See TracChangeset for help on using the changeset viewer.