Changeset ef42827 for BOOK/final-system


Ignore:
Timestamp:
Jun 26, 2014, 2:52:21 AM (11 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-sysvinit, sysvinit
Children:
c1c9615
Parents:
85dc806
git-author:
Chris Staub <chris@…> (06/26/14 02:49:55)
git-committer:
Chris Staub <chris@…> (06/26/14 02:52:21)
Message:

Kbd is installed before libpipeline, so move explanation of PKG_CONFIG_PATH to kbd

Conflicts:

BOOK/final-system/common/kbd.xml

Location:
BOOK/final-system
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r85dc806 ref42827  
    3131    ./configure --prefix=/usr --disable-vlock --enable-optional-progs</userinput></screen>
    3232
    33     <para os="c">Compile the package:</para>
    34 
    35 <screen os="d"><userinput>make</userinput></screen>
    36 
    37     <para os="e">To test the results, issue:</para>
    38 
    39 <screen os="f"><userinput remap="test">make check</userinput></screen>
    40 
    41     <para os="g">Install the package:</para>
    42 
    43 <screen os="h"><userinput>make install</userinput></screen>
    44 
    45     <para os="i">Some of the programs from Kbd are used by the CLFS Bootscripts
     33    <variablelist os="c">
     34      <title>The meaning of the configure option:</title>
     35
     36      <varlistentry>
     37        <term><envar>PKG_CONFIG_PATH</envar></term>
     38        <listitem>
     39          <para>Use pkg-config to obtain the location of the test library
     40          metadata built in <xref linkend="ch-temp-system-check"/>.</para>
     41        </listitem>
     42      </varlistentry>
     43    </variablelist>
     44
     45    <para os="d">Compile the package:</para>
     46
     47<screen os="e"><userinput>make</userinput></screen>
     48
     49    <para os="f">To test the results, issue:</para>
     50
     51<screen os="g"><userinput remap="test">make check</userinput></screen>
     52
     53    <para os="h">Install the package:</para>
     54
     55<screen os="i"><userinput>make install</userinput></screen>
     56
     57    <para os="j">Some of the programs from Kbd are used by the CLFS Bootscripts
    4658    to initialize the system, so those binaries need to be on the root
    4759    partition:</para>
    4860
    49 <screen os="j"><userinput>mv -v /usr/bin/{dumpkeys,kbd_mode,loadkeys,setfont} /bin</userinput></screen>
    50 
    51     <para os="k">Install the documentation:</para>
    52 
    53 <screen os="l"><userinput>mkdir -v /usr/share/doc/kbd-&kbd-version;
     61<screen os="k"><userinput>mv -v /usr/bin/{dumpkeys,kbd_mode,loadkeys,setfont} /bin</userinput></screen>
     62
     63    <para os="l">Install the documentation:</para>
     64
     65<screen os="m"><userinput>mkdir -v /usr/share/doc/kbd-&kbd-version;
    5466cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
    5567

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

    r85dc806 ref42827  
    3030<screen os="b"><userinput>PKG_CONFIG_PATH=/tools/lib/pkgconfig ./configure --prefix=/usr</userinput></screen>
    3131
    32     <variablelist os="c">
    33       <title>The meaning of the configure option:</title>
     32    <para os="c">Compile the package:</para>
    3433
    35       <varlistentry>
    36         <term><envar>PKG_CONFIG_PATH</envar></term>
    37         <listitem>
    38           <para>Use pkg-config to obtain the location of the test library
    39           metadata built in <xref linkend="ch-temp-system-check"/>.</para>
    40         </listitem>
    41       </varlistentry>
    42     </variablelist>
     34<screen os="d"><userinput>make</userinput></screen>
    4335
    44     <para os="d">Compile the package:</para>
     36    <para os="e">To test the results, issue:</para>
    4537
    46 <screen os="e"><userinput>make</userinput></screen>
     38<screen os="f"><userinput remap="test">make check</userinput></screen>
    4739
    48     <para os="f">To test the results, issue:</para>
     40    <para os="g">Install the package:</para>
    4941
    50 <screen os="g"><userinput remap="test">make check</userinput></screen>
    51 
    52     <para os="h">Install the package:</para>
    53 
    54 <screen os="i"><userinput>make install</userinput></screen>
     42<screen os="h"><userinput>make install</userinput></screen>
    5543
    5644  </sect2>

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

    r85dc806 ref42827  
    3333    xpointer="xpointer(//*[@os='c'])"/>
    3434
    35 <screen os="d"><userinput>make</userinput></screen>
     35    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     36    href="../common/kbd.xml"
     37    xpointer="xpointer(//*[@os='d'])"/>
    3638
    3739    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    6769    xpointer="xpointer(//*[@os='l'])"/>
    6870
     71    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     72    href="../common/kbd.xml"
     73    xpointer="xpointer(//*[@os='m'])"/>
     74
    6975  </sect2>
    7076

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

    r85dc806 ref42827  
    5555    xpointer="xpointer(//*[@os='h'])"/>
    5656
    57     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    58     href="../common/libpipeline.xml"
    59     xpointer="xpointer(//*[@os='i'])"/>
    60 
    6157  </sect2>
    6258

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

    r85dc806 ref42827  
    3232    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3333    href="../common/libpipeline.xml"
     34    xpointer="xpointer(//*[@os='c'])"/>
     35
     36    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     37    href="../common/libpipeline.xml"
    3438    xpointer="xpointer(//*[@os='d'])"/>
    3539
    3640    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3741    href="../common/libpipeline.xml"
    38     xpointer="xpointer(//*[@os='e'])"/>
     42    xpointer="xpointer(//*[@os='g'])"/>
    3943
    4044    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4145    href="../common/libpipeline.xml"
    4246    xpointer="xpointer(//*[@os='h'])"/>
    43 
    44     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    45     href="../common/libpipeline.xml"
    46     xpointer="xpointer(//*[@os='i'])"/>
    4747
    4848  </sect2>

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

    r85dc806 ref42827  
    3232    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3333    href="../common/libpipeline.xml"
     34    xpointer="xpointer(//*[@os='c'])"/>
     35
     36    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     37    href="../common/libpipeline.xml"
    3438    xpointer="xpointer(//*[@os='d'])"/>
    3539
    3640    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3741    href="../common/libpipeline.xml"
    38     xpointer="xpointer(//*[@os='e'])"/>
     42    xpointer="xpointer(//*[@os='g'])"/>
    3943
    4044    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4145    href="../common/libpipeline.xml"
    4246    xpointer="xpointer(//*[@os='h'])"/>
    43 
    44     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    45     href="../common/libpipeline.xml"
    46     xpointer="xpointer(//*[@os='i'])"/>
    4747
    4848  </sect2>
Note: See TracChangeset for help on using the changeset viewer.