Changeset e92465d for BOOK


Ignore:
Timestamp:
Sep 13, 2009, 8:25:05 PM (15 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
0a81d23
Parents:
dca5b7b (diff), 32cb8ca (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:

Merge branch 'master' of git://git.cross-lfs.org/cross-lfs

Location:
BOOK
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • BOOK/final-system/64/gcc.xml

    rdca5b7b re92465d  
    2929    href="../common/gcc.xml"
    3030    xpointer="xpointer(//*[@os='p2'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     33    href="../common/gcc.xml"
     34    xpointer="xpointer(//*[@os='p3'])"/>
     35
     36    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     37    href="../common/gcc.xml"
     38    xpointer="xpointer(//*[@os='p4'])"/>
    3139
    3240    <para os="p5">Apply the following patch so that GCC links to
  • BOOK/final-system/common/eglibc.xml

    rdca5b7b re92465d  
    3939    </note>
    4040
    41     <para os="p1">EGLIBC has various issues addressed by the following patch:</para>
     41    <para os="p1">The following patch contains a number architecture and fixes related to
     42      our build &eglibc-version;. This patch was developed by CLFS devs For details on
     43      what's in the patch, look at http://trac.cross-lfs.org/browser/scripts/fetch/eglibc/&eglibc-version;:</para>
    4244
    4345<screen os="p2"><userinput>patch -Np1 -i ../&eglibc-fixes-patch;</userinput></screen>
  • BOOK/final-system/common/gcc.xml

    rdca5b7b re92465d  
    3030
    3131<screen os="p2"><userinput>patch -Np1 -i ../&gcc-branch_update-patch;</userinput></screen>
     32
     33    <para os="p3">The following patch contains a number architecture and fixes related to
     34      our build &gcc-version;. This patch was developed by CLFS devs For details on
     35      what's in the patch, look at http://trac.cross-lfs.org/browser/scripts/patch/gcc/&gcc-version;:</para>
     36
     37<screen os="p4"><userinput>patch -Np1 -i ../&gcc-fixes-patch;</userinput></screen>
    3238
    3339    <para os="d">Apply a <command>sed</command> substitution that will suppress the
  • BOOK/final-system/mips64/gcc.xml

    rdca5b7b re92465d  
    2929    href="../common/gcc.xml"
    3030    xpointer="xpointer(//*[@os='p2'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     33    href="../common/gcc.xml"
     34    xpointer="xpointer(//*[@os='p3'])"/>
     35
     36    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     37    href="../common/gcc.xml"
     38    xpointer="xpointer(//*[@os='p4'])"/>
    3139
    3240    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
  • BOOK/final-system/multilib/gcc.xml

    rdca5b7b re92465d  
    2929    href="../common/gcc.xml"
    3030    xpointer="xpointer(//*[@os='p2'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     33    href="../common/gcc.xml"
     34    xpointer="xpointer(//*[@os='p3'])"/>
     35
     36    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     37    href="../common/gcc.xml"
     38    xpointer="xpointer(//*[@os='p4'])"/>
    3139
    3240    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
  • BOOK/final-system/ppc/gcc.xml

    rdca5b7b re92465d  
    2929    href="../common/gcc.xml"
    3030    xpointer="xpointer(//*[@os='p2'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     33    href="../common/gcc.xml"
     34    xpointer="xpointer(//*[@os='p3'])"/>
     35
     36    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     37    href="../common/gcc.xml"
     38    xpointer="xpointer(//*[@os='p4'])"/>
    3139
    3240    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
  • BOOK/final-system/ppc64/gcc.xml

    rdca5b7b re92465d  
    2121  <sect2 role="installation">
    2222    <title>Installation of GCC</title>
     23
     24    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     25    href="../common/gcc.xml"
     26    xpointer="xpointer(//*[@os='p1'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     29    href="../common/gcc.xml"
     30    xpointer="xpointer(//*[@os='p2'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     33    href="../common/gcc.xml"
     34    xpointer="xpointer(//*[@os='p3'])"/>
     35
     36    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     37    href="../common/gcc.xml"
     38    xpointer="xpointer(//*[@os='p4'])"/>
    2339
    2440    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
  • BOOK/introduction/common/changelog.xml

    rdca5b7b re92465d  
    3636    </listitem>
    3737-->
     38
     39    <listitem>
     40      <para>September 12, 2009</para>
     41      <itemizedlist>
     42        <listitem>
     43          <para>[Jim] - Updated Bash Patch to -7.</para>
     44        </listitem>
     45        <listitem>
     46          <para>[Jim] - Updated Vim Patch to -21.</para>
     47        </listitem>
     48        <listitem>
     49          <para>[Jim] - Updated Ncurses Patch to -20.</para>
     50        </listitem>
     51        <listitem>
     52          <para>[Jim] - Updated GCC Patch to -4.</para>
     53        </listitem>
     54        <listitem>
     55          <para>[Jim] - Added New GCC Fixes Patch.</para>
     56        </listitem>
     57      </itemizedlist>
     58    </listitem>
     59
     60    <listitem>
     61      <para>September 11, 2009</para>
     62      <itemizedlist>
     63        <listitem>
     64          <para>[Jim] - Updated Coreutils 7.6.</para>
     65        </listitem>
     66      </itemizedlist>
     67    </listitem>
    3868
    3969    <listitem>
  • BOOK/materials/common/patches.xml

    rdca5b7b re92465d  
    111111    </varlistentry>
    112112
     113    <varlistentry>
     114      <term>GCC Fixes Patch - <token>&gcc-fixes-patch-size;</token>:</term>
     115      <listitem>
     116        <para>Download: <ulink
     117        url="&patches-root;&gcc-fixes-patch;"/></para>
     118        <para>MD5 sum: <literal>&gcc-fixes-patch-md5;</literal></para>
     119      </listitem>
     120    </varlistentry>
     121
    113122<!--
    114123    <varlistentry>
  • BOOK/packages.ent

    rdca5b7b re92465d  
    8282<!ENTITY colo-home "http://www.colonel-panic.org/cobalt-mips">
    8383
    84 <!ENTITY coreutils-version "7.5">
    85 <!ENTITY coreutils-size "9,722 KB">
     84<!ENTITY coreutils-version "7.6">
     85<!ENTITY coreutils-size "9,779 KB">
    8686<!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.gz">
    87 <!ENTITY coreutils-md5 "775351410b7d6879767c3e4563354dc6">
     87<!ENTITY coreutils-md5 "3d82f979229365f880da750642e67cf3">
    8888<!ENTITY coreutils-home "&gnu-software;coreutils">
    8989
     
    382382<!ENTITY silo-version "1.4.14">
    383383<!ENTITY silo-size "145 KB">
    384 <!ENTITY silo-url "http://www.phunnypharm.org/pub/silo/silo-&silo-version;.tar.bz2">
     384<!ENTITY silo-url "&packages-root;/silo-&silo-version;.tar.bz2">
    385385<!ENTITY silo-md5 "168182dfa0025914ceecac9591a6674c">
    386386<!ENTITY silo-home "">
  • BOOK/patches.ent

    rdca5b7b re92465d  
    55<!-- Start of Common Patches -->
    66
    7 <!ENTITY bash-branch_update-patch "bash-&bash-version;-branch_update-6.patch">
    8 <!ENTITY bash-branch_update-patch-md5 "b80de9ff5aa41a3e6ed2cdaa7c15027a">
    9 <!ENTITY bash-branch_update-patch-size "40 KB">
     7<!ENTITY bash-branch_update-patch "bash-&bash-version;-branch_update-7.patch">
     8<!ENTITY bash-branch_update-patch-md5 "aecc5f2ca934fd3dc49bff1f012ef810">
     9<!ENTITY bash-branch_update-patch-size "42 KB">
    1010
    1111<!ENTITY binutils-branch_update-patch "binutils-&binutils-version;-branch_update-5.patch">
     
    1414
    1515<!ENTITY coreutils-uname-patch "coreutils-&coreutils-version;-uname-1.patch">
    16 <!ENTITY coreutils-uname-patch-md5 "e21c03d8d79e07366ee558ab4b3c5ece">
     16<!ENTITY coreutils-uname-patch-md5 "56ad75fedac896082d96ab0bd5e6b32c">
    1717<!ENTITY coreutils-uname-patch-size "4 KB">
    1818
     
    4141<!ENTITY flex-gcc44-patch-size "12 KB">
    4242
    43 <!ENTITY gcc-branch_update-patch "gcc-&gcc-version;-branch_update-1.patch">
    44 <!ENTITY gcc-branch_update-patch-md5 "ab8fc23fb2814b2d1e4128fa8d02f4e2">
    45 <!ENTITY gcc-branch_update-patch-size "184 KB">
     43<!ENTITY gcc-branch_update-patch "gcc-&gcc-version;-branch_update-4.patch">
     44<!ENTITY gcc-branch_update-patch-md5 "aca21cc253204489a850b0f7a64f885e">
     45<!ENTITY gcc-branch_update-patch-size "240 KB">
     46
     47<!ENTITY gcc-fixes-patch "gcc-&gcc-version;-fixes-3.patch">
     48<!ENTITY gcc-fixes-patch-md5 "615aa46ee6873b92647cd93210a8fc1d">
     49<!ENTITY gcc-fixes-patch-size "25 KB">
    4650
    4751<!ENTITY gcc-specs-patch "gcc-&gcc-version;-specs-1.patch">
     
    8185<!ENTITY ncurses-bashfix-patch-size ".7 KB">
    8286
    83 <!ENTITY ncurses-branch_update-patch "ncurses-&ncurses-version;-branch_update-18.patch">
    84 <!ENTITY ncurses-branch_update-patch-md5 "6b17e03f6191a79f90666c25af0d758b">
    85 <!ENTITY ncurses-branch_update-patch-size "1,822 KB">
     87<!ENTITY ncurses-branch_update-patch "ncurses-&ncurses-version;-branch_update-20.patch">
     88<!ENTITY ncurses-branch_update-patch-md5 "5deb073f3cd21781f593fee791d40e87">
     89<!ENTITY ncurses-branch_update-patch-size "1,927 KB">
    8690
    8791<!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
     
    109113<!ENTITY texinfo-new_compressors-patch-size "2 KB">
    110114
    111 <!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-19.patch">
    112 <!ENTITY vim-branch_update-patch-md5 "db08d9964174cc61bbd3b4800ee35dc">
    113 <!ENTITY vim-branch_update-patch-size "714 KB">
     115<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-21.patch">
     116<!ENTITY vim-branch_update-patch-md5 "68e540fbf2a06d9760a9b4d4b486b506">
     117<!ENTITY vim-branch_update-patch-size "737 KB">
    114118
    115119<!ENTITY zlib-fpic-patch "zlib-&zlib-version;-fPIC-2.patch">
Note: See TracChangeset for help on using the changeset viewer.