Changeset 8f3d17f


Ignore:
Timestamp:
May 18, 2011, 4:52:44 PM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Children:
32f55264
Parents:
f8e1743 (diff), 279277d (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 cross-lfs.org:cross-lfs into simp

Files:
7 added
3 deleted
31 edited
1 moved

Legend:

Unmodified
Added
Removed

  • BOOK/cross-tools/64/gcc-final.xml

    rf8e1743 r8f3d17f  
    2222  <sect2 role="installation">
    2323    <title>Installation of GCC Cross Compiler</title>
     24
     25    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="gcc-static.xml"
     27    xpointer="xpointer(//*[@os='p1'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="gcc-static.xml"
     31    xpointer="xpointer(//*[@os='p2'])"/>
    2432
    2533    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/cross-tools/64/gcc-static.xml

    rf8e1743 r8f3d17f  
    2323    <title>Installation of Cross GCC Compiler with Static libgcc
    2424    and no Threads</title>
     25
     26    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     27    href="../common/gcc-static.xml"
     28    xpointer="xpointer(//*[@os='p1'])"/>
     29
     30    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     31    href="../common/gcc-static.xml"
     32    xpointer="xpointer(//*[@os='p2'])"/>
    2533
    2634    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/cross-tools/common/gcc-final.xml

    rf8e1743 r8f3d17f  
    2222  <sect2 role="installation">
    2323    <title>Installation of GCC Cross Compiler</title>
     24
     25    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="gcc-static.xml"
     27    xpointer="xpointer(//*[@os='p1'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="gcc-static.xml"
     31    xpointer="xpointer(//*[@os='p2'])"/>
    2432
    2533    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/cross-tools/common/gcc-static.xml

    rf8e1743 r8f3d17f  
    2323    <title>Installation of Cross GCC Compiler with Static libgcc
    2424    and no Threads</title>
     25
     26    <para os="p1">The following patch contains a number of updates to the
     27    &gcc-version; branch by the GCC developers:</para>
     28
     29    <screen os="p2"><userinput>patch -Np1 -i ../&gcc-branch_update-patch;</userinput></screen>
    2530
    2631    <para os="aa">Make a couple of essential adjustments to the

  • BOOK/cross-tools/mips64-64/gcc-final.xml

    rf8e1743 r8f3d17f  
    2222  <sect2 role="installation">
    2323    <title>Installation of GCC Cross Compiler</title>
     24
     25    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="gcc-static.xml"
     27    xpointer="xpointer(//*[@os='p1'])"/>
     28   
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="gcc-static.xml"
     31    xpointer="xpointer(//*[@os='p2'])"/>
     32
    2433
    2534    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/cross-tools/mips64-64/gcc-static.xml

    rf8e1743 r8f3d17f  
    2323    <title>Installation of Cross GCC Compiler with Static libgcc
    2424    and no Threads</title>
     25
     26    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     27    href="../common/gcc-static.xml"
     28    xpointer="xpointer(//*[@os='p1'])"/>
     29
     30    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     31    href="../64/gcc-static.xml"
     32    xpointer="xpointer(//*[@os='p2'])"/>
    2533
    2634    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/cross-tools/multilib/gcc-final.xml

    rf8e1743 r8f3d17f  
    2222  <sect2 role="installation">
    2323    <title>Installation of GCC Cross Compiler</title>
     24
     25    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="gcc-static.xml"
     27    xpointer="xpointer(//*[@os='p1'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="gcc-static.xml"
     31    xpointer="xpointer(//*[@os='p2'])"/>
    2432
    2533    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/cross-tools/multilib/gcc-static.xml

    rf8e1743 r8f3d17f  
    2323    <title>Installation of Cross GCC Compiler with Static libgcc
    2424    and no Threads</title>
     25
     26    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     27    href="../common/gcc-static.xml"
     28    xpointer="xpointer(//*[@os='p1'])"/>
     29
     30    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     31    href="../common/gcc-static.xml"
     32    xpointer="xpointer(//*[@os='p2'])"/>
    2533
    2634    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/cross-tools/ppc/gcc-final.xml

    rf8e1743 r8f3d17f  
    2222  <sect2 role="installation">
    2323    <title>Installation of GCC Cross Compiler</title>
     24
     25    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="gcc-static.xml"
     27    xpointer="xpointer(//*[@os='p1'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="gcc-static.xml"
     31    xpointer="xpointer(//*[@os='p2'])"/>
    2432
    2533    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/cross-tools/ppc/gcc-static.xml

    rf8e1743 r8f3d17f  
    2323    <title>Installation of Cross GCC Compiler with Static libgcc
    2424    and no Threads</title>
     25
     26    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     27    href="../common/gcc-static.xml"
     28    xpointer="xpointer(//*[@os='p1'])"/>
     29
     30    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     31    href="../common/gcc-static.xml"
     32    xpointer="xpointer(//*[@os='p2'])"/>
    2533
    2634    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/cross-tools/ppc64/gcc-final.xml

    rf8e1743 r8f3d17f  
    2222  <sect2 role="installation">
    2323    <title>Installation of GCC Cross Compiler</title>
     24
     25    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="gcc-static.xml"
     27    xpointer="xpointer(//*[@os='p1'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="gcc-static.xml"
     31    xpointer="xpointer(//*[@os='p2'])"/>
    2432
    2533    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/cross-tools/ppc64/gcc-static.xml

    rf8e1743 r8f3d17f  
    2323    <title>Installation of Cross GCC Compiler with Static libgcc
    2424    and no Threads</title>
     25
     26    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     27    href="../common/gcc-static.xml"
     28    xpointer="xpointer(//*[@os='p1'])"/>
     29
     30    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     31    href="../common/gcc-static.xml"
     32    xpointer="xpointer(//*[@os='p2'])"/>
    2533
    2634    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/64/gcc.xml

    rf8e1743 r8f3d17f  
    2121  <sect2 role="installation">
    2222    <title>Installation of GCC</title>
     23
     24    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     25    href="../common/gcc.xml"
     26    xpointer="xpointer(//*[@os='p1'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/gcc.xml"
     30    xpointer="xpointer(//*[@os='p2'])"/>
     31
    2332
    2433    <para os="p5">Apply the following patch so that GCC links to

  • BOOK/final-system/common/gcc.xml

    rf8e1743 r8f3d17f  
    2525  <sect2 role="installation">
    2626    <title>Installation of GCC</title>
     27
     28
     29    <para os="p1">The following patch contains a number of updates to the
     30    &gcc-version; branch by the GCC developers:</para>
     31
     32    <screen os="p2"><userinput>patch -Np1 -i ../&gcc-branch_update-patch;</userinput></screen>
    2733
    2834    <para os="d">Apply a <command>sed</command> substitution that will suppress the

  • BOOK/final-system/mips64/gcc.xml

    rf8e1743 r8f3d17f  
    2121  <sect2 role="installation">
    2222    <title>Installation of GCC</title>
     23
     24    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     25    href="../common/gcc.xml"
     26    xpointer="xpointer(//*[@os='p1'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/gcc.xml"
     30    xpointer="xpointer(//*[@os='p2'])"/>
    2331
    2432    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/gcc.xml

    rf8e1743 r8f3d17f  
    2121  <sect2 role="installation">
    2222    <title>Installation of GCC</title>
     23
     24    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     25    href="../common/gcc.xml"
     26    xpointer="xpointer(//*[@os='p1'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/gcc.xml"
     30    xpointer="xpointer(//*[@os='p2'])"/>
    2331
    2432    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rf8e1743 r8f3d17f  
    2121  <sect2 role="installation">
    2222    <title>Installation of GCC</title>
     23
     24    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     25    href="../common/gcc.xml"
     26    xpointer="xpointer(//*[@os='p1'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/gcc.xml"
     30    xpointer="xpointer(//*[@os='p2'])"/>
    2331
    2432    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rf8e1743 r8f3d17f  
    2121  <sect2 role="installation">
    2222    <title>Installation of GCC</title>
     23
     24    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     25    href="../common/gcc.xml"
     26    xpointer="xpointer(//*[@os='p1'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/gcc.xml"
     30    xpointer="xpointer(//*[@os='p2'])"/>
    2331
    2432    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/general.ent

    rf8e1743 r8f3d17f  
    11<?xml version="1.0" encoding="ISO-8859-1"?>
    22
    3 <!ENTITY month "04"> <!-- Use two digits -->
    4 <!ENTITY month_name "April">
    5 <!ENTITY day "24"> <!-- Use two digits -->
     3<!ENTITY month "05"> <!-- Use two digits -->
     4<!ENTITY month_name "May">
     5<!ENTITY day "18"> <!-- Use two digits -->
    66<!ENTITY year "2011"> <!-- Use four digits -->
    77

  • BOOK/introduction/common/changelog.xml

    rf8e1743 r8f3d17f  
    3838
    3939    <listitem>
     40      <para>May 18, 2011</para>
     41      <itemizedlist>
     42        <listitem>
     43          <para>[Jonathan] - Updated Perl libc patch for 5.14.0.</para>
     44        </listitem>
     45        <listitem>
     46          <para>[Jonathan] - Updated Coreutils uname patch for 8.12.</para>
     47        </listitem>
     48        <listitem>
     49          <para>[Jonathan] - Updated Utils-Linux to 2.19.1.</para>
     50        </listitem>
     51        <listitem>
     52          <para>[Jonathan] - Updated Udev to 168.</para>
     53        </listitem>
     54        <listitem>
     55          <para>[Jonathan] - Updated Perl to 5.14.0.</para>
     56        </listitem>
     57        <listitem>
     58          <para>[Jonathan] - Updated IPRoute2 to 2.6.38.</para>
     59        </listitem>
     60        <listitem>
     61          <para>[Jonathan] - Updated Grep to 2.8.</para>
     62        </listitem>
     63        <listitem>
     64          <para>[Jonathan] - Updated GMP to 5.0.2.</para>
     65        </listitem>
     66        <listitem>
     67          <para>[Jonathan] - Updated File to 5.0.7.</para>
     68        </listitem>
     69        <listitem>
     70          <para>[Jonathan] - Updated DHCPCD to 5.2.12.</para>
     71        </listitem>
     72        <listitem>
     73          <para>[Jonathan] - Updated Coreutils to 8.12.</para>
     74        </listitem>
     75        <listitem>
     76          <para>[Jonathan] - Added GCC 4.6.0 Branch Update Patch -1.</para>
     77        </listitem>
     78        <listitem>
     79          <para>[Jonathan] - Updated Vim Branch Update to -2.</para>
     80        </listitem>
     81        <listitem>
     82          <para>[Jonathan] - Updated Bash Branch Update to -2.</para>
     83        </listitem>
     84        <listitem>
     85          <para>[Jonathan] - Updated Ncurses Branch Update to -2.</para>
     86        </listitem>
     87      </itemizedlist>
     88    </listitem>
     89
     90    <listitem>
    4091      <para>April 17, 2011</para>
    4192      <itemizedlist>
    … …  
    4899          rsyslog.</para>
    49100        </listitem>
    50       </itemizedlist>
    51     </listitem>
    52 
    53     <listitem>
    54       <para>April 17, 2011</para>
    55       <itemizedlist>
    56101        <listitem>
    57102          <para>[jciccone] - Updated Rsyslog to 6.1.7.</para>

  • BOOK/introduction/x86/changelog.xml

    rf8e1743 r8f3d17f  
    3434
    3535    <listitem>
     36      <para>May 18, 2011</para>
     37      <itemizedlist>
     38        <listitem>
     39          <para>[Jonathan] - Updated Grub2 to 1.99.</para>
     40        </listitem>
     41      </itemizedlist>
     42    </listitem>
     43
     44
     45    <listitem>
    3646      <para>July 08, 2008</para>
    3747      <itemizedlist>

  • BOOK/introduction/x86_64-64/changelog.xml

    rf8e1743 r8f3d17f  
    3333
    3434-->
     35
     36    <listitem>
     37      <para>May 18, 2011</para>
     38      <itemizedlist>
     39        <listitem>
     40          <para>[Jonathan] - Updated Grub2 to 1.99.</para>
     41        </listitem>
     42      </itemizedlist>
     43    </listitem>
     44
    3545
    3646    <listitem>

  • BOOK/introduction/x86_64/changelog.xml

    rf8e1743 r8f3d17f  
    3333
    3434-->
     35
     36    <listitem>
     37      <para>May 18, 2011</para>
     38      <itemizedlist>
     39        <listitem>
     40          <para>[Jonathan] - Updated Grub2 to 1.99.</para>
     41        </listitem>
     42      </itemizedlist>
     43    </listitem>
     44
    3545
    3646    <listitem>

  • BOOK/materials/common/patches.xml

    rf8e1743 r8f3d17f  
    6565
    6666    <varlistentry>
     67      <term>GCC Branch Update Patch - <token>&gcc-branch_update-patch-size;</token>:</term>
     68      <listitem>
     69        <para>Download: <ulink
     70        url="&patches-root;&gcc-branch_update-patch;"/></para>
     71        <para>MD5 sum: <literal>&gcc-branch_update-patch-md5;</literal></para>
     72      </listitem>
     73    </varlistentry>
     74
     75    <varlistentry>
    6776      <term>Grep Fixes Patch - <token>&grep-fixes-patch-size;</token>:</term>
    6877      <listitem>

  • BOOK/packages.ent

    rf8e1743 r8f3d17f  
    7373<!ENTITY colo-home "http://www.colonel-panic.org/cobalt-mips">
    7474
    75 <!ENTITY coreutils-version "8.11">
    76 <!ENTITY coreutils-size "11,228 KB">
     75<!ENTITY coreutils-version "8.12">
     76<!ENTITY coreutils-size "11,497 KB">
    7777<!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.gz">
    78 <!ENTITY coreutils-md5 "eabaf2593f4b978dea13044d6acc2dc8">
     78<!ENTITY coreutils-md5 "fce7999953a67243d00d75cc86dbcaa6">
    7979<!ENTITY coreutils-home "&gnu-software;coreutils">
    8080
    … …  
    8585<!ENTITY dejagnu-home "&gnu-software;dejagnu">
    8686
    87 <!ENTITY dhcpcd-version "5.2.10">
    88 <!ENTITY dhcpcd-size "72 KB">
     87<!ENTITY dhcpcd-version "5.2.12">
     88<!ENTITY dhcpcd-size "71 KB">
    8989<!ENTITY dhcpcd-url "http://roy.marples.name/downloads/dhcpcd/dhcpcd-&dhcpcd-version;.tar.bz2">
    90 <!ENTITY dhcpcd-md5 "c65e8cef3281eaf2e12a84bd882f5c63">
     90<!ENTITY dhcpcd-md5 "832e3cd6bfcaff64e9476e0ff7849e8f">
    9191<!ENTITY dhcpcd-home "http://roy.marples.name/projects/dhcpcd">
    9292
    … …  
    137137<!ENTITY expect-lib-version "5.43">
    138138
    139 <!ENTITY file-version "5.06">
    140 <!ENTITY file-size "588 KB">
     139<!ENTITY file-version "5.07">
     140<!ENTITY file-size "584 KB">
    141141<!ENTITY file-url "ftp://ftp.astron.com/pub/file/file-&file-version;.tar.gz">
    142142<!--<!ENTITY file-url "&packages-root;file-&file-version;.tar.gz">-->
    143 <!ENTITY file-md5 "deb12b0fb9d09e7681be72bad6eba4e0">
     143<!ENTITY file-md5 "b8d1f9a8a644067bd0a703cebf3f4858">
    144144<!ENTITY file-home "http://www.darwinsys.com/file">
    145145
    … …  
    174174<!ENTITY gettext-home "&gnu-software;gettext">
    175175
    176 <!ENTITY gmp-version "5.0.1">
    177 <!ENTITY gmp-size "1,960 KB">
     176<!ENTITY gmp-version "5.0.2">
     177<!ENTITY gmp-size "2,025 KB">
    178178<!ENTITY gmp-url "&gnu;gmp/gmp-&gmp-version;.tar.bz2">
    179 <!ENTITY gmp-md5 "6bac6df75c192a13419dfd71d19240a7">
     179<!ENTITY gmp-md5 "0bbaedc82fb30315b06b1588b9077cd3">
    180180<!ENTITY gmp-home "http://gmplib.org/">
    181181
    182 <!ENTITY grep-version "2.6.3">
    183 <!ENTITY grep-size "1,280 KB">
     182<!ENTITY grep-version "2.8">
     183<!ENTITY grep-size "1,757 KB">
    184184<!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.gz">
    185 <!ENTITY grep-md5 "3095b57837b312f087c0680559de7f13">
     185<!ENTITY grep-md5 "cb2dfc502c5afc7a4a6e5f6cefd6850e">
    186186<!ENTITY grep-home "&gnu-software;grep">
    187187
    … …  
    192192<!ENTITY groff-home "&gnu-software;groff">
    193193
    194 <!ENTITY grub-version "1.98">
    195 <!ENTITY grub-size "2,392 KB">
    196 <!ENTITY grub-url "&alpha-gnu;grub/grub-&grub-version;.tar.gz">
    197 <!ENTITY grub-md5 "c0bcf60e524739bb64e3a2d4e3732a59">
     194<!ENTITY grub-version "1.99">
     195<!ENTITY grub-size "2,639 KB">
     196<!ENTITY grub-url "&gnu;grub/grub-&grub-version;.tar.xz">
     197<!ENTITY grub-md5 "27e360b951f006c464299d06bbd63442">
    198198<!ENTITY grub-home "&gnu-software;grub">
    199199
    … …  
    218218
    219219
    220 <!ENTITY iproute2-version "2.6.37">
    221 <!ENTITY iproute2-size "380 KB">
     220<!ENTITY iproute2-version "2.6.38">
     221<!ENTITY iproute2-size "390 KB">
    222222<!ENTITY iproute2-url "http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-&iproute2-version;.tar.bz2">
    223 <!ENTITY iproute2-md5 "9774ff9d74ebd301bf56bd8d74473786">
     223<!ENTITY iproute2-md5 "a243bfea837e71824b7ca26c3bb45fa8">
    224224<!ENTITY iproute2-home "http://www.linuxfoundation.org/en/Net:Iproute2">
    225225
    … …  
    328328<!ENTITY patch-home "http://savannah.gnu.org/projects/patch">
    329329
    330 <!ENTITY perl-version "5.12.2">
    331 <!ENTITY perl-size "12,060 KB">
     330<!ENTITY perl-version "5.14.0">
     331<!ENTITY perl-size "13,250 KB">
    332332<!ENTITY perl-url "http://www.cpan.org/src/5.0/perl-&perl-version;.tar.bz2">
    333 <!ENTITY perl-md5 "7b018fe9c2f434eff0c629b4c515a8fc">
     333<!ENTITY perl-md5 "e7457deea78330c5f8eebb2fd2a45479">
    334334<!ENTITY perl-home "http://www.perl.org">
    335335
    … …  
    420420<!ENTITY texinfo-home "&gnu-software;texinfo">
    421421
    422 <!ENTITY udev-version "167">
    423 <!ENTITY udev-size "584 KB">
     422<!ENTITY udev-version "168">
     423<!ENTITY udev-size "598 KB">
    424424<!ENTITY udev-url "&kernel;linux/utils/kernel/hotplug/udev-&udev-version;.tar.bz2">
    425 <!ENTITY udev-md5 "4b37e1222f06c14c24147de346aa0bad">
     425<!ENTITY udev-md5 "4a466078532ab5dd5c35acc3ea2ec9a1">
    426426<!ENTITY udev-home "http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html">
    427427
    … …  
    432432<!ENTITY uname_hack-home " ">
    433433
    434 <!ENTITY util-linux-major-version "2.19">
     434<!ENTITY util-linux-major-version "2.19.1">
    435435<!ENTITY util-linux-version "&util-linux-major-version;">
    436 <!ENTITY util-linux-size "4,726 KB">
     436<!ENTITY util-linux-size "4,397 KB">
    437437<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-major-version;/util-linux-&util-linux-version;.tar.bz2">
    438 <!ENTITY util-linux-md5 "590ca71aad0b254e2631d84401f28255">
     438<!ENTITY util-linux-md5 "3eab06f05163dfa65479c44e5231932c">
    439439<!ENTITY util-linux-blkid-id "1.1.0">
    440440<!ENTITY util-linux-uuid-id "1.3.0">

  • BOOK/patches.ent

    rf8e1743 r8f3d17f  
    55<!-- Start of Common Patches -->
    66
    7 <!ENTITY bash-branch_update-patch "bash-&bash-version;-branch_update-1.patch">
    8 <!ENTITY bash-branch_update-patch-md5 "ee7bbf5d36058487cbe23f5571a2c21c">
    9 <!ENTITY bash-branch_update-patch-size "12 KB">
     7<!ENTITY bash-branch_update-patch "bash-&bash-version;-branch_update-2.patch">
     8<!ENTITY bash-branch_update-patch-md5 "6aef48cfd93b9109358eae0be9125946">
     9<!ENTITY bash-branch_update-patch-size "16 KB">
    1010
    1111<!ENTITY cloog-ppl-autogen-patch "cloog-ppl-&cloog-ppl-version;-autogen-1.patch">
    … …  
    2929<!ENTITY gcc-specs-patch-size "20 KB">
    3030
     31<!ENTITY gcc-branch_update-patch "gcc-&gcc-version;-branch_update-1.patch">
     32<!ENTITY gcc-branch_update-patch-md5 "3ff1f39dc12932736694bf6fb6a1846a">
     33<!ENTITY gcc-branch_update-patch-size "1.5 MB">
     34
    3135<!ENTITY grep-fixes-patch "grep-&grep-version;-fixes-1.patch">
    3236<!ENTITY grep-fixes-patch-md5 "0cb36684847842adb17a1b3fb96f733d">
    … …  
    4953<!ENTITY ncurses-bashfix-patch-size "4 KB">
    5054
    51 <!ENTITY ncurses-branch_update-patch "ncurses-&ncurses-version;-branch_update-1.patch">
    52 <!ENTITY ncurses-branch_update-patch-md5 "5361bccf700849ba968a8886cdfaa879">
    53 <!ENTITY ncurses-branch_update-patch-size "324 KB">
     55<!ENTITY ncurses-branch_update-patch "ncurses-&ncurses-version;-branch_update-2.patch">
     56<!ENTITY ncurses-branch_update-patch-md5 "125c256a66bd532c6c290dc2adfb7bc4">
     57<!ENTITY ncurses-branch_update-patch-size "796 KB">
    5458
    5559<!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
    … …  
    7074
    7175<!ENTITY tar-man-patch "tar-&tar-version;-man-1.patch">
    72 <!ENTITY tar-man-patch-md5 "79d962bddc4871b394e5f8e3267680fe">
    73 <!ENTITY tar-man-patch-size "20 KB">
     76<!ENTITY tar-man-patch-md5 "074783d41f18c5c62a7cfc77e2678693">
     77<!ENTITY tar-man-patch-size "76 KB">
    7478
    7579<!ENTITY texinfo-new_compressors-patch "texinfo-&texinfo-version;-new_compressors-1.patch">
    … …  
    7781<!ENTITY texinfo-new_compressors-patch-size "2 KB">
    7882
    79 <!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-1.patch">
    80 <!ENTITY vim-branch_update-patch-md5 "c1866b7f2f945993b8fc2bb94606bc17">
    81 <!ENTITY vim-branch_update-patch-size "220 KB">
     83<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-2.patch">
     84<!ENTITY vim-branch_update-patch-md5 "3790140dd2fd1963f285e4ba1bce5d1f">
     85<!ENTITY vim-branch_update-patch-size "552 KB">
    8286
    8387<!-- Start of multilib patches -->

  • BOOK/temp-system/64/gcc.xml

    rf8e1743 r8f3d17f  
    2222  <sect2 role="installation">
    2323    <title>Installation of GCC</title>
     24
     25    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="../../cross-tools/64/gcc-static.xml"
     27    xpointer="xpointer(//*[@os='p1'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../../cross-tools/64/gcc-static.xml"
     31    xpointer="xpointer(//*[@os='p2'])"/>
    2432
    2533    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/temp-system/common/gcc.xml

    rf8e1743 r8f3d17f  
    2222  <sect2 role="installation">
    2323    <title>Installation of GCC</title>
     24
     25    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="../../cross-tools/common/gcc-static.xml"
     27    xpointer="xpointer(//*[@os='p1'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../../cross-tools/common/gcc-static.xml"
     31    xpointer="xpointer(//*[@os='p2'])"/>
    2432
    2533    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/temp-system/mips64/gcc.xml

    rf8e1743 r8f3d17f  
    2222  <sect2 role="installation">
    2323    <title>Installation of GCC</title>
     24
     25    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="../../cross-tools/multilib/gcc-static.xml"
     27    xpointer="xpointer(//*[@os='p1'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../../cross-tools/multilib/gcc-static.xml"
     31    xpointer="xpointer(//*[@os='p2'])"/>
    2432
    2533    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/temp-system/multilib/gcc.xml

    rf8e1743 r8f3d17f  
    2222  <sect2 role="installation">
    2323    <title>Installation of GCC</title>
     24
     25    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="../../cross-tools/multilib/gcc-static.xml"
     27    xpointer="xpointer(//*[@os='p1'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../../cross-tools/multilib/gcc-static.xml"
     31    xpointer="xpointer(//*[@os='p2'])"/>
    2432
    2533    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/temp-system/ppc/gcc.xml

    rf8e1743 r8f3d17f  
    2222  <sect2 role="installation">
    2323    <title>Installation of GCC</title>
     24
     25    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="../../cross-tools/common/gcc-static.xml"
     27    xpointer="xpointer(//*[@os='p1'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../../cross-tools/common/gcc-static.xml"
     31    xpointer="xpointer(//*[@os='p2'])"/>
    2432
    2533    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • patches/bash-4.2-branch_update-2.patch

    rf8e1743 r8f3d17f  
    1 Submitted By: Joe Ciccone <jciccone@gmail.com>
    2 Date: 04-16-2011
     1Submitted By: Jonathan Norman (jonathan at bluesquarelinux.co.uk)
     2Date: 2011-05-16
    33Initial Package Version: 4.2
    44Origin: Upstream
    5 Upstream Status: From Upstream
    6 Description: Contains all upstream patches up to 4.2-008
     5Upstream Status: Applied
     6Description: Contains all upstream patches up to 4.2-010
    77
     8diff -Naur bash-4.2.orig/builtins/fc.def bash-4.2/builtins/fc.def
     9--- bash-4.2.orig/builtins/fc.def       2010-05-30 22:25:38.000000000 +0000
     10+++ bash-4.2/builtins/fc.def    2011-05-16 23:42:00.796961011 +0000
     11@@ -304,7 +304,7 @@
     12   last_hist = i - rh - hist_last_line_added;
     13 
     14   /* XXX */
     15-  if (saved_command_line_count > 0 && i == last_hist && hlist[last_hist] == 0)
     16+  if (i == last_hist && hlist[last_hist] == 0)
     17     while (last_hist >= 0 && hlist[last_hist] == 0)
     18       last_hist--;
     19   if (last_hist < 0)
     20@@ -475,7 +475,7 @@
     21      HIST_ENTRY **hlist;
     22 {
     23   int sign, n, clen, rh;
     24-  register int i, j;
     25+  register int i, j, last_hist;
     26   register char *s;
     27 
     28   sign = 1;
     29@@ -495,7 +495,15 @@
     30      has been enabled (interactive or not) should use it in the last_hist
     31      calculation as if it were on. */
     32   rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list);
     33-  i -= rh + hist_last_line_added;
     34+  last_hist = i - rh - hist_last_line_added;
     35+
     36+  if (i == last_hist && hlist[last_hist] == 0)
     37+    while (last_hist >= 0 && hlist[last_hist] == 0)
     38+      last_hist--;
     39+  if (last_hist < 0)
     40+    return (-1);
     41+
     42+  i = last_hist;
     43 
     44   /* No specification defaults to most recent command. */
     45   if (command == NULL)
    846diff -Naur bash-4.2.orig/builtins/printf.def bash-4.2/builtins/printf.def
    9 --- bash-4.2.orig/builtins/printf.def   2010-11-23 10:02:55.000000000 -0500
    10 +++ bash-4.2/builtins/printf.def        2011-04-16 16:50:36.379215007 -0400
     47--- bash-4.2.orig/builtins/printf.def   2010-11-23 15:02:55.000000000 +0000
     48+++ bash-4.2/builtins/printf.def        2011-05-16 23:41:55.617535899 +0000
    1149@@ -465,6 +465,9 @@
    1250                  secs = shell_start_time;      /* roughly $SECONDS */
    … …  
    2058                free (timefmt);
    2159diff -Naur bash-4.2.orig/lib/glob/gmisc.c bash-4.2/lib/glob/gmisc.c
    22 --- bash-4.2.orig/lib/glob/gmisc.c      2011-02-05 16:11:17.000000000 -0500
    23 +++ bash-4.2/lib/glob/gmisc.c   2011-04-16 16:50:36.371215007 -0400
     60--- bash-4.2.orig/lib/glob/gmisc.c      2011-02-05 21:11:17.000000000 +0000
     61+++ bash-4.2/lib/glob/gmisc.c   2011-05-16 23:41:53.037822234 +0000
    2462@@ -77,8 +77,8 @@
    2563      wchar_t *wpat;
    … …  
    223261     }
    224262diff -Naur bash-4.2.orig/lib/readline/callback.c bash-4.2/lib/readline/callback.c
    225 --- bash-4.2.orig/lib/readline/callback.c       2010-06-06 12:18:58.000000000 -0400
    226 +++ bash-4.2/lib/readline/callback.c    2011-04-16 16:50:36.359215007 -0400
     263--- bash-4.2.orig/lib/readline/callback.c       2010-06-06 16:18:58.000000000 +0000
     264+++ bash-4.2/lib/readline/callback.c    2011-05-16 23:41:51.689971838 +0000
    227265@@ -148,6 +148,9 @@
    228266          eof = _rl_vi_domove_callback (_rl_vimvcxt);
    … …  
    236274 #endif
    237275diff -Naur bash-4.2.orig/lib/readline/vi_mode.c bash-4.2/lib/readline/vi_mode.c
    238 --- bash-4.2.orig/lib/readline/vi_mode.c        2010-11-20 19:51:39.000000000 -0500
    239 +++ bash-4.2/lib/readline/vi_mode.c     2011-04-16 16:50:36.359215007 -0400
     276--- bash-4.2.orig/lib/readline/vi_mode.c        2010-11-21 00:51:39.000000000 +0000
     277+++ bash-4.2/lib/readline/vi_mode.c     2011-05-16 23:41:51.689971838 +0000
    240278@@ -1114,7 +1114,7 @@
    241279       rl_beg_of_line (1, c);
    … …  
    248286   /* XXX - these need to handle rl_universal_argument bindings */
    249287diff -Naur bash-4.2.orig/parse.y bash-4.2/parse.y
    250 --- bash-4.2.orig/parse.y       2011-01-02 15:48:11.000000000 -0500
    251 +++ bash-4.2/parse.y    2011-04-16 16:50:36.379215007 -0400
     288--- bash-4.2.orig/parse.y       2011-01-02 20:48:11.000000000 +0000
     289+++ bash-4.2/parse.y    2011-05-16 23:41:55.613536343 +0000
    252290@@ -5135,6 +5135,9 @@
    253291            case 'A':
    … …  
    261299              if (c == 'd')
    262300diff -Naur bash-4.2.orig/patchlevel.h bash-4.2/patchlevel.h
    263 --- bash-4.2.orig/patchlevel.h  2010-06-12 20:14:48.000000000 -0400
    264 +++ bash-4.2/patchlevel.h       2011-04-16 16:50:36.387215007 -0400
     301--- bash-4.2.orig/patchlevel.h  2010-06-13 00:14:48.000000000 +0000
     302+++ bash-4.2/patchlevel.h       2011-05-16 23:42:02.092817179 +0000
    265303@@ -25,6 +25,6 @@
    266304    regexp `^#define[   ]*PATCHLEVEL', since that's what support/mkversion.sh
    … …  
    268306 
    269307-#define PATCHLEVEL 0
    270 +#define PATCHLEVEL 8
     308+#define PATCHLEVEL 10
    271309 
    272310 #endif /* _PATCHLEVEL_H_ */
     311diff -Naur bash-4.2.orig/print_cmd.c bash-4.2/print_cmd.c
     312--- bash-4.2.orig/print_cmd.c   2010-05-30 22:34:08.000000000 +0000
     313+++ bash-4.2/print_cmd.c        2011-05-16 23:42:02.092817179 +0000
     314@@ -315,6 +315,7 @@
     315          cprintf ("( ");
     316          skip_this_indent++;
     317          make_command_string_internal (command->value.Subshell->command);
     318+         PRINT_DEFERRED_HEREDOCS ("");
     319          cprintf (" )");
     320          break;
     321 
     322@@ -592,6 +593,7 @@
     323   newline ("do\n");
     324   indentation += indentation_amount;
     325   make_command_string_internal (arith_for_command->action);
     326+  PRINT_DEFERRED_HEREDOCS ("");
     327   semicolon ();
     328   indentation -= indentation_amount;
     329   newline ("done");
     330@@ -653,6 +655,7 @@
     331     }
     332 
     333   make_command_string_internal (group_command->command);
     334+  PRINT_DEFERRED_HEREDOCS ("");
     335 
     336   if (inside_function_def)
     337     {
    273338diff -Naur bash-4.2.orig/sig.c bash-4.2/sig.c
    274 --- bash-4.2.orig/sig.c 2010-11-23 08:21:22.000000000 -0500
    275 +++ bash-4.2/sig.c      2011-04-16 16:50:36.387215007 -0400
     339--- bash-4.2.orig/sig.c 2010-11-23 13:21:22.000000000 +0000
     340+++ bash-4.2/sig.c      2011-05-16 23:41:59.501104844 +0000
    276341@@ -46,6 +46,7 @@
    277342 
    … …  
    303368       termsig_handler (sig);
    304369diff -Naur bash-4.2.orig/subst.c bash-4.2/subst.c
    305 --- bash-4.2.orig/subst.c       2011-01-02 16:12:51.000000000 -0500
    306 +++ bash-4.2/subst.c    2011-04-16 16:50:36.383215007 -0400
     370--- bash-4.2.orig/subst.c       2011-01-02 21:12:51.000000000 +0000
     371+++ bash-4.2/subst.c    2011-05-16 23:41:58.205248678 +0000
    307372@@ -1379,10 +1379,12 @@
    308373   slen = strlen (string + *sindex) + *sindex;
    … …  
    349414       else
    350415diff -Naur bash-4.2.orig/subst.h bash-4.2/subst.h
    351 --- bash-4.2.orig/subst.h       2010-12-02 20:21:29.000000000 -0500
    352 +++ bash-4.2/subst.h    2011-04-16 16:50:36.359215007 -0400
     416--- bash-4.2.orig/subst.h       2010-12-03 01:21:29.000000000 +0000
     417+++ bash-4.2/subst.h    2011-05-16 23:41:50.378117447 +0000
    353418@@ -56,6 +56,7 @@
    354419 #define SX_NOLONGJMP   0x0040  /* don't longjmp on fatal error */
    … …  
    360425    STRING, and returns a pointer to it. */
    361426diff -Naur bash-4.2.orig/variables.c bash-4.2/variables.c
    362 --- bash-4.2.orig/variables.c   2011-01-24 20:07:48.000000000 -0500
    363 +++ bash-4.2/variables.c        2011-04-16 16:50:36.379215007 -0400
     427--- bash-4.2.orig/variables.c   2011-01-25 01:07:48.000000000 +0000
     428+++ bash-4.2/variables.c        2011-05-16 23:41:56.917391622 +0000
    364429@@ -3653,6 +3653,22 @@
    365430   return n;
    … …  
    411476 
    412477diff -Naur bash-4.2.orig/variables.h bash-4.2/variables.h
    413 --- bash-4.2.orig/variables.h   2010-12-02 20:22:01.000000000 -0500
    414 +++ bash-4.2/variables.h        2011-04-16 16:50:36.375215007 -0400
     478--- bash-4.2.orig/variables.h   2010-12-03 01:22:01.000000000 +0000
     479+++ bash-4.2/variables.h        2011-05-16 23:41:55.613536343 +0000
    415480@@ -313,6 +313,7 @@
    416481 
Note: See TracChangeset for help on using the changeset viewer.