Changeset f14f7c2


Ignore:
Timestamp:
Apr 24, 2011, 10:01:38 AM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Children:
d66ee74
Parents:
69fa5e6
Message:

Revert "Remove the test part."

This reverts commit 69fa5e6b525bc9edb1de06af31f3e6f14fe4180a.

Location:
BOOK
Files:
1 added
11 edited

Legend:

Unmodified
Added
Removed

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

    r69fa5e6 rf14f7c2  
    11<?xml version="1.0" encoding="ISO-8859-1"?>
    2 <!DOCTYPE c:package [
     2<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
     3  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
    34  <!ENTITY % general-entities SYSTEM "../../general.ent">
    45  %general-entities;
    56]>
    67
    7 <c:package xmlns:c="http://schema.cross-lfs.org/book" id="ch-system-bash" c:multibuild="false">
     8<sect1 id="ch-system-bash" role="wrap">
     9  <?dbhtml filename="bash.html"?>
    810
    9   <c:title>Bash</c:title>
    10   <c:version>&bash-version;</c:version>
    11   <c:description>The Bash package contains the Bourne-Again SHell.</c:description>
     11  <title>Bash-&bash-version;</title>
    1212
    13   <c:install>
     13  <indexterm zone="ch-system-bash">
     14    <primary sortas="a-Bash">Bash</primary>
     15  </indexterm>
    1416
    15     <c:para>The following patch contains updates from the maintainer. The
    16     maintainer of Bash only releases these patches to fix serious issues:</c:para>
     17  <sect2 role="package">
     18    <title/>
    1719
    18 <c:command>patch -Np1 -i ../&bash-branch_update-patch;</c:command>
     20    <para>The Bash package contains the Bourne-Again SHell.</para>
    1921
    20     <c:para c:multilib="true">The following sed points configure towards the
    21     correct library directory while searching for Readline:</c:para>
     22  </sect2>
    2223
    23 <c:command c:multilib="true">sed -i "/ac_cv_rl_libdir/s@/lib@&amp;64@" configure</c:command>
     24  <sect2 role="installation">
     25    <title>Installation of Bash</title>
    2426
    25     <c:para>Prepare Bash for compilation:</c:para>
     27    <para os="p1">The following patch contains updates from the maintainer. The
     28    maintainer of Bash only releases these patches to fix serious issues:</para>
    2629
    27 <c:command c:multilib="false">./configure --prefix=/usr --bindir=/bin \
    28     --without-bash-malloc --with-installed-readline</c:command>
    29 <c:command c:multilib="true">CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
    30     ./configure --prefix=/usr --bindir=/bin \
    31     --without-bash-malloc --with-installed-readline</c:command>
     30<screen os="p2"><userinput>patch -Np1 -i ../&bash-branch_update-patch;</userinput></screen>
    3231
    33 <!--
    34     <variablelist>
     32    <para os="a">Prepare Bash for compilation:</para>
     33
     34<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin \
     35    --without-bash-malloc --with-installed-readline</userinput></screen>
     36
     37    <variablelist os="c">
    3538      <title>The meaning of the configure option:</title>
    3639
    3740      <varlistentry>
    38         <term><parameter>-with-installed-readline</parameter></term>
     41        <term><parameter>--with-installed-readline</parameter></term>
    3942        <listitem>
    40           <c:para>This option tells Bash to use the
     43          <para>This option tells Bash to use the
    4144          <filename class="libraryfile">readline</filename> library that is
    4245          already installed on the system rather than using its own readline
    43           version.</c:para>
     46          version.</para>
    4447        </listitem>
    4548      </varlistentry>
    4649    </variablelist>
    47 -->
    48     <c:para>Compile the package:</c:para>
    4950
    50 <c:command>make</c:command>
     51    <para os="d">Compile the package:</para>
    5152
    52     <c:para>To test the results, issue:
    53     <c:command>make tests</c:command>.</c:para>
     53<screen os="e"><userinput>make</userinput></screen>
    5454
    55     <c:para>Install the package:</c:para>
     55    <para os="f">To test the results, issue:
     56    <userinput>make tests</userinput>.</para>
    5657
    57 <c:command>make htmldir=/usr/share/doc/bash-&bash-version; install</c:command>
     58    <para os="g">Install the package:</para>
    5859
    59     <c:para>Run the newly compiled <c:command>bash</c:command> program (replacing
    60     the one that is currently being executed):</c:para>
     60<screen os="h"><userinput>make htmldir=/usr/share/doc/bash-&bash-version; install</userinput></screen>
    6161
    62 <c:command c:nodump="true">exec /bin/bash --login +h</c:command>
     62    <para os="i">Run the newly compiled <command>bash</command> program (replacing
     63    the one that is currently being executed):</para>
    6364
    64     <c:note>
    65       <c:para>The parameters used make the <c:command>bash</c:command>
     65<screen os="j" role="nodump"><userinput>exec /bin/bash --login +h</userinput></screen>
     66
     67    <note os="k">
     68      <para>The parameters used make the <command>bash</command>
    6669      process an interactive login shell and continue to disable hashing so
    67       that new programs are found as they become available.</c:para>
    68     </c:note>
     70      that new programs are found as they become available.</para>
     71    </note>
    6972
    70   </c:install>
     73  </sect2>
    7174
    72   <c:contents>
     75  <sect2 id="contents-bash" role="content">
     76    <title>Contents of Bash</title>
    7377
    74     <c:program>
    75       <c:name>bash</c:name>
    76       <c:description>A widely-used command interpreter; it performs many types
    77       of expansions and substitutions on a given command line before executing
    78       it, thus making this interpreter a powerful tool</c:description>
    79     </c:program>
     78    <segmentedlist>
     79      <segtitle>Installed programs</segtitle>
     80      <segtitle>Installed directory</segtitle>
    8081
    81     <c:program>
    82       <c:name>bashbug</c:name>
    83       <c:description>A shell script to help the user compose and mail standard
    84       formatted bug reports concerning <c:command>bash</c:command>
    85       </c:description>
    86     </c:program>
     82      <seglistitem>
     83        <seg>bash, bashbug, and sh (link to bash)</seg>
     84        <seg>/usr/share/doc/bash-&bash-version;</seg>
     85      </seglistitem>
     86    </segmentedlist>
    8787
    88     <c:program>
    89       <c:name>sh</c:name>
    90       <c:description>A symlink to the <c:command>bash</c:command> program; when
    91       invoked as <c:command>sh</c:command>, <c:command>bash</c:command> tries
    92       to mimic the startup behavior of historical versions of
    93       <c:command>sh</c:command> as closely as possible, while conforming to the
    94       POSIX standard as well</c:description>
    95     </c:program>
     88    <variablelist>
     89      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
     90      <?dbfo list-presentation="list"?>
     91      <?dbhtml list-presentation="table"?>
    9692
    97   </c:contents>
     93      <varlistentry id="bash">
     94        <term><command>bash</command></term>
     95        <listitem>
     96          <para>A widely-used command interpreter; it performs many types of
     97          expansions and substitutions on a given command line before executing
     98          it, thus making this interpreter a powerful tool</para>
     99          <indexterm zone="ch-system-bash bash">
     100            <primary sortas="b-bash">bash</primary>
     101          </indexterm>
     102        </listitem>
     103      </varlistentry>
    98104
    99 </c:package>
     105      <varlistentry id="bashbug">
     106        <term><command>bashbug</command></term>
     107        <listitem>
     108          <para>A shell script to help the user compose and mail standard
     109          formatted bug reports concerning <command>bash</command></para>
     110          <indexterm zone="ch-system-bash bashbug">
     111            <primary sortas="b-bashbug">bashbug</primary>
     112          </indexterm>
     113        </listitem>
     114      </varlistentry>
    100115
     116      <varlistentry id="sh">
     117        <term><command>sh</command></term>
     118        <listitem>
     119          <para>A symlink to the <command>bash</command> program; when invoked
     120          as <command>sh</command>, <command>bash</command> tries to mimic the
     121          startup behavior of historical versions of <command>sh</command> as
     122          closely as possible, while conforming to the POSIX standard as
     123          well</para>
     124          <indexterm zone="ch-system-bash sh">
     125            <primary sortas="b-sh">sh</primary>
     126          </indexterm>
     127        </listitem>
     128      </varlistentry>
     129
     130    </variablelist>
     131
     132  </sect2>
     133
     134</sect1>

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

    r69fa5e6 rf14f7c2  
    7878  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
    7979  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
    80   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
     80  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
    8181  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
    8282  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-n32.xml"/>

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

    r69fa5e6 rf14f7c2  
    6262  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
    6363  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
    64   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
     64  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
    6565  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
    6666  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>

  • BOOK/final-system/sparc64-chapter.xml

    r69fa5e6 rf14f7c2  
    6262  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
    6363  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
    64   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
     64  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
    6565  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
    6666  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>

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

    r69fa5e6 rf14f7c2  
    6262  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
    6363  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
    64   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
     64  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
    6565  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
    6666  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>

  • BOOK/schema/clfs/0.1/rng/clfs.rnc

    r69fa5e6 rf14f7c2  
    116116clfs.sect.package =
    117117  element c:package {
    118     attribute xml:base { text }?,
    119118    attribute id { text },
    120119    clfs.attrib.arch,

  • BOOK/schema/clfs/0.1/rng/clfs.rng

    r69fa5e6 rf14f7c2  
    192192  <define name="clfs.sect.package">
    193193    <element name="c:package">
    194       <optional>
    195         <attribute name="xml:base"/>
    196       </optional>
    197194      <attribute name="id"/>
    198195      <ref name="clfs.attrib.arch"/>

  • BOOK/temp-system/common/bash.xml

    r69fa5e6 rf14f7c2  
    1515    <secondary>temporary system</secondary>
    1616  </indexterm>
    17 <!--
     17
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    1919  href="../../final-system/common/bash.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    21 -->
     21
    2222  <sect2 role="installation">
    2323    <title>Installation of Bash</title>
    24 <!--
     24
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2626    href="../../final-system/common/bash.xml"
    … …  
    3030    href="../../final-system/common/bash.xml"
    3131    xpointer="xpointer(//*[@os='p2'])"/>
    32 -->
     32
    3333    <para os="t1">When Bash is cross-compiled, it cannot test for the presence
    3434    of named pipes, among other things. If you used <command>su</command> to
    … …  
    5353gt_cv_int_divbyzero_sigfpe=yes
    5454EOF</userinput></screen>
    55 <!--
     55
    5656    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5757    href="../../final-system/common/bash.xml"
    5858    xpointer="xpointer(//*[@os='a'])"/>
    59 -->
     59
    6060<screen os="b"><userinput>./configure --prefix=/tools \
    6161    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    … …  
    7676
    7777    </variablelist>
    78 <!--
     78
    7979    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8080    href="../../final-system/common/bash.xml"
    … …  
    8888    href="../../final-system/common/bash.xml"
    8989    xpointer="xpointer(//*[@os='g'])"/>
    90 -->
     90
    9191<screen os="h"><userinput>make install</userinput></screen>
    9292
    … …  
    9797
    9898  </sect2>
    99 <!--
     99
    100100  <sect2 role="content">
    101101    <title/>
    102102
    103103    <para>Details on this package are located in <xref
    104     linkend="ch-system-bash-contents" role="."/></para>
     104    linkend="contents-bash" role="."/></para>
    105105
    106106  </sect2>
    107 -->
     107
    108108</sect1>

  • BOOK/temp-system/multilib/bash.xml

    r69fa5e6 rf14f7c2  
    1515    <secondary>temporary system</secondary>
    1616  </indexterm>
    17 <!--
     17
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    1919  href="../../final-system/common/bash.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    21 -->
     21
    2222  <sect2 role="installation">
    2323    <title>Installation of Bash</title>
    24 <!--
     24
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2626    href="../common/bash.xml"
    … …  
    4242    href="../common/bash.xml"
    4343    xpointer="xpointer(//*[@os='a'])"/>
    44 -->
     44
    4545<screen os="b"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
    4646   ./configure --prefix=/tools \
    4747   --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    4848   --without-bash-malloc --cache-file=config.cache</userinput></screen>
    49 <!--
     49
    5050    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5151    href="../common/bash.xml"
    … …  
    7575    href="../common/bash.xml"
    7676    xpointer="xpointer(//*[@os='t4'])"/>
    77 -->
     77
    7878  </sect2>
    79 <!--
     79
    8080  <sect2 role="content">
    8181    <title/>
    … …  
    8585
    8686  </sect2>
    87 -->
     87
    8888</sect1>

  • BOOK/x86-index.xml

    r69fa5e6 rf14f7c2  
    99
    1010  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/x86/bookinfo.xml"/>
     11  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testpart.xml"/>
    1112  <!--
    1213  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/dedication.xml"/>

  • BOOK/x86_64-index.xml

    r69fa5e6 rf14f7c2  
    99
    1010  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/x86_64/bookinfo.xml"/>
     11  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testpart.xml"/>
    1112  <!--
    1213  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/dedication.xml"/>
Note: See TracChangeset for help on using the changeset viewer.