Changeset 75a0379 in clfs-embedded


Ignore:
Timestamp:
Oct 15, 2013, 1:00:05 PM (11 years ago)
Author:
Andrew Bradford <andrew@…>
Branches:
master
Children:
c01e552
Parents:
d6d3617
git-author:
Andrew Bradford <andrew@…> (10/14/13 13:21:45)
git-committer:
Andrew Bradford <andrew@…> (10/15/13 13:00:05)
Message:

Convert from uClibc to musl-libc

Does not include musl required patches for gcc or binutils but the book
builds and uClibc has been removed.

Files:
2 deleted
10 edited
1 moved

Legend:

Unmodified
Added
Removed

  • BOOK/cross-tools/arm-chapter.xml

    rd6d3617 r75a0379  
    1818  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
    1919  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="arm/gcc-static.xml"/>
    20   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/uclibc.xml"/>
     20  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libc.xml"/>
    2121  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="arm/gcc-final.xml"/>
    2222

  • BOOK/cross-tools/arm/variables.xml

    rd6d3617 r75a0379  
    2727  processor is a Cortex-A series, which often have hardware floating point
    2828  capability, good choices include: triplet of
    29   armv7a-unknown-linux-uclibceabi, ARM arch of armv7-a, float of hard, and fpu
     29  armv7a-unknown-linux-musleabi, ARM arch of armv7-a, float of hard, and fpu
    3030  of vfpv3-d16.</para>
    3131
    … …  
    102102          <entry>little</entry>
    103103          <entry>EABI</entry>
    104           <entry>armv5l-unknown-linux-uclibceabi</entry>
     104          <entry>armv5l-unknown-linux-musleabi</entry>
    105105        </row>
    106106        <row>
    … …  
    108108          <entry>big</entry>
    109109          <entry>EABI</entry>
    110           <entry>armv5b-unknown-linux-uclibceabi</entry>
     110          <entry>armv5b-unknown-linux-musleabi</entry>
    111111        </row>
    112112        <row>
    … …  
    114114          <entry>little</entry>
    115115          <entry>EABI</entry>
    116           <entry>arm-unknown-linux-uclibceabi</entry>
     116          <entry>arm-unknown-linux-musleabi</entry>
    117117        </row>
    118118        <row>
    … …  
    120120          <entry>little</entry>
    121121          <entry>EABI</entry>
    122           <entry>armv7a-unknown-linux-uclibceabi</entry>
     122          <entry>armv7a-unknown-linux-musleabi</entry>
    123123        </row>
    124124      </tbody>

  • BOOK/cross-tools/common/libc.xml

    rd6d3617 r75a0379  
    66]>
    77
    8 <!-- Common uClibc -->
     8<sect1 id="ch-cross-tools-libc" role="wrap">
     9  <?dbhtml filename="libc.html"?>
    910
    10 <sect1 id="ch-cross-tools-uclibc" role="wrap">
    11   <?dbhtml filename="uclibc.html"?>
     11  <title>musl-libc-&musl-libc-version;</title>
    1212
    13   <title>uClibc-&uclibc-version;</title>
    14 
    15   <indexterm zone="ch-cross-tools-uclibc">
    16     <primary sortas="a-uClibc">uClibc</primary>
     13  <indexterm zone="ch-cross-tools-libc">
     14    <primary sortas="a-libc">musl-libc</primary>
    1715    <secondary>cross tools</secondary>
    1816  </indexterm>
    … …  
    2119    <title/>
    2220
    23     <para>The uClibc package contains the main C library. This library provides
     21    <para>The musl-libc package contains the main C library. This library provides
    2422    the basic routines for allocating memory, searching directories, opening and
    2523    closing files, reading and writing files, string handling, pattern matching,
    … …  
    2927
    3028  <sect2 role="installation">
    31     <title>Installation of uClibc</title>
    32 
    33     <note os="a">
    34       <para>Below we are just telling uClibc to use its default configuration.
    35       For those who are more adventurous, you can use make menuconfig and
    36       do a more custom build for your uClibc installation.</para>
    37     </note>
    38 
    39     <para os="b">The following patch contains the default configurations for
    40     the architectures covered in this book:</para>
    41 
    42 <screen os="c"><userinput>patch -Np1 -i ../&uclibc-configs-patch;</userinput></screen>
    43 
    44    <para os="d">Now we will copy the configuration file best matching this
    45    build and use that as the base:</para>
    46 
    47 <screen os="e"><userinput>cp -v clfs/config.${CLFS_ARCH}.${CLFS_ENDIAN} .config</userinput></screen>
    48 
    49     <para os="f">The config is a basic working system, but there are some
    50     options that are architecture specifc that need to be set. The following
    51     command will only bring up items that need a value that we did not
    52     specify in our generic config file patch:</para>
    53 
    54 <screen os="g"><userinput>make oldconfig</userinput></screen>
     29    <title>Installation of musl-libc</title>
    5530
    5631    <para os="h">Compile the package:</para>
    5732
    58 <screen os="i"><userinput>make</userinput></screen>
     33<screen os="i"><userinput>CC=${CLFS_TARGET}-gcc make \
     34  --enable-debug</userinput></screen>
    5935
    6036    <para os="l">Install the package:</para>
    … …  
    6440  </sect2>
    6541
    66   <sect2 id="contents-uclibc" role="content">
    67     <title>Contents of uClibc</title>
     42  <sect2 id="contents-musl-libc" role="content">
     43    <title>Contents of musl-libc</title>
    6844
    6945    <segmentedlist>
    … …  
    7248      <segtitle>Installed Headers</segtitle>
    7349      <seglistitem>
    74         <seg>ld-uClibc.so.0</seg>
     50        <seg>ld-musl-libc.so.0</seg>
    7551        <seg> libc.so.0, libcrypt.so.0, libdl.so.0, libm.so.0, libpthread.so.0,
    7652        librt.so.0</seg>
    … …  
    8460      <?dbhtml list-presentation="table"?>
    8561
    86       <varlistentry id="ld-uClibc">
    87         <term><command>ld-uClibc</command></term>
     62      <varlistentry id="ld-musl-libc">
     63        <term><command>ld-musl-libc</command></term>
    8864        <listitem>
    89           <para>The uClibc dynamic linker / loader</para>
    90           <indexterm zone="ch-cross-tools-uclibc ld-uClibc">
    91             <primary sortas="b-ld-uClibc">ld-uClibc</primary>
     65          <para>The musl-libc dynamic linker / loader</para>
     66          <indexterm zone="ch-cross-tools-libc ld-musl-libc">
     67            <primary sortas="b-ld-musl-libc">ld-musl-libc</primary>
    9268          </indexterm>
    9369        </listitem>
    … …  
    9874        <listitem>
    9975          <para>The C library</para>
    100           <indexterm zone="ch-cross-tools-uclibc libc">
     76          <indexterm zone="ch-cross-tools-libc libc">
    10177            <primary sortas="c-libc">libc</primary>
    10278          </indexterm>
    … …  
    10884        <listitem>
    10985          <para>The cryptographic library</para>
    110           <indexterm zone="ch-cross-tools-uclibc libcrypt">
     86          <indexterm zone="ch-cross-tools-libc libcrypt">
    11187            <primary sortas="c-libcrypt">libcrypt</primary>
    11288          </indexterm>
    … …  
    11793        <term><filename class="libraryfile">libdl</filename></term>
    11894        <listitem>
    119           <para>The uClibc dynamic linker / loader library</para>
    120           <indexterm zone="ch-cross-tools-uclibc libdl">
     95          <para>The musl-libc dynamic linker / loader library</para>
     96          <indexterm zone="ch-cross-tools-libc libdl">
    12197            <primary sortas="c-libdl">libdl</primary>
    12298          </indexterm>
    … …  
    128104        <listitem>
    129105          <para>The math library</para>
    130           <indexterm zone="ch-cross-tools-uclibc libm">
     106          <indexterm zone="ch-cross-tools-libc libm">
    131107            <primary sortas="c-libm">libm</primary>
    132108          </indexterm>
    … …  
    138114        <listitem>
    139115          <para>The POSIX thread library</para>
    140           <indexterm zone="ch-cross-tools-uclibc libpthread">
     116          <indexterm zone="ch-cross-tools-libc libpthread">
    141117            <primary sortas="c-libpthread">libpthread</primary>
    142118          </indexterm>
    … …  
    148124        <listitem>
    149125          <para>The clock and timer library</para>
    150           <indexterm zone="ch-cross-tools-uclibc librt">
     126          <indexterm zone="ch-cross-tools-libc librt">
    151127            <primary sortas="c-librt">librt</primary>
    152128          </indexterm>

  • BOOK/cross-tools/mips-chapter.xml

    rd6d3617 r75a0379  
    1919  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
    2020  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/gcc-static.xml"/>
    21   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/uclibc.xml"/>
     21  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libc.xml"/>
    2222  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/gcc-final.xml"/>
    2323

  • BOOK/cross-tools/mips/variables.xml

    rd6d3617 r75a0379  
    7676        <row>
    7777          <entry>MIPS 32 bits Little Endian</entry>
    78           <entry>mipsel-unknown-linux-uclibc</entry>
     78          <entry>mipsel-unknown-linux-musl</entry>
    7979          <entry>1</entry>
    8080        </row>
    8181        <row>
    8282          <entry>MIPS 32 bits Big Endian</entry>
    83           <entry>mips-unknown-linux-uclibc</entry>
     83          <entry>mips-unknown-linux-musl</entry>
    8484          <entry>1</entry>
    8585        </row>
    8686        <row>
    8787          <entry>MIPS 64 bits Little Endian</entry>
    88           <entry>mips64el-unknown-linux-uclibc</entry>
     88          <entry>mips64el-unknown-linux-musl</entry>
    8989          <entry>3</entry>
    9090        </row>
    9191        <row>
    9292          <entry>MIPS 64 bits Big Endian</entry>
    93           <entry>mips64-unknown-linux-uclibc</entry>
     93          <entry>mips64-unknown-linux-musl</entry>
    9494          <entry>3</entry>
    9595        </row>

  • BOOK/cross-tools/x86-chapter.xml

    rd6d3617 r75a0379  
    1818  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
    1919  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/gcc-static.xml"/>
    20   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/uclibc.xml"/>
     20  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libc.xml"/>
    2121  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/gcc-final.xml"/>
    2222

  • BOOK/cross-tools/x86/variables.xml

    rd6d3617 r75a0379  
    6262        <row>
    6363          <entry>486 Compatibles</entry>
    64           <entry>i486-pc-linux-uclibc</entry>
     64          <entry>i486-pc-linux-musl</entry>
    6565          <entry>i486</entry>
    6666          <entry>Intel's i486</entry>
    … …  
    6868        <row>
    6969          <entry>Pentium, K6, 586 Compatibles</entry>
    70           <entry>i586-pc-linux-uclibc</entry>
     70          <entry>i586-pc-linux-musl</entry>
    7171          <entry>i586</entry>
    7272          <entry>Intel Pentium without MMX</entry>
    … …  
    7474        <row>
    7575          <entry>Pentium II, Pentium III, Pentium 4</entry>
    76           <entry>i686-pc-linux-uclibc</entry>
     76          <entry>i686-pc-linux-musl</entry>
    7777          <entry>i686</entry>
    7878          <entry>PentiumPro instruction set</entry>
    … …  
    8080        <row>
    8181          <entry>Athlon</entry>
    82           <entry>i686-pc-linux-uclibc</entry>
     82          <entry>i686-pc-linux-musl</entry>
    8383          <entry>athlon</entry>
    8484          <entry>AMD 32 bit Athlon</entry>
    … …  
    8686        <row>
    8787          <entry>Opteron</entry>
    88           <entry>x86_64-unknown-linux-uclibc</entry>
     88          <entry>x86_64-unknown-linux-musl</entry>
    8989          <entry>k8</entry>
    9090          <entry>AMD K8 processors with x86-64</entry>

  • BOOK/materials/common/packages.xml

    rd6d3617 r75a0379  
    9797
    9898    <varlistentry>
    99       <term>uClibc (&uclibc-version;) - <token>&uclibc-size;</token>:</term>
     99      <term>musl-libc (&musl-libc-version;) - <token>&musl-libc-size;</token>:</term>
    100100      <listitem>
    101         <para>Home page: <ulink url="&uclibc-home;"/></para>
    102         <para>Download: <ulink url="&uclibc-url;"/></para>
    103         <para>MD5 sum: <literal>&uclibc-md5;</literal></para>
     101        <para>Home page: <ulink url="&musl-libc-home;"/></para>
     102        <para>Download: <ulink url="&musl-libc-url;"/></para>
     103        <para>MD5 sum: <literal>&musl-libc-md5;</literal></para>
    104104      </listitem>
    105105    </varlistentry>

  • BOOK/materials/common/patches.xml

    rd6d3617 r75a0379  
    4848    </varlistentry>
    4949
    50     <varlistentry>
    51       <term>uClibc Configs Patch - <token>&uclibc-configs-patch-size;</token>:</term>
    52       <listitem>
    53         <para>Download: <ulink
    54         url="&patches-root;&uclibc-configs-patch;"/></para>
    55         <para>MD5 sum: <literal>&uclibc-configs-patch-md5;</literal></para>
    56       </listitem>
    57     </varlistentry>
    58 
    5950  </variablelist>
    6051

  • BOOK/packages.ent

    rd6d3617 r75a0379  
    6161<!ENTITY mpfr-home "http://www.mpfr.org/">
    6262
    63 <!ENTITY uclibc-version "0.9.31">
    64 <!ENTITY uclibc-size "2,244 KB">
    65 <!ENTITY uclibc-url "http://www.uclibc.org/downloads/uClibc-&uclibc-version;.tar.bz2">
    66 <!ENTITY uclibc-md5 "52fb8a494758630c8d3ddd7f1e0daafd">
    67 <!ENTITY uclibc-home "http://uclibc.org/">
     63<!ENTITY musl-libc-version "0.9.14">
     64<!ENTITY musl-libc-size "806 KB">
     65<!ENTITY musl-libc-url "http://www.musl-libc.org/releases/musl-&musl-libc-version;.tar.gz">
     66<!ENTITY musl-libc-md5 "bfb685695aa942e64c63170589e575b2">
     67<!ENTITY musl-libc-home "http://musl-libc.org/">
    6868
    6969<!-- Beyond CLFS library packages -->

  • BOOK/patches.ent

    rd6d3617 r75a0379  
    1919<!ENTITY iana-etc-update-patch-size "864 KB">
    2020
    21 <!ENTITY uclibc-configs-patch "uClibc-&uclibc-version;-configs-2.patch">
    22 <!ENTITY uclibc-configs-patch-md5 "e06455fe909d2572f7926f48cd066785">
    23 <!ENTITY uclibc-configs-patch-size "38 KB">
    24 
    2521<!-- Beyond patches -->
    2622
Note: See TracChangeset for help on using the changeset viewer.