Changeset 72d6a1b


Ignore:
Timestamp:
Apr 2, 2014, 7:26:57 PM (11 years ago)
Author:
William Harrington <kb0iic@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
4c1c923
Parents:
bb525ace
Message:

Tidy up Acl xml, add sed for doc directory install with version, add sed for test suite fix, and add test suite commands.

Location:
BOOK/final-system
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    rbb525ace r72d6a1b  
    2525    <title>Installation of ACL</title>
    2626
    27     <para os="a">Prepare ACL for compilation:</para>
     27    <para os="a">Apply a sed to install the documentation with a versioned
     28    directory:</para>
    2829
    29 <screen os="b"><userinput>./configure --prefix=/usr --libexecdir=/usr/lib</userinput></screen>
     30<screen os="b"><userinput>sed -i -e 's|/@pkg_name@|&amp;-@pkg_version@|' include/builddefs.in</userinput></screen>
    3031
    31     <para os="c">Compile the package:</para>
     32    <para os="c">Apply a sed to fix a few tests:</para>
    3233
    33 <screen os="d"><userinput>make</userinput></screen>
     34<screen os="d"><userinput>sed -i "s:| sed.*::g" test/{sbits-restore,cp,misc}.test</userinput></screen>
     35 
     36    <para os="e">Prepare ACL for compilation:</para>
    3437
    35     <para os="e">This package does not come with a test suite.</para>
     38<screen os="f"><userinput>./configure --prefix=/usr --libexecdir=/usr/lib</userinput></screen>
    3639
    37     <para os="f">Install the package:</para>
     40    <para os="g">Compile the package:</para>
    3841
    39 <screen os="g"><userinput>make install install-dev install-lib</userinput></screen>
     42<screen os="h"><userinput>make</userinput></screen>
    4043
    41     <para os="h">Move the shared library to <filename class="directory">/lib</filename>
     44    <para os="i">The Acl tests need a filesystem which supports access controls
     45    after Coreutils has been built with the Acl libraries. Return to this
     46    section after Coreutils has been installed. Test the results:</para>
     47
     48<screen os="j"><userinput remap="test">make tests</userinput></screen>
     49
     50    <para os="k">Install the package:</para>
     51
     52<screen os="l"><userinput>make install install-dev install-lib</userinput></screen>
     53
     54    <para os="m">Move the shared library to <filename class="directory">/lib</filename>
    4255    and recreate the symlink in <filename class="directory">/usr/lib</filename>:</para>
    4356
    44 <screen os="i"><userinput>mv -v /usr/lib/libacl.so.* /lib
     57<screen os="n"><userinput>mv -v /usr/lib/libacl.so.* /lib
    4558ln -sfv ../../lib/libacl.so.1 /usr/lib/libacl.so</userinput></screen>
    4659
    47     <para os="j">Set the proper permissions on the shared library:</para>
     60    <para os="o">Set the proper permissions on the shared library:</para>
    4861
    49 <screen os="k"><userinput>chmod 755 -v /lib/libacl.so.1.1.0</userinput></screen>
     62<screen os="p"><userinput>chmod 755 -v /lib/libacl.so.1.1.0</userinput></screen>
    5063
    5164  </sect2>

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

    rbb525ace r72d6a1b  
    2323
    2424  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    25     href="../common/acl.xml"
    26     xpointer="xpointer(//*[@os='a'])"/>
     25  href="../common/acl.xml"
     26  xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
     28 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29  href="../common/acl.xml"
     30  xpointer="xpointer(//*[@os='b'])"/>
     31
     32  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     33  href="../common/acl.xml"
     34  xpointer="xpointer(//*[@os='c'])"/>
     35
     36  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     37  href="../common/acl.xml"
     38  xpointer="xpointer(//*[@os='d'])"/>
     39
     40  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     41  href="../common/acl.xml"
     42  xpointer="xpointer(//*[@os='e'])"/>
     43 
     44<screen os="f"><userinput>CC="gcc ${BUILD64}" ./configure \
    2945    --prefix=/usr --libdir=/lib64 \
    3046    --libexecdir=/usr/lib64</userinput></screen>
    3147
    32   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    33     href="../common/acl.xml"
    34     xpointer="xpointer(//*[@os='c'])"/>
     48 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     49  href="../common/acl.xml"
     50  xpointer="xpointer(//*[@os='g'])"/>
    3551
    3652  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="../common/acl.xml"
    38     xpointer="xpointer(//*[@os='d'])"/>
     53  href="../common/acl.xml"
     54  xpointer="xpointer(//*[@os='h'])"/>
     55
     56 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     57  href="../common/acl.xml"
     58  xpointer="xpointer(//*[@os='i'])"/>
    3959
    4060  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    41     href="../common/acl.xml"
    42     xpointer="xpointer(//*[@os='e'])"/>
     61  href="../common/acl.xml"
     62  xpointer="xpointer(//*[@os='j'])"/>
     63
     64 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     65  href="../common/acl.xml"
     66  xpointer="xpointer(//*[@os='k'])"/>
    4367
    4468  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    45     href="../common/acl.xml"
    46     xpointer="xpointer(//*[@os='f'])"/>
     69  href="../common/acl.xml"
     70  xpointer="xpointer(//*[@os='l'])"/>
    4771
    48   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    49     href="../common/acl.xml"
    50     xpointer="xpointer(//*[@os='g'])"/>
     72    <para os="m">Recreate the symlink in <filename class="directory">/usr/lib64
     73    </filename> and remove the shared link from <filename class="directory">
     74    /lib64</filename>:</para>
    5175
    52     <para os="h">Recreate the symlink in <filename class="directory">/usr/lib64</filename> and remove the shared link from <filename class="directory">/lib64</filename>:</para>
    53 
    54 <screen os="i"><userinput>ln -sfv ../../lib64/$(readlink /lib64/libacl.so) /usr/lib64/libacl.so
     76<screen os="n"><userinput>ln -sfv ../../lib64/$(readlink /lib64/libacl.so) /usr/lib64/libacl.so
    5577rm -v /lib64/libacl.so</userinput></screen>
    5678
    5779  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    58     href="../common/acl.xml"
    59     xpointer="xpointer(//*[@os='j'])"/>
     80  href="../common/acl.xml"
     81  xpointer="xpointer(//*[@os='o'])"/>
    6082
    61 <screen os="k"><userinput>chmod 755 -v /lib64/libacl.so.1.1.0</userinput></screen>
     83<screen os="p"><userinput>chmod 755 -v /lib64/libacl.so.1.1.0</userinput></screen>
    6284
    6385  </sect2>

  • BOOK/final-system/multilib/acl-n32.xml

    rbb525ace r72d6a1b  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure \
    30     --prefix=/usr --libdir=/lib32 \
    31     --libexecdir=/usr/lib32</userinput></screen>
     29  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../common/acl.xml"
     31    xpointer="xpointer(//*[@os='b'])"/>
    3232
    3333  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4343    xpointer="xpointer(//*[@os='e'])"/>
    4444
    45   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     45<screen os="f"><userinput>CC="gcc ${BUILDN32}" ./configure \
     46    --prefix=/usr --libdir=/lib32 \
     47    --libexecdir=/usr/lib32</userinput></screen>
     48
     49 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4650    href="../common/acl.xml"
    47     xpointer="xpointer(//*[@os='f'])"/>
     51    xpointer="xpointer(//*[@os='g'])"/>
    4852
    4953  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5054    href="../common/acl.xml"
    51     xpointer="xpointer(//*[@os='g'])"/>
    52 
    53     <para os="h">Recreate the symlink in <filename class="directory">/usr/lib32</filename> and remove the shared link from <filename class="directory">/lib32</filename>:</para>
    54 
    55 <screen os="i"><userinput>ln -sfv ../../lib32/$(readlink /lib32/libacl.so) /usr/lib32/libacl.so
    56 rm -v /lib32/libacl.so</userinput></screen>
     55    xpointer="xpointer(//*[@os='h'])"/>
     56 
     57 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     58    href="../common/acl.xml"
     59    xpointer="xpointer(//*[@os='i'])"/>
    5760
    5861  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    6063    xpointer="xpointer(//*[@os='j'])"/>
    6164
    62 <screen os="k"><userinput>chmod 755 -v /lib32/libacl.so.1.1.0</userinput></screen>
     65 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     66    href="../common/acl.xml"
     67    xpointer="xpointer(//*[@os='k'])"/>
     68
     69  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     70    href="../common/acl.xml"
     71    xpointer="xpointer(//*[@os='l'])"/>
     72
     73    <para os="m">Recreate the symlink in <filename class="directory">/usr/lib32
     74    </filename> and remove the shared link from <filename class="directory">
     75    /lib32</filename>:</para>
     76
     77<screen os="n"><userinput>ln -sfv ../../lib32/$(readlink /lib32/libacl.so) /usr/lib32/libacl.so
     78rm -v /lib32/libacl.so</userinput></screen>
     79
     80  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     81    href="../common/acl.xml"
     82    xpointer="xpointer(//*[@os='o'])"/>
     83
     84<screen os="p"><userinput>chmod 755 -v /lib32/libacl.so.1.1.0</userinput></screen>
    6385
    6486  </sect2>

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

    rbb525ace r72d6a1b  
    2424
    2525  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/acl.xml"
    27     xpointer="xpointer(//*[@os='a'])"/>
     26  href="../common/acl.xml"
     27  xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure \
     29  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30  href="../common/acl.xml"
     31  xpointer="xpointer(//*[@os='b'])"/>
     32
     33  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34  href="../common/acl.xml"
     35  xpointer="xpointer(//*[@os='c'])"/>
     36
     37  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38  href="../common/acl.xml"
     39  xpointer="xpointer(//*[@os='d'])"/>
     40
     41  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     42  href="../common/acl.xml"
     43  xpointer="xpointer(//*[@os='e'])"/>
     44
     45<screen os="f"><userinput>CC="gcc ${BUILD32}" ./configure \
    3046    --prefix=/usr --libdir=/lib \
    3147    --libexecdir=/usr/lib</userinput></screen>
    3248
    3349  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    34     href="../common/acl.xml"
    35     xpointer="xpointer(//*[@os='c'])"/>
     50  href="../common/acl.xml"
     51  xpointer="xpointer(//*[@os='g'])"/>
    3652
    3753  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    38     href="../common/acl.xml"
    39     xpointer="xpointer(//*[@os='d'])"/>
     54  href="../common/acl.xml"
     55  xpointer="xpointer(//*[@os='h'])"/>
    4056
    4157  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    42     href="../common/acl.xml"
    43     xpointer="xpointer(//*[@os='e'])"/>
     58  href="../common/acl.xml"
     59  xpointer="xpointer(//*[@os='i'])"/>
    4460
    4561  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    46     href="../common/acl.xml"
    47     xpointer="xpointer(//*[@os='f'])"/>
     62  href="../common/acl.xml"
     63  xpointer="xpointer(//*[@os='j'])"/>
    4864
    4965  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    50     href="../common/acl.xml"
    51     xpointer="xpointer(//*[@os='g'])"/>
    52 
    53     <para os="h">Recreate the symlink in <filename class="directory">/usr/lib</filename> and remove the shared link from <filename class="directory">/lib</filename>:</para>
    54 
    55 <screen os="i"><userinput>ln -sfv ../../lib/$(readlink /lib/libacl.so) /usr/lib/libacl.so
    56 rm -v /lib/libacl.so</userinput></screen>
     66  href="../common/acl.xml"
     67  xpointer="xpointer(//*[@os='k'])"/>
    5768
    5869  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    59     href="../common/acl.xml"
    60     xpointer="xpointer(//*[@os='j'])"/>
     70  href="../common/acl.xml"
     71  xpointer="xpointer(//*[@os='l'])"/>
    6172
    62 <screen os="k"><userinput>chmod 755 -v /lib/libacl.so.1.1.0</userinput></screen>
     73  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     74  href="../common/acl.xml"
     75  xpointer="xpointer(//*[@os='m'])"/>
     76
     77  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     78  href="../common/acl.xml"
     79  xpointer="xpointer(//*[@os='n'])"/>
     80
     81  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     82  href="../common/acl.xml"
     83  xpointer="xpointer(//*[@os='o'])"/>
     84
     85  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     86  href="../common/acl.xml"
     87  xpointer="xpointer(//*[@os='p'])"/>
    6388
    6489  </sect2>
Note: See TracChangeset for help on using the changeset viewer.