Changeset 76135be in clfs-embedded


Ignore:
Timestamp:
Oct 16, 2013, 6:10:53 PM (11 years ago)
Author:
Andrew Bradford <andrew@…>
Branches:
master
Children:
b748208
Parents:
828afdc
git-author:
Andrew Bradford <andrew@…> (10/16/13 18:10:22)
git-committer:
Andrew Bradford <andrew@…> (10/16/13 18:10:53)
Message:

Add busybox-musl patch

Required in order to build busybox released version 1.21.1.

Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • BOOK/final-system/common/busybox.xml

    r828afdc r76135be  
    3131    <title>Installation of BusyBox</title>
    3232
    33 <!-- Version 1.18.4 does not require any "fixes" patch, none exists, yet
    34     <para os="p1">The following patch contains a number of fixes to version
    35     &busybox-version; by the BusyBox developers:</para>
    36 
    37 <screen os="p2"><userinput>patch -Np1 -i ../&busybox-fixes-patch;</userinput></screen>
    38 -->
    39 
    4033    <para os="a">First ensure the BusyBox source is completely clean:</para>
    4134
    4235<screen os="b"><userinput>make distclean</userinput></screen>
    4336
    44     <para os="c">The following patch contains a default configuration for BusyBox:</para>
     37    <para os="c">The following patch is needed for musl-libc:</para>
    4538
    46 <screen os="d"><userinput>patch -Np1 -i ../&busybox-config-patch;
    47 cp -v clfs/config .config</userinput></screen>
     39<screen os="d"><userinput>patch -Np1 -i ../&busybox-musl-patch;</userinput></screen>
    4840
    49     <note os="e">
    50       <para>Currently we are just telling BusyBox to use a generic
    51       configuration. For those for more adventurous, you can use
    52       <command>make menuconfig</command>, and create a custom or modified
    53       configuration for your build.</para>
     41    <note os="e"> <para>We tell BusyBox to use the generic defconfig.  For those
     42        for more adventurous, you can use <command>make menuconfig</command>,
     43        and create a custom or modified configuration for your build.</para>
    5444    </note>
    5545
    56     <para os="f">The following tells BusyBox to validate the configuration,
    57     and makes sure all required options are defined:</para>
     46    <para os="f">The following tells BusyBox to use the default
     47      configuration:</para>
    5848
    59 <screen os="g"><userinput>make oldconfig</userinput></screen>
     49<screen os="g"><userinput>ARCH="${CLFS_ARCH}" make defconfig</userinput></screen>
    6050
    6151    <para os="h">Compile the package:</para>
    6252
    63 <screen os="i"><userinput>make CROSS_COMPILE="${CLFS_TARGET}-"</userinput></screen>
     53<screen os="i"><userinput>ARCH="${CLFS_ARCH}" CROSS_COMPILE="${CLFS_TARGET}-" make</userinput></screen>
    6454
    6555    <para os="j">Install the package:</para>
    6656
    67 <screen os="k"><userinput>make CROSS_COMPILE="${CLFS_TARGET}-" \
     57<screen os="k"><userinput>ARCH="${CLFS_ARCH}" CROSS_COMPILE="${CLFS_TARGET}-" make \
    6858  CONFIG_PREFIX="${CLFS}/targetfs" install</userinput></screen>
    6959
  • BOOK/materials/common/patches.xml

    r828afdc r76135be  
    2929
    3030    <varlistentry>
    31       <term>BusyBox Config Patch - <token>&busybox-config-patch-size;</token>:</term>
     31      <term>BusyBox musl-libc Patch - <token>&busybox-musl-patch-size;</token>:</term>
    3232      <listitem>
    3333        <para>Download: <ulink
    34         url="&patches-root;&busybox-config-patch;"/></para>
    35         <para>MD5 sum: <literal>&busybox-config-patch-md5;</literal></para>
     34        url="&patches-root;&busybox-musl-patch;"/></para>
     35        <para>MD5 sum: <literal>&busybox-musl-patch-md5;</literal></para>
    3636      </listitem>
    3737    </varlistentry>
  • BOOK/patches.ent

    r828afdc r76135be  
    99<!ENTITY binutils-musl-patch-size "1 KB">
    1010
    11 <!ENTITY busybox-config-patch "busybox-&busybox-version;-config-1.patch">
    12 <!ENTITY busybox-config-patch-md5 "bd06ac3799960df8c72f73bb4ad27e30">
    13 <!ENTITY busybox-config-patch-size "26 KB">
     11<!ENTITY busybox-musl-patch "busybox-&busybox-version;-musl-1.patch">
     12<!ENTITY busybox-musl-patch-md5 "335622b0f2bf4e18e9d93fd48afe53da">
     13<!ENTITY busybox-musl-patch-size "1 KB">
    1414
    1515<!--
Note: See TracChangeset for help on using the changeset viewer.