Changeset 2567553 in clfs-embedded


Ignore:
Timestamp:
Nov 8, 2008, 8:24:32 AM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
master
Children:
3c8eaa6
Parents:
e2fbc29
Message:

Updated Busybox to 1.12.1.
Patched uClibc so struct flock doesn't get redefined.

Files:
3 added
1 deleted
10 edited

Legend:

Unmodified
Added
Removed
  • BOOK/cross-tools/arm/uclibc.xml

    re2fbc29 r2567553  
    2828    architecture:</para>
    2929
    30 <screen os="b"><userinput>
    31 cp extra/Configs/Config.arm extra/Configs/Config.arm.orig
     30<screen os="b"><userinput>cp extra/Configs/Config.arm extra/Configs/Config.arm.orig
    3231sed -e "/default/s:OABI:EABI:" \
    3332   extra/Configs/Config.arm.orig > extra/Configs/Config.arm</userinput></screen>
     
    3635  href="../x86/uclibc.xml"
    3736  xpointer="xpointer(//*[@os='e'])"/>
     37
     38  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     39  href="../x86/uclibc.xml"
     40  xpointer="xpointer(//*[@os='p1'])"/>
     41
     42  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     43  href="../x86/uclibc.xml"
     44  xpointer="xpointer(//*[@os='p2'])"/>
    3845
    3946  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
  • BOOK/cross-tools/mips/uclibc.xml

    re2fbc29 r2567553  
    3636  href="../x86/uclibc.xml"
    3737  xpointer="xpointer(//*[@os='e'])"/>
     38
     39  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     40  href="../x86/uclibc.xml"
     41  xpointer="xpointer(//*[@os='p1'])"/>
     42
     43  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     44  href="../x86/uclibc.xml"
     45  xpointer="xpointer(//*[@os='p2'])"/>
    3846
    3947  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
  • BOOK/cross-tools/x86/uclibc.xml

    re2fbc29 r2567553  
    3434      do a more custom build for your uClibc installation.</para>
    3535    </note>
     36
     37    <para os="p1">The following patch creates a condition in a header so that
     38    the struct flock will not be redefined:</para>
     39
     40<screen os="p2"><userinput>patch -Np1 -i ../&uclibc-flock_fixes-patch;</userinput></screen>
    3641
    3742    <para os="f">Create the default configuration:</para>
  • BOOK/final-system/arm/busybox.xml

    re2fbc29 r2567553  
    3737    href="../x86/busybox.xml"
    3838    xpointer="xpointer(//*[@os='p4'])"/>
    39 
    40     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    41     href="../x86/busybox.xml"
    42     xpointer="xpointer(//*[@os='p5'])"/>
    4339
    4440    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
  • BOOK/final-system/mips/busybox.xml

    re2fbc29 r2567553  
    3737    href="../x86/busybox.xml"
    3838    xpointer="xpointer(//*[@os='p4'])"/>
    39 
    40     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    41     href="../x86/busybox.xml"
    42     xpointer="xpointer(//*[@os='p5'])"/>
    4339
    4440    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
  • BOOK/final-system/x86/busybox.xml

    re2fbc29 r2567553  
    3030    <title>Installation of Busybox</title>
    3131
    32     <para os="p1">Before you build BusyBox, you may want to check the following URL for
    33     patches that the upstream maintainer of BusyBox has released to fix issues.
    34     <ulink url="http://busybox.net/downloads/fixes-&busybox-version;"/></para>
    35 
    36     <para os="p2">Here's an example of how to apply the patches from Busybox's website
    37     replace {patch_name} with the name of the patch:</para>
    38 
    39 <screen os="p3" role="nodump"><userinput>patch -Np1 -i ../busybox-&busybox-version;{patch_name}</userinput></screen>
    40 
    41     <para os="p4">The following patch fixes some issues that are related to the
     32    <para os="p1">The following patch fixes some issues that are related to the
    4233    headers we are using:</para>
    4334
    44 <screen os="p5"><userinput>patch -Np1 -i ../&busybox-fixes-patch;</userinput></screen>
     35<screen os="p2"><userinput>patch -Np1 -i ../&busybox-fixes-patch;</userinput></screen>
     36
     37    <para os="p3">The following patch corrects some includes in
     38    <filename>iptunnel.c</filename> to be compatible with the sanatized
     39    kernel headers installed earlier:</para>
     40
     41<screen os="p4"><userinput>patch -Np1 -i ../&busybox-iptunnel_headers-patch;</userinput></screen>
    4542
    4643    <para os="a">Create the default configuration:</para>
  • BOOK/introduction/common/changelog.xml

    re2fbc29 r2567553  
    4141      <itemizedlist>
    4242        <listitem>
     43          <para>[jciccone] - Updated Busybox to 1.12.1.</para>
     44        </listitem>
     45        <listitem>
    4346          <para>[jciccone] - Updated uClibc to 0.9.30-rc3.</para>
    4447        </listitem>
  • BOOK/materials/common/patches.xml

    re2fbc29 r2567553  
    3838
    3939    <varlistentry>
     40      <term>Busybox Iptunnel Headers Patch - <token>&busybox-iptunnel_headers-patch-size;</token>:</term>
     41      <listitem>
     42        <para>Download: <ulink
     43        url="&patches-root;&busybox-iptunnel_headers-patch;"/></para>
     44        <para>MD5 sum: <literal>&busybox-iptunnel_headers-patch-md5;</literal></para>
     45      </listitem>
     46    </varlistentry>
     47
     48    <varlistentry>
    4049      <term>GCC Posix Patch - <token>&gcc-posix-patch-size;</token>:</term>
    4150      <listitem>
     
    4352        url="&patches-root;&gcc-posix-patch;"/></para>
    4453        <para>MD5 sum: <literal>&gcc-posix-patch-md5;</literal></para>
     54      </listitem>
     55    </varlistentry>
     56
     57    <varlistentry>
     58      <term>uClibc Flock Fixes Patch - <token>&uclibc-flock_fixes-patch-size;</token>:</term>
     59      <listitem>
     60        <para>Downloads: <ulink
     61        url="&patches-root;&uclibc-flock_fixes-patch;"/></para>
     62        <para>MD5 sum: <literal>&uclibc-flock_fixes-patch-md5;</literal></para>
    4563      </listitem>
    4664    </varlistentry>
  • BOOK/packages.ent

    re2fbc29 r2567553  
    1111<!ENTITY binutils-home "http://sources.redhat.com/binutils/">
    1212
    13 <!ENTITY busybox-version "1.8.2">
    14 <!ENTITY busybox-size "1,732 KB">
     13<!ENTITY busybox-version "1.12.1">
     14<!ENTITY busybox-size "1,980 KB">
    1515<!ENTITY busybox-url "http://busybox.net/downloads/busybox-&busybox-version;.tar.bz2">
    16 <!ENTITY busybox-md5 "5794c6187c7cc8176c52b96af9bf2478">
     16<!ENTITY busybox-md5 "dc2e5e00d6fee8229ae92884c68733a7">
    1717<!ENTITY busybox-home "http://www.busybox.net">
    1818
  • BOOK/patches.ent

    re2fbc29 r2567553  
    1010
    1111<!ENTITY busybox-fixes-patch "busybox-&busybox-version;-fixes-1.patch">
    12 <!ENTITY busybox-fixes-patch-md5 "8c63ff58287e5de40a40e81145a8a1ad">
    13 <!ENTITY busybox-fixes-patch-size "20 KB">
     12<!ENTITY busybox-fixes-patch-md5 "984f771a81475c234b1fc3f92c672b4d">
     13<!ENTITY busybox-fixes-patch-size "16 KB">
     14
     15<!ENTITY busybox-iptunnel_headers-patch "busybox-&busybox-version;-iptunnel_headers-1.patch">
     16<!ENTITY busybox-iptunnel_headers-patch-md5 "f0771cde6810a68c5459683b8c5e69b31">
     17<!ENTITY busybox-iptunnel_headers-patch-size "4 KB">
    1418
    1519<!ENTITY gcc-posix-patch "gcc-&gcc-version;-posix-1.patch">
    1620<!ENTITY gcc-posix-patch-md5 "ed26ea522e014b2e39adf066bd44053b">
    1721<!ENTITY gcc-posix-patch-size "12 KB">
     22
     23<!ENTITY uclibc-flock_fixes-patch "uClibc-&uclibc-version;-flock_fixes-1.patch">
     24<!ENTITY uclibc-flock_fixes-patch-md5 "aaff25f9503fe380f82be79f82aa04e9">
     25<!ENTITY uclibc-flock_fixes-patch-size "24 KB">
    1826
    1927<!ENTITY zlib-destdir-patch "zlib-&zlib-version;-DESTDIR-1.patch">
Note: See TracChangeset for help on using the changeset viewer.