Changeset 22cd957


Ignore:
Timestamp:
Apr 16, 2011, 4:17:29 PM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
a32a66d
Parents:
9728f92
git-author:
Joe Ciccone <jciccone@…> (04/16/11 16:17:26)
git-committer:
Joe Ciccone <jciccone@…> (04/16/11 16:17:29)
Message:

Add a sed to EGLIBC in the final system that will fix an issue with
the installation test script.

Location:
BOOK/final-system
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/alpha/eglibc.xml

    r9728f92 r22cd957  
    2525    href="../common/eglibc.xml"
    2626    xpointer="xpointer(//*[@os='z'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/eglibc.xml"
     30    xpointer="xpointer(//*[@os='l1'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     33    href="../common/eglibc.xml"
     34    xpointer="xpointer(//*[@os='l2'])"/>
    2735
    2836    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r9728f92 r22cd957  
    3939    </note>
    4040
    41     <para os="l3">The following sed makes sure that newly built EGLIBC is tested,
    42     during make install, instead of the one we previously build:</para>
    43 
    44 <screen os="l4"><userinput>LINKER=$(readelf -l $(file /tools/lib/libc-* | cut -f1 -d:) | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
     41    <para os="l1">At the end of the installation, the build system will run
     42    a sanity test to make sure everything installed properly. This script will
     43    attempt to test for a library that is only used in the test suite and is
     44    never installed. Prevent the script from testing for this library with the
     45    following command:</para>
     46
     47<screen os="l2"><userinput>sed -i 's/\(&amp;&amp; $name ne\) "db1"/ &amp; \1 "nss_test1"/' scripts/test-installation.pl</userinput></screen>
     48
     49    <para os="l3">This same script performs its tests by attempting to compile
     50    test programs against certain libraries. However it does not specify the
     51    ld.so, and our toolchain is still configured to use the one in /tools. The
     52    following set of commands will force the script to use the complete path
     53    of the new ld.so that was just installed:</para>
     54
     55<screen os="l4"><userinput>LINKER=$(readelf -l /tools/bin/bash | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
    4556sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=${LINKER} -o|" \
    4657  scripts/test-installation.pl

  • BOOK/final-system/mips/eglibc.xml

    r9728f92 r22cd957  
    2525    href="../common/eglibc.xml"
    2626    xpointer="xpointer(//*[@os='z'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/eglibc.xml"
     30    xpointer="xpointer(//*[@os='l1'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     33    href="../common/eglibc.xml"
     34    xpointer="xpointer(//*[@os='l2'])"/>
    2735
    2836    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/mips64-64/eglibc.xml

    r9728f92 r22cd957  
    2525    href="../common/eglibc.xml"
    2626    xpointer="xpointer(//*[@os='z'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/eglibc.xml"
     30    xpointer="xpointer(//*[@os='l1'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     33    href="../common/eglibc.xml"
     34    xpointer="xpointer(//*[@os='l2'])"/>
    2735
    2836    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/mips64/eglibc-64bit.xml

    r9728f92 r22cd957  
    2525    href="../common/eglibc.xml"
    2626    xpointer="xpointer(//*[@os='l3'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/eglibc.xml"
     30    xpointer="xpointer(//*[@os='l1'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     33    href="../common/eglibc.xml"
     34    xpointer="xpointer(//*[@os='l2'])"/>
    2735
    2836    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/mips64/eglibc-n32.xml

    r9728f92 r22cd957  
    2121  <sect2 role="installation">
    2222    <title>Installation of EGLIBC</title>
     23
     24    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     25    href="../common/eglibc.xml"
     26    xpointer="xpointer(//*[@os='l1'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/eglibc.xml"
     30    xpointer="xpointer(//*[@os='l2'])"/>
    2331
    2432    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r9728f92 r22cd957  
    2626    href="../common/eglibc.xml"
    2727    xpointer="xpointer(//*[@os='z'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../common/eglibc.xml"
     31    xpointer="xpointer(//*[@os='l1'])"/>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../common/eglibc.xml"
     35    xpointer="xpointer(//*[@os='l2'])"/>
    2836
    2937    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/eglibc-64bit.xml

    r9728f92 r22cd957  
    2121  <sect2 role="installation">
    2222    <title>Installation of EGLIBC</title>
     23
     24    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     25    href="../common/eglibc.xml"
     26    xpointer="xpointer(//*[@os='l1'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/eglibc.xml"
     30    xpointer="xpointer(//*[@os='l2'])"/>
    2331
    2432    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r9728f92 r22cd957  
    2626    href="../common/eglibc.xml"
    2727    xpointer="xpointer(//*[@os='z'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../common/eglibc.xml"
     31    xpointer="xpointer(//*[@os='l1'])"/>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../common/eglibc.xml"
     35    xpointer="xpointer(//*[@os='l2'])"/>
    2836
    2937    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r9728f92 r22cd957  
    2525    href="../common/eglibc.xml"
    2626    xpointer="xpointer(//*[@os='z'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/eglibc.xml"
     30    xpointer="xpointer(//*[@os='l1'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     33    href="../common/eglibc.xml"
     34    xpointer="xpointer(//*[@os='l2'])"/>
    2735
    2836    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/ppc64/eglibc-64bit.xml

    r9728f92 r22cd957  
    2121  <sect2 role="installation">
    2222    <title>Installation of EGLIBC</title>
     23
     24    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     25    href="../common/eglibc.xml"
     26    xpointer="xpointer(//*[@os='l1'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/eglibc.xml"
     30    xpointer="xpointer(//*[@os='l2'])"/>
    2331
    2432    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r9728f92 r22cd957  
    2626    href="../common/eglibc.xml"
    2727    xpointer="xpointer(//*[@os='z'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../common/eglibc.xml"
     31    xpointer="xpointer(//*[@os='l1'])"/>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../common/eglibc.xml"
     35    xpointer="xpointer(//*[@os='l2'])"/>
    2836
    2937    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/sparc64-64/eglibc.xml

    r9728f92 r22cd957  
    2525    href="../common/eglibc.xml"
    2626    xpointer="xpointer(//*[@os='z'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/eglibc.xml"
     30    xpointer="xpointer(//*[@os='l1'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     33    href="../common/eglibc.xml"
     34    xpointer="xpointer(//*[@os='l2'])"/>
    2735
    2836    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/sparc64/eglibc-64bit.xml

    r9728f92 r22cd957  
    2121  <sect2 role="installation">
    2222    <title>Installation of EGLIBC</title>
     23
     24    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     25    href="../common/eglibc.xml"
     26    xpointer="xpointer(//*[@os='l1'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/eglibc.xml"
     30    xpointer="xpointer(//*[@os='l2'])"/>
    2331
    2432    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/x86/eglibc.xml

    r9728f92 r22cd957  
    2525    href="../common/eglibc.xml"
    2626    xpointer="xpointer(//*[@os='z'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/eglibc.xml"
     30    xpointer="xpointer(//*[@os='l1'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     33    href="../common/eglibc.xml"
     34    xpointer="xpointer(//*[@os='l2'])"/>
    2735
    2836    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/x86_64-64/eglibc.xml

    r9728f92 r22cd957  
    2525    href="../common/eglibc.xml"
    2626    xpointer="xpointer(//*[@os='z'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/eglibc.xml"
     30    xpointer="xpointer(//*[@os='l1'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     33    href="../common/eglibc.xml"
     34    xpointer="xpointer(//*[@os='l2'])"/>
    2735
    2836    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/x86_64/eglibc-64bit.xml

    r9728f92 r22cd957  
    2121  <sect2 role="installation">
    2222    <title>Installation of Glibc</title>
     23
     24    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     25    href="../common/eglibc.xml"
     26    xpointer="xpointer(//*[@os='l1'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/eglibc.xml"
     30    xpointer="xpointer(//*[@os='l2'])"/>
    2331
    2432    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/x86_64/eglibc.xml

    r9728f92 r22cd957  
    2626    href="../common/eglibc.xml"
    2727    xpointer="xpointer(//*[@os='z'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../common/eglibc.xml"
     31    xpointer="xpointer(//*[@os='l1'])"/>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../common/eglibc.xml"
     35    xpointer="xpointer(//*[@os='l2'])"/>
    2836
    2937    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.