Changeset 0646479 for BOOK/final-system


Ignore:
Timestamp:
Aug 14, 2014, 2:27:23 AM (10 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, master, systemd
Children:
7eea5e4
Parents:
09e511ce
Message:

Command to disable test lib is no longer needed

Location:
BOOK/final-system
Files:
15 edited

Legend:

Unmodified
Added
Removed

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

    r09e511ce r0646479  
    4040
    4141    <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     path to <filename class="libraryfile">ld.so</filename>, and our toolchain
     42    a sanity test to make sure everything installed properly. This script
     43    performs its tests by attempting to compile test programs against certain
     44    libraries. However it does not specify the path to
     45    <filename class="libraryfile">ld.so</filename>, and our toolchain
    5246    is still configured to use the one in
    5347    <filename class="directory">/tools</filename>. The following set of
    … …  
    5549    <filename class="libraryfile">ld.so</filename> that was just installed:</para>
    5650
    57 <screen os="l4"><userinput>LINKER=$(readelf -l /tools/bin/bash | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
     51<screen os="l2"><userinput>LINKER=$(readelf -l /tools/bin/bash | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
    5852sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=${LINKER} -o|" \
    5953  scripts/test-installation.pl

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

    r09e511ce r0646479  
    3333    href="../common/glibc.xml"
    3434    xpointer="xpointer(//*[@os='l2'])"/>
    35 
    36     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="../common/glibc.xml"
    38     xpointer="xpointer(//*[@os='l3'])"/>
    39 
    40     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    41     href="../common/glibc.xml"
    42     xpointer="xpointer(//*[@os='l4'])"/>
    4335
    4436    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r09e511ce r0646479  
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2525    href="../common/glibc.xml"
    26     xpointer="xpointer(//*[@os='l3'])"/>
    27 
    28     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="../common/glibc.xml"
    3026    xpointer="xpointer(//*[@os='l1'])"/>
    3127
    3228    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    33     href="../common/glibc.xml"
     29    href="../multilib/glibc-64bit.xml"
    3430    xpointer="xpointer(//*[@os='l2'])"/>
    35 
    36     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="../multilib/glibc-64bit.xml"
    38     xpointer="xpointer(//*[@os='l4'])"/>
    3931
    4032    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r09e511ce r0646479  
    2626    xpointer="xpointer(//*[@os='l1'])"/>
    2727
    28     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="../common/glibc.xml"
    30     xpointer="xpointer(//*[@os='l2'])"/>
    31 
    32     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    33     href="../common/glibc.xml"
    34     xpointer="xpointer(//*[@os='l3'])"/>
    35 
    36 <screen os="l4"><userinput>LINKER=$(readelf -l /tools/bin/bash | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
     28<screen os="l2"><userinput>LINKER=$(readelf -l /tools/bin/bash | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
    3729sed -i "s|libs -o|libs -L/usr/lib32 -Wl,-dynamic-linker=${LINKER} -o|" \
    3830  scripts/test-installation.pl

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

    r09e511ce r0646479  
    2626    xpointer="xpointer(//*[@os='l1'])"/>
    2727
    28     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="../common/glibc.xml"
    30     xpointer="xpointer(//*[@os='l2'])"/>
    31 
    32     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    33     href="../common/glibc.xml"
    34     xpointer="xpointer(//*[@os='l3'])"/>
    35 
    36 <screen os="l4"><userinput>LINKER=$(readelf -l /tools/bin/bash | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
     28<screen os="l2"><userinput>LINKER=$(readelf -l /tools/bin/bash | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
    3729sed -i "s|libs -o|libs -L/usr/lib64 -Wl,-dynamic-linker=${LINKER} -o|" \
    3830  scripts/test-installation.pl

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

    r09e511ce r0646479  
    3434    href="../common/glibc.xml"
    3535    xpointer="xpointer(//*[@os='l2'])"/>
    36 
    37     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    38     href="../common/glibc.xml"
    39     xpointer="xpointer(//*[@os='l3'])"/>
    40 
    41     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    42     href="../common/glibc.xml"
    43     xpointer="xpointer(//*[@os='l4'])"/>
    4436
    4537    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r09e511ce r0646479  
    3333    href="../common/glibc.xml"
    3434    xpointer="xpointer(//*[@os='l2'])"/>
    35 
    36     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="../common/glibc.xml"
    38     xpointer="xpointer(//*[@os='l3'])"/>
    39 
    40     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    41     href="../common/glibc.xml"
    42     xpointer="xpointer(//*[@os='l4'])"/>
    4335
    4436    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/ppc64-64/glibc.xml

    r09e511ce r0646479  
    3333    href="../common/glibc.xml"
    3434    xpointer="xpointer(//*[@os='l2'])"/>
    35 
    36     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="../common/glibc.xml"
    38     xpointer="xpointer(//*[@os='l3'])"/>
    39 
    40     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    41     href="../common/glibc.xml"
    42     xpointer="xpointer(//*[@os='l4'])"/>
    4335
    4436    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r09e511ce r0646479  
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="../common/glibc.xml"
     29    href="../multilib/glibc-64bit.xml"
    3030    xpointer="xpointer(//*[@os='l2'])"/>
    31 
    32     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    33     href="../common/glibc.xml"
    34     xpointer="xpointer(//*[@os='l3'])"/>
    35 
    36     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="../multilib/glibc-64bit.xml"
    38     xpointer="xpointer(//*[@os='l4'])"/>
    3931
    4032    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r09e511ce r0646479  
    3434    href="../common/glibc.xml"
    3535    xpointer="xpointer(//*[@os='l2'])"/>
    36 
    37     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    38     href="../common/glibc.xml"
    39     xpointer="xpointer(//*[@os='l3'])"/>
    40 
    41     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    42     href="../common/glibc.xml"
    43     xpointer="xpointer(//*[@os='l4'])"/>
    4436
    4537    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r09e511ce r0646479  
    3333    href="../common/glibc.xml"
    3434    xpointer="xpointer(//*[@os='l2'])"/>
    35 
    36     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="../common/glibc.xml"
    38     xpointer="xpointer(//*[@os='l3'])"/>
    39 
    40     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    41     href="../common/glibc.xml"
    42     xpointer="xpointer(//*[@os='l4'])"/>
    4335
    4436    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r09e511ce r0646479  
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="../common/glibc.xml"
     29    href="../multilib/glibc-64bit.xml"
    3030    xpointer="xpointer(//*[@os='l2'])"/>
    31 
    32     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    33     href="../common/glibc.xml"
    34     xpointer="xpointer(//*[@os='l3'])"/>
    35 
    36     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="../multilib/glibc-64bit.xml"
    38     xpointer="xpointer(//*[@os='l4'])"/>
    3931
    4032    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r09e511ce r0646479  
    3333    href="../common/glibc.xml"
    3434    xpointer="xpointer(//*[@os='l2'])"/>
    35 
    36     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="../common/glibc.xml"
    38     xpointer="xpointer(//*[@os='l3'])"/>
    39 
    40     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    41     href="../common/glibc.xml"
    42     xpointer="xpointer(//*[@os='l4'])"/>
    4335
    4436    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r09e511ce r0646479  
    3333    href="../common/glibc.xml"
    3434    xpointer="xpointer(//*[@os='l2'])"/>
    35 
    36     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="../common/glibc.xml"
    38     xpointer="xpointer(//*[@os='l3'])"/>
    39 
    40     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    41     href="../common/glibc.xml"
    42     xpointer="xpointer(//*[@os='l4'])"/>
    4335
    4436    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r09e511ce r0646479  
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="../common/glibc.xml"
     29    href="../multilib/glibc-64bit.xml"
    3030    xpointer="xpointer(//*[@os='l2'])"/>
    31 
    32     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    33     href="../common/glibc.xml"
    34     xpointer="xpointer(//*[@os='l3'])"/>
    35 
    36     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="../multilib/glibc-64bit.xml"
    38     xpointer="xpointer(//*[@os='l4'])"/>
    3931
    4032    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.