[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, simp, updated. a8c30a501d3e7f4958f8b8bb41a29860ab8ae803
git
git at cross-lfs.org
Sun Apr 24 11:00:33 PDT 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, simp has been updated
via a8c30a501d3e7f4958f8b8bb41a29860ab8ae803 (commit)
via 86518ac615b67c8bd4346a62edaa911b68aa1718 (commit)
via f67564c67f2271b52facb3f9bb7de9319db29955 (commit)
via e655c39d3a376b406ab89b34e23a54abc55e9a1e (commit)
via 8cd07b082a84c49531ad052e51b88a9d121be3d5 (commit)
via d66ee74b750a71d8bb4d48e814a81d5848cec9eb (commit)
via f14f7c283f5aeeaa0bd92ee5fe261fd378b6c988 (commit)
via 69fa5e6b525bc9edb1de06af31f3e6f14fe4180a (commit)
from b0b1a3c1b3400095b69b60780022b4c9dac2bd95 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a8c30a501d3e7f4958f8b8bb41a29860ab8ae803
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Apr 24 13:58:27 2011 -0400
Also parse a c:config section after a c:install section.
diff --git a/BOOK/schema/clfs/0.1/rng/clfs.rnc b/BOOK/schema/clfs/0.1/rng/clfs.rnc
index 677ed07..2055154 100644
--- a/BOOK/schema/clfs/0.1/rng/clfs.rnc
+++ b/BOOK/schema/clfs/0.1/rng/clfs.rnc
@@ -135,6 +135,13 @@ clfs.sect.package =
clfs.package.warning)+
}?,
+ element c:config {
+ (clfs.package.para |
+ clfs.package.command |
+ clfs.package.note |
+ clfs.package.warning)+
+ }?,
+
element c:contents {
attribute c:ref {
text
diff --git a/BOOK/schema/clfs/0.1/rng/clfs.rng b/BOOK/schema/clfs/0.1/rng/clfs.rng
index 9f2673a..933c6ef 100644
--- a/BOOK/schema/clfs/0.1/rng/clfs.rng
+++ b/BOOK/schema/clfs/0.1/rng/clfs.rng
@@ -226,6 +226,18 @@
</element>
</optional>
<optional>
+ <element name="c:config">
+ <oneOrMore>
+ <choice>
+ <ref name="clfs.package.para"/>
+ <ref name="clfs.package.command"/>
+ <ref name="clfs.package.note"/>
+ <ref name="clfs.package.warning"/>
+ </choice>
+ </oneOrMore>
+ </element>
+ </optional>
+ <optional>
<element name="c:contents">
<choice>
<attribute name="c:ref"/>
diff --git a/BOOK/stylesheets/clfs-profile.xsl b/BOOK/stylesheets/clfs-profile.xsl
index 3d920b6..b2677f2 100644
--- a/BOOK/stylesheets/clfs-profile.xsl
+++ b/BOOK/stylesheets/clfs-profile.xsl
@@ -224,6 +224,41 @@
</xsl:element>
</xsl:for-each><!-- c:install -> sect2 -->
+ <!-- c:config -> sect2: For each c:config build a sect2 section -->
+ <xsl:for-each select="c:config">
+ <xsl:element name="sect2">
+ <xsl:attribute name="id">
+ <xsl:value-of select="$id"/>
+ <xsl:text>-conf</xsl:text>
+ </xsl:attribute>
+ <xsl:text>
+ </xsl:text>
+ <xsl:element name="title">
+ <xsl:attribute name="role">
+ <xsl:text>configuration</xsl:text>
+ </xsl:attribute>
+ <xsl:text>Configuring </xsl:text>
+ <xsl:value-of select="../c:title" />
+ </xsl:element>
+ <xsl:text>
+
+</xsl:text>
+ <xsl:choose>
+ <xsl:when test="$bits = '32'">
+ <xsl:apply-templates select="@*|node()" mode="filter-bits-32" />
+ </xsl:when>
+ <xsl:when test="$bits = 'n32'">
+ <xsl:apply-templates select="@*|node()" mode="filter-bits-n32" />
+ </xsl:when>
+ <xsl:when test="$bits = '64'">
+ <xsl:apply-templates select="@*|node()" mode="filter-bits-64" />
+ </xsl:when>
+ </xsl:choose>
+ <xsl:text>
+</xsl:text>
+ </xsl:element>
+ </xsl:for-each><!-- c:config -> sect2 -->
+
<!-- c:contents -> sect2: Build or reference the contents sect2 -->
<xsl:for-each select="c:contents">
commit 86518ac615b67c8bd4346a62edaa911b68aa1718
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Apr 24 13:47:14 2011 -0400
Use the proper role on the sect2 for package and installation.
Also properly generate the title of the installation sect2.
diff --git a/BOOK/stylesheets/clfs-profile.xsl b/BOOK/stylesheets/clfs-profile.xsl
index a92536d..3d920b6 100644
--- a/BOOK/stylesheets/clfs-profile.xsl
+++ b/BOOK/stylesheets/clfs-profile.xsl
@@ -162,7 +162,7 @@
<!-- sect2[role="installation"]: Add the sect2 for the package header -->
<xsl:element name="sect2">
<xsl:attribute name="role">
- <xsl:text>installation</xsl:text>
+ <xsl:text>package</xsl:text>
</xsl:attribute>
<xsl:text>
</xsl:text>
@@ -199,7 +199,11 @@
<xsl:text>
</xsl:text>
<xsl:element name="title">
- <xsl:text>Installing</xsl:text>
+ <xsl:attribute name="role">
+ <xsl:text>installation</xsl:text>
+ </xsl:attribute>
+ <xsl:text>Installation of </xsl:text>
+ <xsl:value-of select="../c:title" />
</xsl:element>
<xsl:text>
commit f67564c67f2271b52facb3f9bb7de9319db29955
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Apr 24 13:45:13 2011 -0400
Only allow one c:install element.
diff --git a/BOOK/schema/clfs/0.1/rng/clfs.rnc b/BOOK/schema/clfs/0.1/rng/clfs.rnc
index c939232..677ed07 100644
--- a/BOOK/schema/clfs/0.1/rng/clfs.rnc
+++ b/BOOK/schema/clfs/0.1/rng/clfs.rnc
@@ -133,7 +133,7 @@ clfs.sect.package =
clfs.package.command |
clfs.package.note |
clfs.package.warning)+
- }+,
+ }?,
element c:contents {
attribute c:ref {
diff --git a/BOOK/schema/clfs/0.1/rng/clfs.rng b/BOOK/schema/clfs/0.1/rng/clfs.rng
index 1ab0a2f..9f2673a 100644
--- a/BOOK/schema/clfs/0.1/rng/clfs.rng
+++ b/BOOK/schema/clfs/0.1/rng/clfs.rng
@@ -213,7 +213,7 @@
<element name="c:description">
<ref name="clfs.inline"/>
</element>
- <oneOrMore>
+ <optional>
<element name="c:install">
<oneOrMore>
<choice>
@@ -224,7 +224,7 @@
</choice>
</oneOrMore>
</element>
- </oneOrMore>
+ </optional>
<optional>
<element name="c:contents">
<choice>
commit e655c39d3a376b406ab89b34e23a54abc55e9a1e
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Apr 24 13:20:21 2011 -0400
Extend the schema to allow for the xml:base attribute on the c:package
element.
diff --git a/BOOK/schema/clfs/0.1/rng/clfs.rnc b/BOOK/schema/clfs/0.1/rng/clfs.rnc
index e8c57b5..c939232 100644
--- a/BOOK/schema/clfs/0.1/rng/clfs.rnc
+++ b/BOOK/schema/clfs/0.1/rng/clfs.rnc
@@ -115,6 +115,7 @@ clfs.package.command =
# The Package
clfs.sect.package =
element c:package {
+ attribute xml:base { text }?,
attribute id { text },
clfs.attrib.arch,
clfs.attrib.bits,
diff --git a/BOOK/schema/clfs/0.1/rng/clfs.rng b/BOOK/schema/clfs/0.1/rng/clfs.rng
index ee8dddf..1ab0a2f 100644
--- a/BOOK/schema/clfs/0.1/rng/clfs.rng
+++ b/BOOK/schema/clfs/0.1/rng/clfs.rng
@@ -191,6 +191,9 @@
<!-- The Package -->
<define name="clfs.sect.package">
<element name="c:package">
+ <optional>
+ <attribute name="xml:base"/>
+ </optional>
<attribute name="id"/>
<ref name="clfs.attrib.arch"/>
<ref name="clfs.attrib.bits"/>
commit 8cd07b082a84c49531ad052e51b88a9d121be3d5
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Apr 24 13:20:04 2011 -0400
Moved Bash in the final system to the new format.
diff --git a/BOOK/final-system/common/bash.xml b/BOOK/final-system/common/bash.xml
index 349b97f..5b14d91 100644
--- a/BOOK/final-system/common/bash.xml
+++ b/BOOK/final-system/common/bash.xml
@@ -1,134 +1,100 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE c:package [
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
]>
-<sect1 id="ch-system-bash" role="wrap">
- <?dbhtml filename="bash.html"?>
+<c:package xmlns:c="http://schema.cross-lfs.org/book" id="ch-system-bash" c:multibuild="false">
- <title>Bash-&bash-version;</title>
+ <c:title>Bash</c:title>
+ <c:version>&bash-version;</c:version>
+ <c:description>The Bash package contains the Bourne-Again SHell.</c:description>
- <indexterm zone="ch-system-bash">
- <primary sortas="a-Bash">Bash</primary>
- </indexterm>
+ <c:install>
- <sect2 role="package">
- <title/>
+ <c:para>The following patch contains updates from the maintainer. The
+ maintainer of Bash only releases these patches to fix serious issues:</c:para>
- <para>The Bash package contains the Bourne-Again SHell.</para>
+<c:command>patch -Np1 -i ../&bash-branch_update-patch;</c:command>
- </sect2>
+ <c:para c:multilib="true">The following sed points configure towards the
+ correct library directory while searching for Readline:</c:para>
- <sect2 role="installation">
- <title>Installation of Bash</title>
+<c:command c:multilib="true">sed -i "/ac_cv_rl_libdir/s@/lib@&64@" configure</c:command>
- <para os="p1">The following patch contains updates from the maintainer. The
- maintainer of Bash only releases these patches to fix serious issues:</para>
+ <c:para>Prepare Bash for compilation:</c:para>
-<screen os="p2"><userinput>patch -Np1 -i ../&bash-branch_update-patch;</userinput></screen>
+<c:command c:multilib="false">./configure --prefix=/usr --bindir=/bin \
+ --without-bash-malloc --with-installed-readline</c:command>
+<c:command c:multilib="true">CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
+ ./configure --prefix=/usr --bindir=/bin \
+ --without-bash-malloc --with-installed-readline</c:command>
- <para os="a">Prepare Bash for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin \
- --without-bash-malloc --with-installed-readline</userinput></screen>
-
- <variablelist os="c">
+<!--
+ <variablelist>
<title>The meaning of the configure option:</title>
<varlistentry>
- <term><parameter>--with-installed-readline</parameter></term>
+ <term><parameter>-with-installed-readline</parameter></term>
<listitem>
- <para>This option tells Bash to use the
+ <c:para>This option tells Bash to use the
<filename class="libraryfile">readline</filename> library that is
already installed on the system rather than using its own readline
- version.</para>
+ version.</c:para>
</listitem>
</varlistentry>
</variablelist>
+-->
+ <c:para>Compile the package:</c:para>
- <para os="d">Compile the package:</para>
+<c:command>make</c:command>
-<screen os="e"><userinput>make</userinput></screen>
+ <c:para>To test the results, issue:
+ <c:command>make tests</c:command>.</c:para>
- <para os="f">To test the results, issue:
- <userinput>make tests</userinput>.</para>
+ <c:para>Install the package:</c:para>
- <para os="g">Install the package:</para>
+<c:command>make htmldir=/usr/share/doc/bash-&bash-version; install</c:command>
-<screen os="h"><userinput>make htmldir=/usr/share/doc/bash-&bash-version; install</userinput></screen>
+ <c:para>Run the newly compiled <c:command>bash</c:command> program (replacing
+ the one that is currently being executed):</c:para>
- <para os="i">Run the newly compiled <command>bash</command> program (replacing
- the one that is currently being executed):</para>
+<c:command c:nodump="true">exec /bin/bash --login +h</c:command>
-<screen os="j" role="nodump"><userinput>exec /bin/bash --login +h</userinput></screen>
-
- <note os="k">
- <para>The parameters used make the <command>bash</command>
+ <c:note>
+ <c:para>The parameters used make the <c:command>bash</c:command>
process an interactive login shell and continue to disable hashing so
- that new programs are found as they become available.</para>
- </note>
-
- </sect2>
+ that new programs are found as they become available.</c:para>
+ </c:note>
- <sect2 id="contents-bash" role="content">
- <title>Contents of Bash</title>
+ </c:install>
- <segmentedlist>
- <segtitle>Installed programs</segtitle>
- <segtitle>Installed directory</segtitle>
+ <c:contents>
- <seglistitem>
- <seg>bash, bashbug, and sh (link to bash)</seg>
- <seg>/usr/share/doc/bash-&bash-version;</seg>
- </seglistitem>
- </segmentedlist>
-
- <variablelist>
- <bridgehead renderas="sect3">Short Descriptions</bridgehead>
- <?dbfo list-presentation="list"?>
- <?dbhtml list-presentation="table"?>
-
- <varlistentry id="bash">
- <term><command>bash</command></term>
- <listitem>
- <para>A widely-used command interpreter; it performs many types of
- expansions and substitutions on a given command line before executing
- it, thus making this interpreter a powerful tool</para>
- <indexterm zone="ch-system-bash bash">
- <primary sortas="b-bash">bash</primary>
- </indexterm>
- </listitem>
- </varlistentry>
+ <c:program>
+ <c:name>bash</c:name>
+ <c:description>A widely-used command interpreter; it performs many types
+ of expansions and substitutions on a given command line before executing
+ it, thus making this interpreter a powerful tool</c:description>
+ </c:program>
- <varlistentry id="bashbug">
- <term><command>bashbug</command></term>
- <listitem>
- <para>A shell script to help the user compose and mail standard
- formatted bug reports concerning <command>bash</command></para>
- <indexterm zone="ch-system-bash bashbug">
- <primary sortas="b-bashbug">bashbug</primary>
- </indexterm>
- </listitem>
- </varlistentry>
+ <c:program>
+ <c:name>bashbug</c:name>
+ <c:description>A shell script to help the user compose and mail standard
+ formatted bug reports concerning <c:command>bash</c:command>
+ </c:description>
+ </c:program>
- <varlistentry id="sh">
- <term><command>sh</command></term>
- <listitem>
- <para>A symlink to the <command>bash</command> program; when invoked
- as <command>sh</command>, <command>bash</command> tries to mimic the
- startup behavior of historical versions of <command>sh</command> as
- closely as possible, while conforming to the POSIX standard as
- well</para>
- <indexterm zone="ch-system-bash sh">
- <primary sortas="b-sh">sh</primary>
- </indexterm>
- </listitem>
- </varlistentry>
+ <c:program>
+ <c:name>sh</c:name>
+ <c:description>A symlink to the <c:command>bash</c:command> program; when
+ invoked as <c:command>sh</c:command>, <c:command>bash</c:command> tries
+ to mimic the startup behavior of historical versions of
+ <c:command>sh</c:command> as closely as possible, while conforming to the
+ POSIX standard as well</c:description>
+ </c:program>
- </variablelist>
+ </c:contents>
- </sect2>
+</c:package>
-</sect1>
diff --git a/BOOK/final-system/mips64-chapter.xml b/BOOK/final-system/mips64-chapter.xml
index 22d1d12..12460f0 100644
--- a/BOOK/final-system/mips64-chapter.xml
+++ b/BOOK/final-system/mips64-chapter.xml
@@ -77,7 +77,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-n32.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
diff --git a/BOOK/final-system/multilib/bash.xml b/BOOK/final-system/multilib/bash.xml
deleted file mode 100644
index c644e0a..0000000
--- a/BOOK/final-system/multilib/bash.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-]>
-
-<sect1 id="ch-system-bash" role="wrap">
- <?dbhtml filename="bash.html"?>
-
- <title>Bash-&bash-version;</title>
-
- <indexterm zone="ch-system-bash">
- <primary sortas="a-Bash">Bash</primary>
- </indexterm>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/bash.xml"
- xpointer="xpointer(//*[@role='package'])"/>
-
- <sect2 role="installation">
- <title>Installation of Bash</title>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/bash.xml"
- xpointer="xpointer(//*[@os='p1'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/bash.xml"
- xpointer="xpointer(//*[@os='p2'])"/>
-
- <para os="m1">The following sed points configure towards the correct
- library directory while searching for Readline:</para>
-
-<screen os="m2"><userinput>sed -i "/ac_cv_rl_libdir/s@/lib@&64@" configure</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/bash.xml"
- xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
- ./configure --prefix=/usr --bindir=/bin \
- --without-bash-malloc --with-installed-readline</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/bash.xml"
- xpointer="xpointer(//*[@os='c'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/bash.xml"
- xpointer="xpointer(//*[@os='d'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/bash.xml"
- xpointer="xpointer(//*[@os='e'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/bash.xml"
- xpointer="xpointer(//*[@os='f'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/bash.xml"
- xpointer="xpointer(//*[@os='g'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/bash.xml"
- xpointer="xpointer(//*[@os='h'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/bash.xml"
- xpointer="xpointer(//*[@os='i'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/bash.xml"
- xpointer="xpointer(//*[@os='j'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/bash.xml"
- xpointer="xpointer(//*[@os='k'])"/>
-
- </sect2>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/bash.xml"
- xpointer="xpointer(id('contents-bash'))"/>
-
-</sect1>
diff --git a/BOOK/final-system/ppc64-chapter.xml b/BOOK/final-system/ppc64-chapter.xml
index 867e7bc..242546f 100644
--- a/BOOK/final-system/ppc64-chapter.xml
+++ b/BOOK/final-system/ppc64-chapter.xml
@@ -61,7 +61,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
diff --git a/BOOK/final-system/sparc64-chapter.xml b/BOOK/final-system/sparc64-chapter.xml
index ccfe3fc..77130bb 100644
--- a/BOOK/final-system/sparc64-chapter.xml
+++ b/BOOK/final-system/sparc64-chapter.xml
@@ -61,7 +61,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
diff --git a/BOOK/final-system/x86_64-chapter.xml b/BOOK/final-system/x86_64-chapter.xml
index 9353476..3509e65 100644
--- a/BOOK/final-system/x86_64-chapter.xml
+++ b/BOOK/final-system/x86_64-chapter.xml
@@ -61,7 +61,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
diff --git a/BOOK/temp-system/common/bash.xml b/BOOK/temp-system/common/bash.xml
index 67e55ed..dc56c5c 100644
--- a/BOOK/temp-system/common/bash.xml
+++ b/BOOK/temp-system/common/bash.xml
@@ -14,14 +14,14 @@
<primary sortas="a-Bash">Bash</primary>
<secondary>temporary system</secondary>
</indexterm>
-
+<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/bash.xml"
xpointer="xpointer(//*[@role='package'])"/>
-
+-->
<sect2 role="installation">
<title>Installation of Bash</title>
-
+<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/bash.xml"
xpointer="xpointer(//*[@os='p1'])"/>
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/bash.xml"
xpointer="xpointer(//*[@os='p2'])"/>
-
+-->
<para os="t1">When Bash is cross-compiled, it cannot test for the presence
of named pipes, among other things. If you used <command>su</command> to
become an unprivileged user, this combination will cause Bash to build
@@ -52,11 +52,11 @@ bash_cv_under_sys_siglist=yes
bash_cv_unusable_rtsigs=no
gt_cv_int_divbyzero_sigfpe=yes
EOF</userinput></screen>
-
+<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/bash.xml"
xpointer="xpointer(//*[@os='a'])"/>
-
+-->
<screen os="b"><userinput>./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
--without-bash-malloc --cache-file=config.cache</userinput></screen>
@@ -75,7 +75,7 @@ EOF</userinput></screen>
</varlistentry>
</variablelist>
-
+<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/bash.xml"
xpointer="xpointer(//*[@os='d'])"/>
@@ -87,7 +87,7 @@ EOF</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/bash.xml"
xpointer="xpointer(//*[@os='g'])"/>
-
+-->
<screen os="h"><userinput>make install</userinput></screen>
<para os="t3">Make a link for programs that use <command>sh</command> for
@@ -96,13 +96,13 @@ EOF</userinput></screen>
<screen os="t4"><userinput>ln -sv bash /tools/bin/sh</userinput></screen>
</sect2>
-
+<!--
<sect2 role="content">
<title/>
<para>Details on this package are located in <xref
- linkend="contents-bash" role="."/></para>
+ linkend="ch-system-bash-contents" role="."/></para>
</sect2>
-
+-->
</sect1>
diff --git a/BOOK/temp-system/multilib/bash.xml b/BOOK/temp-system/multilib/bash.xml
index 168b1f1..4734363 100644
--- a/BOOK/temp-system/multilib/bash.xml
+++ b/BOOK/temp-system/multilib/bash.xml
@@ -14,14 +14,14 @@
<primary sortas="a-Bash">Bash</primary>
<secondary>temporary system</secondary>
</indexterm>
-
+<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/bash.xml"
xpointer="xpointer(//*[@role='package'])"/>
-
+-->
<sect2 role="installation">
<title>Installation of Bash</title>
-
+<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/bash.xml"
xpointer="xpointer(//*[@os='p1'])"/>
@@ -41,12 +41,12 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/bash.xml"
xpointer="xpointer(//*[@os='a'])"/>
-
+-->
<screen os="b"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
--without-bash-malloc --cache-file=config.cache</userinput></screen>
-
+<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/bash.xml"
xpointer="xpointer(//*[@os='c'])"/>
@@ -74,9 +74,9 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/bash.xml"
xpointer="xpointer(//*[@os='t4'])"/>
-
+-->
</sect2>
-
+<!--
<sect2 role="content">
<title/>
@@ -84,5 +84,5 @@
linkend="contents-bash" role="."/></para>
</sect2>
-
+-->
</sect1>
commit d66ee74b750a71d8bb4d48e814a81d5848cec9eb
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Apr 24 13:18:47 2011 -0400
Remove the test part.
diff --git a/BOOK/testpart.xml b/BOOK/testpart.xml
deleted file mode 100644
index 816de5f..0000000
--- a/BOOK/testpart.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE part PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "general.ent">
- %general-entities;
-]>
-
- <part id="part0" xmlns:c="http://schema.cross-lfs.org/book">
- <?dbhtml filename="part0.html"?>
- <title>Test Part</title>
-
- <chapter>
- <?dbhtml dir="chapter0"?>
- <?dbhtml filename="chapter0.html"?>
- <title>Chapter 0</title>
-
- <sect1>
- <?dbhtml filename="sect0.html"?>
- <title>Sect 0</title>
- <para>Testing... 1.. 2.. 3..</para>
- </sect1>
-
-<c:package id="ch-system-bash2" c:multibuild="false">
- <c:title>Bash</c:title>
- <c:version>4.0.1</c:version>
- <c:description>The Bash package contains the Bourne-Again SHell.</c:description>
-
- <c:install>
-
- <c:para>Apply this patch</c:para>
-
-<c:command>patch -Np1 -i ../&bash-branch_update-patch;</c:command>
-
- <c:para>Prepare the package for compilation</c:para>
-
-<c:command>./configure -prefix=/usr -bindir=/bin \
- -without-bash-malloc -with-installed-readline</c:command>
-
- <c:para>Compile the package:</c:para>
-
-<c:command>make</c:command>
-
- <c:para>To test the results, issue:
- <c:command>make tests</c:command>.</c:para>
-
- <c:para>Install the package:</c:para>
-<c:command>make htmldir=/usr/share/doc/bash-&bash-version; install</c:command>
-
- <c:para>Run the newly compiled <c:command>bash</c:command> program (replacing
- the one that is currently being executed):</c:para>
-
-<c:command c:nodump="true">exec /bin/bash -login +h</c:command>
-
- <c:note>
- <c:para>(note+warn) The parameters used make the <c:command>bash</c:command>
- process an interactive login shell and continue to disable hashing so
- that new programs are found as they become available.</c:para>
- </c:note>
-
- </c:install>
-
- <c:contents>
-
- <c:program>
- <c:name>test2</c:name>
- <c:description>This is the test program.</c:description>
- </c:program>
-
- <c:library>
- <c:name>libjoe</c:name>
- <c:description>This is a bullshit library for a <c:command>test</c:command>.</c:description>
- </c:library>
-
- <c:directory>
- <c:name>/usr/blah</c:name>
- <c:description>Some Crap</c:description>
- </c:directory>
- <c:directory>
- <c:name>/usr/blah2</c:name>
- <c:description>Some Crap2</c:description>
- </c:directory>
- <c:directory>
- <c:name>/usr/blah3</c:name>
- <c:description>Some Crap2</c:description>
- </c:directory>
- <c:directory>
- <c:name>/usr/blah4</c:name>
- <c:description>Some Crap2</c:description>
- </c:directory>
-
- </c:contents>
-
-</c:package>
-
-<c:package id="ch-system-test" c:multibuild="true">
- <c:title>TestPackage</c:title>
- <c:version>1.2.3</c:version>
- <c:description>The Test package contains a <c:command>test</c:command>.</c:description>
-
- <c:install>
-
- <c:para>Prepare the package for compilation</c:para>
-
-<c:command c:multilib="false">./configure --prefix=/usr</c:command>
-<c:command c:multilib="true" c:bits="32">CC="gcc ${BUILD32}" ./configure --prefix=/usr</c:command>
-<c:command c:multilib="true" c:bits="n32">CC="gcc ${BUILDN32}" ./configure --prefix=/usr</c:command>
-<c:command c:multilib="true" c:bits="64">CC="gcc ${BUILD64}" ./configure --prefix=/usr</c:command>
-
- <c:para>Compile <c:filename>the</c:filename> package:</c:para>
-
-<c:command>make</c:command>
-
- <c:para>To test the results, issue:
- <c:command>make tests</c:command>.</c:para>
-
- <c:para>Install the package:</c:para>
-
-<c:command>make install</c:command>
-
- </c:install>
-
- <c:contents c:ref="ch-system-bash2" />
-
-</c:package>
-
- </chapter>
-
- </part>
diff --git a/BOOK/x86-index.xml b/BOOK/x86-index.xml
index eb2d517..b450daa 100644
--- a/BOOK/x86-index.xml
+++ b/BOOK/x86-index.xml
@@ -8,7 +8,6 @@
<book>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/x86/bookinfo.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testpart.xml"/>
<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/dedication.xml"/>
-->
diff --git a/BOOK/x86_64-index.xml b/BOOK/x86_64-index.xml
index ca6aae2..1ebe4fa 100644
--- a/BOOK/x86_64-index.xml
+++ b/BOOK/x86_64-index.xml
@@ -8,7 +8,6 @@
<book xmlns:c="http://schema.cross-lfs.org/book">
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/x86_64/bookinfo.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testpart.xml"/>
<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/dedication.xml"/>
-->
commit f14f7c283f5aeeaa0bd92ee5fe261fd378b6c988
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Apr 24 13:01:38 2011 -0400
Revert "Remove the test part."
This reverts commit 69fa5e6b525bc9edb1de06af31f3e6f14fe4180a.
diff --git a/BOOK/final-system/common/bash.xml b/BOOK/final-system/common/bash.xml
index 5b14d91..349b97f 100644
--- a/BOOK/final-system/common/bash.xml
+++ b/BOOK/final-system/common/bash.xml
@@ -1,100 +1,134 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE c:package [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
]>
-<c:package xmlns:c="http://schema.cross-lfs.org/book" id="ch-system-bash" c:multibuild="false">
+<sect1 id="ch-system-bash" role="wrap">
+ <?dbhtml filename="bash.html"?>
- <c:title>Bash</c:title>
- <c:version>&bash-version;</c:version>
- <c:description>The Bash package contains the Bourne-Again SHell.</c:description>
+ <title>Bash-&bash-version;</title>
- <c:install>
+ <indexterm zone="ch-system-bash">
+ <primary sortas="a-Bash">Bash</primary>
+ </indexterm>
- <c:para>The following patch contains updates from the maintainer. The
- maintainer of Bash only releases these patches to fix serious issues:</c:para>
+ <sect2 role="package">
+ <title/>
-<c:command>patch -Np1 -i ../&bash-branch_update-patch;</c:command>
+ <para>The Bash package contains the Bourne-Again SHell.</para>
- <c:para c:multilib="true">The following sed points configure towards the
- correct library directory while searching for Readline:</c:para>
+ </sect2>
-<c:command c:multilib="true">sed -i "/ac_cv_rl_libdir/s@/lib@&64@" configure</c:command>
+ <sect2 role="installation">
+ <title>Installation of Bash</title>
- <c:para>Prepare Bash for compilation:</c:para>
+ <para os="p1">The following patch contains updates from the maintainer. The
+ maintainer of Bash only releases these patches to fix serious issues:</para>
-<c:command c:multilib="false">./configure --prefix=/usr --bindir=/bin \
- --without-bash-malloc --with-installed-readline</c:command>
-<c:command c:multilib="true">CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
- ./configure --prefix=/usr --bindir=/bin \
- --without-bash-malloc --with-installed-readline</c:command>
+<screen os="p2"><userinput>patch -Np1 -i ../&bash-branch_update-patch;</userinput></screen>
-<!--
- <variablelist>
+ <para os="a">Prepare Bash for compilation:</para>
+
+<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin \
+ --without-bash-malloc --with-installed-readline</userinput></screen>
+
+ <variablelist os="c">
<title>The meaning of the configure option:</title>
<varlistentry>
- <term><parameter>-with-installed-readline</parameter></term>
+ <term><parameter>--with-installed-readline</parameter></term>
<listitem>
- <c:para>This option tells Bash to use the
+ <para>This option tells Bash to use the
<filename class="libraryfile">readline</filename> library that is
already installed on the system rather than using its own readline
- version.</c:para>
+ version.</para>
</listitem>
</varlistentry>
</variablelist>
--->
- <c:para>Compile the package:</c:para>
-<c:command>make</c:command>
+ <para os="d">Compile the package:</para>
- <c:para>To test the results, issue:
- <c:command>make tests</c:command>.</c:para>
+<screen os="e"><userinput>make</userinput></screen>
- <c:para>Install the package:</c:para>
+ <para os="f">To test the results, issue:
+ <userinput>make tests</userinput>.</para>
-<c:command>make htmldir=/usr/share/doc/bash-&bash-version; install</c:command>
+ <para os="g">Install the package:</para>
- <c:para>Run the newly compiled <c:command>bash</c:command> program (replacing
- the one that is currently being executed):</c:para>
+<screen os="h"><userinput>make htmldir=/usr/share/doc/bash-&bash-version; install</userinput></screen>
-<c:command c:nodump="true">exec /bin/bash --login +h</c:command>
+ <para os="i">Run the newly compiled <command>bash</command> program (replacing
+ the one that is currently being executed):</para>
- <c:note>
- <c:para>The parameters used make the <c:command>bash</c:command>
+<screen os="j" role="nodump"><userinput>exec /bin/bash --login +h</userinput></screen>
+
+ <note os="k">
+ <para>The parameters used make the <command>bash</command>
process an interactive login shell and continue to disable hashing so
- that new programs are found as they become available.</c:para>
- </c:note>
+ that new programs are found as they become available.</para>
+ </note>
+
+ </sect2>
- </c:install>
+ <sect2 id="contents-bash" role="content">
+ <title>Contents of Bash</title>
- <c:contents>
+ <segmentedlist>
+ <segtitle>Installed programs</segtitle>
+ <segtitle>Installed directory</segtitle>
- <c:program>
- <c:name>bash</c:name>
- <c:description>A widely-used command interpreter; it performs many types
- of expansions and substitutions on a given command line before executing
- it, thus making this interpreter a powerful tool</c:description>
- </c:program>
+ <seglistitem>
+ <seg>bash, bashbug, and sh (link to bash)</seg>
+ <seg>/usr/share/doc/bash-&bash-version;</seg>
+ </seglistitem>
+ </segmentedlist>
+
+ <variablelist>
+ <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+ <?dbfo list-presentation="list"?>
+ <?dbhtml list-presentation="table"?>
+
+ <varlistentry id="bash">
+ <term><command>bash</command></term>
+ <listitem>
+ <para>A widely-used command interpreter; it performs many types of
+ expansions and substitutions on a given command line before executing
+ it, thus making this interpreter a powerful tool</para>
+ <indexterm zone="ch-system-bash bash">
+ <primary sortas="b-bash">bash</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
- <c:program>
- <c:name>bashbug</c:name>
- <c:description>A shell script to help the user compose and mail standard
- formatted bug reports concerning <c:command>bash</c:command>
- </c:description>
- </c:program>
+ <varlistentry id="bashbug">
+ <term><command>bashbug</command></term>
+ <listitem>
+ <para>A shell script to help the user compose and mail standard
+ formatted bug reports concerning <command>bash</command></para>
+ <indexterm zone="ch-system-bash bashbug">
+ <primary sortas="b-bashbug">bashbug</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
- <c:program>
- <c:name>sh</c:name>
- <c:description>A symlink to the <c:command>bash</c:command> program; when
- invoked as <c:command>sh</c:command>, <c:command>bash</c:command> tries
- to mimic the startup behavior of historical versions of
- <c:command>sh</c:command> as closely as possible, while conforming to the
- POSIX standard as well</c:description>
- </c:program>
+ <varlistentry id="sh">
+ <term><command>sh</command></term>
+ <listitem>
+ <para>A symlink to the <command>bash</command> program; when invoked
+ as <command>sh</command>, <command>bash</command> tries to mimic the
+ startup behavior of historical versions of <command>sh</command> as
+ closely as possible, while conforming to the POSIX standard as
+ well</para>
+ <indexterm zone="ch-system-bash sh">
+ <primary sortas="b-sh">sh</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
- </c:contents>
+ </variablelist>
-</c:package>
+ </sect2>
+</sect1>
diff --git a/BOOK/final-system/mips64-chapter.xml b/BOOK/final-system/mips64-chapter.xml
index 12460f0..22d1d12 100644
--- a/BOOK/final-system/mips64-chapter.xml
+++ b/BOOK/final-system/mips64-chapter.xml
@@ -77,7 +77,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-n32.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
diff --git a/BOOK/final-system/ppc64-chapter.xml b/BOOK/final-system/ppc64-chapter.xml
index 242546f..867e7bc 100644
--- a/BOOK/final-system/ppc64-chapter.xml
+++ b/BOOK/final-system/ppc64-chapter.xml
@@ -61,7 +61,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
diff --git a/BOOK/final-system/sparc64-chapter.xml b/BOOK/final-system/sparc64-chapter.xml
index 77130bb..ccfe3fc 100644
--- a/BOOK/final-system/sparc64-chapter.xml
+++ b/BOOK/final-system/sparc64-chapter.xml
@@ -61,7 +61,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
diff --git a/BOOK/final-system/x86_64-chapter.xml b/BOOK/final-system/x86_64-chapter.xml
index 3509e65..9353476 100644
--- a/BOOK/final-system/x86_64-chapter.xml
+++ b/BOOK/final-system/x86_64-chapter.xml
@@ -61,7 +61,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
diff --git a/BOOK/schema/clfs/0.1/rng/clfs.rnc b/BOOK/schema/clfs/0.1/rng/clfs.rnc
index c939232..e8c57b5 100644
--- a/BOOK/schema/clfs/0.1/rng/clfs.rnc
+++ b/BOOK/schema/clfs/0.1/rng/clfs.rnc
@@ -115,7 +115,6 @@ clfs.package.command =
# The Package
clfs.sect.package =
element c:package {
- attribute xml:base { text }?,
attribute id { text },
clfs.attrib.arch,
clfs.attrib.bits,
diff --git a/BOOK/schema/clfs/0.1/rng/clfs.rng b/BOOK/schema/clfs/0.1/rng/clfs.rng
index 1ab0a2f..ee8dddf 100644
--- a/BOOK/schema/clfs/0.1/rng/clfs.rng
+++ b/BOOK/schema/clfs/0.1/rng/clfs.rng
@@ -191,9 +191,6 @@
<!-- The Package -->
<define name="clfs.sect.package">
<element name="c:package">
- <optional>
- <attribute name="xml:base"/>
- </optional>
<attribute name="id"/>
<ref name="clfs.attrib.arch"/>
<ref name="clfs.attrib.bits"/>
diff --git a/BOOK/temp-system/common/bash.xml b/BOOK/temp-system/common/bash.xml
index dc56c5c..67e55ed 100644
--- a/BOOK/temp-system/common/bash.xml
+++ b/BOOK/temp-system/common/bash.xml
@@ -14,14 +14,14 @@
<primary sortas="a-Bash">Bash</primary>
<secondary>temporary system</secondary>
</indexterm>
-<!--
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/bash.xml"
xpointer="xpointer(//*[@role='package'])"/>
--->
+
<sect2 role="installation">
<title>Installation of Bash</title>
-<!--
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/bash.xml"
xpointer="xpointer(//*[@os='p1'])"/>
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/bash.xml"
xpointer="xpointer(//*[@os='p2'])"/>
--->
+
<para os="t1">When Bash is cross-compiled, it cannot test for the presence
of named pipes, among other things. If you used <command>su</command> to
become an unprivileged user, this combination will cause Bash to build
@@ -52,11 +52,11 @@ bash_cv_under_sys_siglist=yes
bash_cv_unusable_rtsigs=no
gt_cv_int_divbyzero_sigfpe=yes
EOF</userinput></screen>
-<!--
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/bash.xml"
xpointer="xpointer(//*[@os='a'])"/>
--->
+
<screen os="b"><userinput>./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
--without-bash-malloc --cache-file=config.cache</userinput></screen>
@@ -75,7 +75,7 @@ EOF</userinput></screen>
</varlistentry>
</variablelist>
-<!--
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/bash.xml"
xpointer="xpointer(//*[@os='d'])"/>
@@ -87,7 +87,7 @@ EOF</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/bash.xml"
xpointer="xpointer(//*[@os='g'])"/>
--->
+
<screen os="h"><userinput>make install</userinput></screen>
<para os="t3">Make a link for programs that use <command>sh</command> for
@@ -96,13 +96,13 @@ EOF</userinput></screen>
<screen os="t4"><userinput>ln -sv bash /tools/bin/sh</userinput></screen>
</sect2>
-<!--
+
<sect2 role="content">
<title/>
<para>Details on this package are located in <xref
- linkend="ch-system-bash-contents" role="."/></para>
+ linkend="contents-bash" role="."/></para>
</sect2>
--->
+
</sect1>
diff --git a/BOOK/temp-system/multilib/bash.xml b/BOOK/temp-system/multilib/bash.xml
index 4734363..168b1f1 100644
--- a/BOOK/temp-system/multilib/bash.xml
+++ b/BOOK/temp-system/multilib/bash.xml
@@ -14,14 +14,14 @@
<primary sortas="a-Bash">Bash</primary>
<secondary>temporary system</secondary>
</indexterm>
-<!--
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/bash.xml"
xpointer="xpointer(//*[@role='package'])"/>
--->
+
<sect2 role="installation">
<title>Installation of Bash</title>
-<!--
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/bash.xml"
xpointer="xpointer(//*[@os='p1'])"/>
@@ -41,12 +41,12 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/bash.xml"
xpointer="xpointer(//*[@os='a'])"/>
--->
+
<screen os="b"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
--without-bash-malloc --cache-file=config.cache</userinput></screen>
-<!--
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/bash.xml"
xpointer="xpointer(//*[@os='c'])"/>
@@ -74,9 +74,9 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/bash.xml"
xpointer="xpointer(//*[@os='t4'])"/>
--->
+
</sect2>
-<!--
+
<sect2 role="content">
<title/>
@@ -84,5 +84,5 @@
linkend="contents-bash" role="."/></para>
</sect2>
--->
+
</sect1>
diff --git a/BOOK/testpart.xml b/BOOK/testpart.xml
new file mode 100644
index 0000000..816de5f
--- /dev/null
+++ b/BOOK/testpart.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE part PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+ <!ENTITY % general-entities SYSTEM "general.ent">
+ %general-entities;
+]>
+
+ <part id="part0" xmlns:c="http://schema.cross-lfs.org/book">
+ <?dbhtml filename="part0.html"?>
+ <title>Test Part</title>
+
+ <chapter>
+ <?dbhtml dir="chapter0"?>
+ <?dbhtml filename="chapter0.html"?>
+ <title>Chapter 0</title>
+
+ <sect1>
+ <?dbhtml filename="sect0.html"?>
+ <title>Sect 0</title>
+ <para>Testing... 1.. 2.. 3..</para>
+ </sect1>
+
+<c:package id="ch-system-bash2" c:multibuild="false">
+ <c:title>Bash</c:title>
+ <c:version>4.0.1</c:version>
+ <c:description>The Bash package contains the Bourne-Again SHell.</c:description>
+
+ <c:install>
+
+ <c:para>Apply this patch</c:para>
+
+<c:command>patch -Np1 -i ../&bash-branch_update-patch;</c:command>
+
+ <c:para>Prepare the package for compilation</c:para>
+
+<c:command>./configure -prefix=/usr -bindir=/bin \
+ -without-bash-malloc -with-installed-readline</c:command>
+
+ <c:para>Compile the package:</c:para>
+
+<c:command>make</c:command>
+
+ <c:para>To test the results, issue:
+ <c:command>make tests</c:command>.</c:para>
+
+ <c:para>Install the package:</c:para>
+<c:command>make htmldir=/usr/share/doc/bash-&bash-version; install</c:command>
+
+ <c:para>Run the newly compiled <c:command>bash</c:command> program (replacing
+ the one that is currently being executed):</c:para>
+
+<c:command c:nodump="true">exec /bin/bash -login +h</c:command>
+
+ <c:note>
+ <c:para>(note+warn) The parameters used make the <c:command>bash</c:command>
+ process an interactive login shell and continue to disable hashing so
+ that new programs are found as they become available.</c:para>
+ </c:note>
+
+ </c:install>
+
+ <c:contents>
+
+ <c:program>
+ <c:name>test2</c:name>
+ <c:description>This is the test program.</c:description>
+ </c:program>
+
+ <c:library>
+ <c:name>libjoe</c:name>
+ <c:description>This is a bullshit library for a <c:command>test</c:command>.</c:description>
+ </c:library>
+
+ <c:directory>
+ <c:name>/usr/blah</c:name>
+ <c:description>Some Crap</c:description>
+ </c:directory>
+ <c:directory>
+ <c:name>/usr/blah2</c:name>
+ <c:description>Some Crap2</c:description>
+ </c:directory>
+ <c:directory>
+ <c:name>/usr/blah3</c:name>
+ <c:description>Some Crap2</c:description>
+ </c:directory>
+ <c:directory>
+ <c:name>/usr/blah4</c:name>
+ <c:description>Some Crap2</c:description>
+ </c:directory>
+
+ </c:contents>
+
+</c:package>
+
+<c:package id="ch-system-test" c:multibuild="true">
+ <c:title>TestPackage</c:title>
+ <c:version>1.2.3</c:version>
+ <c:description>The Test package contains a <c:command>test</c:command>.</c:description>
+
+ <c:install>
+
+ <c:para>Prepare the package for compilation</c:para>
+
+<c:command c:multilib="false">./configure --prefix=/usr</c:command>
+<c:command c:multilib="true" c:bits="32">CC="gcc ${BUILD32}" ./configure --prefix=/usr</c:command>
+<c:command c:multilib="true" c:bits="n32">CC="gcc ${BUILDN32}" ./configure --prefix=/usr</c:command>
+<c:command c:multilib="true" c:bits="64">CC="gcc ${BUILD64}" ./configure --prefix=/usr</c:command>
+
+ <c:para>Compile <c:filename>the</c:filename> package:</c:para>
+
+<c:command>make</c:command>
+
+ <c:para>To test the results, issue:
+ <c:command>make tests</c:command>.</c:para>
+
+ <c:para>Install the package:</c:para>
+
+<c:command>make install</c:command>
+
+ </c:install>
+
+ <c:contents c:ref="ch-system-bash2" />
+
+</c:package>
+
+ </chapter>
+
+ </part>
diff --git a/BOOK/x86-index.xml b/BOOK/x86-index.xml
index b450daa..eb2d517 100644
--- a/BOOK/x86-index.xml
+++ b/BOOK/x86-index.xml
@@ -8,6 +8,7 @@
<book>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/x86/bookinfo.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testpart.xml"/>
<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/dedication.xml"/>
-->
diff --git a/BOOK/x86_64-index.xml b/BOOK/x86_64-index.xml
index 1ebe4fa..ca6aae2 100644
--- a/BOOK/x86_64-index.xml
+++ b/BOOK/x86_64-index.xml
@@ -8,6 +8,7 @@
<book xmlns:c="http://schema.cross-lfs.org/book">
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/x86_64/bookinfo.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testpart.xml"/>
<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/dedication.xml"/>
-->
commit 69fa5e6b525bc9edb1de06af31f3e6f14fe4180a
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Apr 24 13:00:49 2011 -0400
Remove the test part.
diff --git a/BOOK/final-system/common/bash.xml b/BOOK/final-system/common/bash.xml
index 349b97f..5b14d91 100644
--- a/BOOK/final-system/common/bash.xml
+++ b/BOOK/final-system/common/bash.xml
@@ -1,134 +1,100 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE c:package [
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
]>
-<sect1 id="ch-system-bash" role="wrap">
- <?dbhtml filename="bash.html"?>
+<c:package xmlns:c="http://schema.cross-lfs.org/book" id="ch-system-bash" c:multibuild="false">
- <title>Bash-&bash-version;</title>
+ <c:title>Bash</c:title>
+ <c:version>&bash-version;</c:version>
+ <c:description>The Bash package contains the Bourne-Again SHell.</c:description>
- <indexterm zone="ch-system-bash">
- <primary sortas="a-Bash">Bash</primary>
- </indexterm>
+ <c:install>
- <sect2 role="package">
- <title/>
+ <c:para>The following patch contains updates from the maintainer. The
+ maintainer of Bash only releases these patches to fix serious issues:</c:para>
- <para>The Bash package contains the Bourne-Again SHell.</para>
+<c:command>patch -Np1 -i ../&bash-branch_update-patch;</c:command>
- </sect2>
+ <c:para c:multilib="true">The following sed points configure towards the
+ correct library directory while searching for Readline:</c:para>
- <sect2 role="installation">
- <title>Installation of Bash</title>
+<c:command c:multilib="true">sed -i "/ac_cv_rl_libdir/s@/lib@&64@" configure</c:command>
- <para os="p1">The following patch contains updates from the maintainer. The
- maintainer of Bash only releases these patches to fix serious issues:</para>
+ <c:para>Prepare Bash for compilation:</c:para>
-<screen os="p2"><userinput>patch -Np1 -i ../&bash-branch_update-patch;</userinput></screen>
+<c:command c:multilib="false">./configure --prefix=/usr --bindir=/bin \
+ --without-bash-malloc --with-installed-readline</c:command>
+<c:command c:multilib="true">CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
+ ./configure --prefix=/usr --bindir=/bin \
+ --without-bash-malloc --with-installed-readline</c:command>
- <para os="a">Prepare Bash for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin \
- --without-bash-malloc --with-installed-readline</userinput></screen>
-
- <variablelist os="c">
+<!--
+ <variablelist>
<title>The meaning of the configure option:</title>
<varlistentry>
- <term><parameter>--with-installed-readline</parameter></term>
+ <term><parameter>-with-installed-readline</parameter></term>
<listitem>
- <para>This option tells Bash to use the
+ <c:para>This option tells Bash to use the
<filename class="libraryfile">readline</filename> library that is
already installed on the system rather than using its own readline
- version.</para>
+ version.</c:para>
</listitem>
</varlistentry>
</variablelist>
+-->
+ <c:para>Compile the package:</c:para>
- <para os="d">Compile the package:</para>
+<c:command>make</c:command>
-<screen os="e"><userinput>make</userinput></screen>
+ <c:para>To test the results, issue:
+ <c:command>make tests</c:command>.</c:para>
- <para os="f">To test the results, issue:
- <userinput>make tests</userinput>.</para>
+ <c:para>Install the package:</c:para>
- <para os="g">Install the package:</para>
+<c:command>make htmldir=/usr/share/doc/bash-&bash-version; install</c:command>
-<screen os="h"><userinput>make htmldir=/usr/share/doc/bash-&bash-version; install</userinput></screen>
+ <c:para>Run the newly compiled <c:command>bash</c:command> program (replacing
+ the one that is currently being executed):</c:para>
- <para os="i">Run the newly compiled <command>bash</command> program (replacing
- the one that is currently being executed):</para>
+<c:command c:nodump="true">exec /bin/bash --login +h</c:command>
-<screen os="j" role="nodump"><userinput>exec /bin/bash --login +h</userinput></screen>
-
- <note os="k">
- <para>The parameters used make the <command>bash</command>
+ <c:note>
+ <c:para>The parameters used make the <c:command>bash</c:command>
process an interactive login shell and continue to disable hashing so
- that new programs are found as they become available.</para>
- </note>
-
- </sect2>
+ that new programs are found as they become available.</c:para>
+ </c:note>
- <sect2 id="contents-bash" role="content">
- <title>Contents of Bash</title>
+ </c:install>
- <segmentedlist>
- <segtitle>Installed programs</segtitle>
- <segtitle>Installed directory</segtitle>
+ <c:contents>
- <seglistitem>
- <seg>bash, bashbug, and sh (link to bash)</seg>
- <seg>/usr/share/doc/bash-&bash-version;</seg>
- </seglistitem>
- </segmentedlist>
-
- <variablelist>
- <bridgehead renderas="sect3">Short Descriptions</bridgehead>
- <?dbfo list-presentation="list"?>
- <?dbhtml list-presentation="table"?>
-
- <varlistentry id="bash">
- <term><command>bash</command></term>
- <listitem>
- <para>A widely-used command interpreter; it performs many types of
- expansions and substitutions on a given command line before executing
- it, thus making this interpreter a powerful tool</para>
- <indexterm zone="ch-system-bash bash">
- <primary sortas="b-bash">bash</primary>
- </indexterm>
- </listitem>
- </varlistentry>
+ <c:program>
+ <c:name>bash</c:name>
+ <c:description>A widely-used command interpreter; it performs many types
+ of expansions and substitutions on a given command line before executing
+ it, thus making this interpreter a powerful tool</c:description>
+ </c:program>
- <varlistentry id="bashbug">
- <term><command>bashbug</command></term>
- <listitem>
- <para>A shell script to help the user compose and mail standard
- formatted bug reports concerning <command>bash</command></para>
- <indexterm zone="ch-system-bash bashbug">
- <primary sortas="b-bashbug">bashbug</primary>
- </indexterm>
- </listitem>
- </varlistentry>
+ <c:program>
+ <c:name>bashbug</c:name>
+ <c:description>A shell script to help the user compose and mail standard
+ formatted bug reports concerning <c:command>bash</c:command>
+ </c:description>
+ </c:program>
- <varlistentry id="sh">
- <term><command>sh</command></term>
- <listitem>
- <para>A symlink to the <command>bash</command> program; when invoked
- as <command>sh</command>, <command>bash</command> tries to mimic the
- startup behavior of historical versions of <command>sh</command> as
- closely as possible, while conforming to the POSIX standard as
- well</para>
- <indexterm zone="ch-system-bash sh">
- <primary sortas="b-sh">sh</primary>
- </indexterm>
- </listitem>
- </varlistentry>
+ <c:program>
+ <c:name>sh</c:name>
+ <c:description>A symlink to the <c:command>bash</c:command> program; when
+ invoked as <c:command>sh</c:command>, <c:command>bash</c:command> tries
+ to mimic the startup behavior of historical versions of
+ <c:command>sh</c:command> as closely as possible, while conforming to the
+ POSIX standard as well</c:description>
+ </c:program>
- </variablelist>
+ </c:contents>
- </sect2>
+</c:package>
-</sect1>
diff --git a/BOOK/final-system/mips64-chapter.xml b/BOOK/final-system/mips64-chapter.xml
index 22d1d12..12460f0 100644
--- a/BOOK/final-system/mips64-chapter.xml
+++ b/BOOK/final-system/mips64-chapter.xml
@@ -77,7 +77,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-n32.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
diff --git a/BOOK/final-system/ppc64-chapter.xml b/BOOK/final-system/ppc64-chapter.xml
index 867e7bc..242546f 100644
--- a/BOOK/final-system/ppc64-chapter.xml
+++ b/BOOK/final-system/ppc64-chapter.xml
@@ -61,7 +61,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
diff --git a/BOOK/final-system/sparc64-chapter.xml b/BOOK/final-system/sparc64-chapter.xml
index ccfe3fc..77130bb 100644
--- a/BOOK/final-system/sparc64-chapter.xml
+++ b/BOOK/final-system/sparc64-chapter.xml
@@ -61,7 +61,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
diff --git a/BOOK/final-system/x86_64-chapter.xml b/BOOK/final-system/x86_64-chapter.xml
index 9353476..3509e65 100644
--- a/BOOK/final-system/x86_64-chapter.xml
+++ b/BOOK/final-system/x86_64-chapter.xml
@@ -61,7 +61,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
diff --git a/BOOK/schema/clfs/0.1/rng/clfs.rnc b/BOOK/schema/clfs/0.1/rng/clfs.rnc
index e8c57b5..c939232 100644
--- a/BOOK/schema/clfs/0.1/rng/clfs.rnc
+++ b/BOOK/schema/clfs/0.1/rng/clfs.rnc
@@ -115,6 +115,7 @@ clfs.package.command =
# The Package
clfs.sect.package =
element c:package {
+ attribute xml:base { text }?,
attribute id { text },
clfs.attrib.arch,
clfs.attrib.bits,
diff --git a/BOOK/schema/clfs/0.1/rng/clfs.rng b/BOOK/schema/clfs/0.1/rng/clfs.rng
index ee8dddf..1ab0a2f 100644
--- a/BOOK/schema/clfs/0.1/rng/clfs.rng
+++ b/BOOK/schema/clfs/0.1/rng/clfs.rng
@@ -191,6 +191,9 @@
<!-- The Package -->
<define name="clfs.sect.package">
<element name="c:package">
+ <optional>
+ <attribute name="xml:base"/>
+ </optional>
<attribute name="id"/>
<ref name="clfs.attrib.arch"/>
<ref name="clfs.attrib.bits"/>
diff --git a/BOOK/temp-system/common/bash.xml b/BOOK/temp-system/common/bash.xml
index 67e55ed..dc56c5c 100644
--- a/BOOK/temp-system/common/bash.xml
+++ b/BOOK/temp-system/common/bash.xml
@@ -14,14 +14,14 @@
<primary sortas="a-Bash">Bash</primary>
<secondary>temporary system</secondary>
</indexterm>
-
+<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/bash.xml"
xpointer="xpointer(//*[@role='package'])"/>
-
+-->
<sect2 role="installation">
<title>Installation of Bash</title>
-
+<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/bash.xml"
xpointer="xpointer(//*[@os='p1'])"/>
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/bash.xml"
xpointer="xpointer(//*[@os='p2'])"/>
-
+-->
<para os="t1">When Bash is cross-compiled, it cannot test for the presence
of named pipes, among other things. If you used <command>su</command> to
become an unprivileged user, this combination will cause Bash to build
@@ -52,11 +52,11 @@ bash_cv_under_sys_siglist=yes
bash_cv_unusable_rtsigs=no
gt_cv_int_divbyzero_sigfpe=yes
EOF</userinput></screen>
-
+<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/bash.xml"
xpointer="xpointer(//*[@os='a'])"/>
-
+-->
<screen os="b"><userinput>./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
--without-bash-malloc --cache-file=config.cache</userinput></screen>
@@ -75,7 +75,7 @@ EOF</userinput></screen>
</varlistentry>
</variablelist>
-
+<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/bash.xml"
xpointer="xpointer(//*[@os='d'])"/>
@@ -87,7 +87,7 @@ EOF</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/bash.xml"
xpointer="xpointer(//*[@os='g'])"/>
-
+-->
<screen os="h"><userinput>make install</userinput></screen>
<para os="t3">Make a link for programs that use <command>sh</command> for
@@ -96,13 +96,13 @@ EOF</userinput></screen>
<screen os="t4"><userinput>ln -sv bash /tools/bin/sh</userinput></screen>
</sect2>
-
+<!--
<sect2 role="content">
<title/>
<para>Details on this package are located in <xref
- linkend="contents-bash" role="."/></para>
+ linkend="ch-system-bash-contents" role="."/></para>
</sect2>
-
+-->
</sect1>
diff --git a/BOOK/temp-system/multilib/bash.xml b/BOOK/temp-system/multilib/bash.xml
index 168b1f1..4734363 100644
--- a/BOOK/temp-system/multilib/bash.xml
+++ b/BOOK/temp-system/multilib/bash.xml
@@ -14,14 +14,14 @@
<primary sortas="a-Bash">Bash</primary>
<secondary>temporary system</secondary>
</indexterm>
-
+<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/bash.xml"
xpointer="xpointer(//*[@role='package'])"/>
-
+-->
<sect2 role="installation">
<title>Installation of Bash</title>
-
+<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/bash.xml"
xpointer="xpointer(//*[@os='p1'])"/>
@@ -41,12 +41,12 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/bash.xml"
xpointer="xpointer(//*[@os='a'])"/>
-
+-->
<screen os="b"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
--without-bash-malloc --cache-file=config.cache</userinput></screen>
-
+<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/bash.xml"
xpointer="xpointer(//*[@os='c'])"/>
@@ -74,9 +74,9 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/bash.xml"
xpointer="xpointer(//*[@os='t4'])"/>
-
+-->
</sect2>
-
+<!--
<sect2 role="content">
<title/>
@@ -84,5 +84,5 @@
linkend="contents-bash" role="."/></para>
</sect2>
-
+-->
</sect1>
diff --git a/BOOK/testpart.xml b/BOOK/testpart.xml
deleted file mode 100644
index 816de5f..0000000
--- a/BOOK/testpart.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE part PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "general.ent">
- %general-entities;
-]>
-
- <part id="part0" xmlns:c="http://schema.cross-lfs.org/book">
- <?dbhtml filename="part0.html"?>
- <title>Test Part</title>
-
- <chapter>
- <?dbhtml dir="chapter0"?>
- <?dbhtml filename="chapter0.html"?>
- <title>Chapter 0</title>
-
- <sect1>
- <?dbhtml filename="sect0.html"?>
- <title>Sect 0</title>
- <para>Testing... 1.. 2.. 3..</para>
- </sect1>
-
-<c:package id="ch-system-bash2" c:multibuild="false">
- <c:title>Bash</c:title>
- <c:version>4.0.1</c:version>
- <c:description>The Bash package contains the Bourne-Again SHell.</c:description>
-
- <c:install>
-
- <c:para>Apply this patch</c:para>
-
-<c:command>patch -Np1 -i ../&bash-branch_update-patch;</c:command>
-
- <c:para>Prepare the package for compilation</c:para>
-
-<c:command>./configure -prefix=/usr -bindir=/bin \
- -without-bash-malloc -with-installed-readline</c:command>
-
- <c:para>Compile the package:</c:para>
-
-<c:command>make</c:command>
-
- <c:para>To test the results, issue:
- <c:command>make tests</c:command>.</c:para>
-
- <c:para>Install the package:</c:para>
-<c:command>make htmldir=/usr/share/doc/bash-&bash-version; install</c:command>
-
- <c:para>Run the newly compiled <c:command>bash</c:command> program (replacing
- the one that is currently being executed):</c:para>
-
-<c:command c:nodump="true">exec /bin/bash -login +h</c:command>
-
- <c:note>
- <c:para>(note+warn) The parameters used make the <c:command>bash</c:command>
- process an interactive login shell and continue to disable hashing so
- that new programs are found as they become available.</c:para>
- </c:note>
-
- </c:install>
-
- <c:contents>
-
- <c:program>
- <c:name>test2</c:name>
- <c:description>This is the test program.</c:description>
- </c:program>
-
- <c:library>
- <c:name>libjoe</c:name>
- <c:description>This is a bullshit library for a <c:command>test</c:command>.</c:description>
- </c:library>
-
- <c:directory>
- <c:name>/usr/blah</c:name>
- <c:description>Some Crap</c:description>
- </c:directory>
- <c:directory>
- <c:name>/usr/blah2</c:name>
- <c:description>Some Crap2</c:description>
- </c:directory>
- <c:directory>
- <c:name>/usr/blah3</c:name>
- <c:description>Some Crap2</c:description>
- </c:directory>
- <c:directory>
- <c:name>/usr/blah4</c:name>
- <c:description>Some Crap2</c:description>
- </c:directory>
-
- </c:contents>
-
-</c:package>
-
-<c:package id="ch-system-test" c:multibuild="true">
- <c:title>TestPackage</c:title>
- <c:version>1.2.3</c:version>
- <c:description>The Test package contains a <c:command>test</c:command>.</c:description>
-
- <c:install>
-
- <c:para>Prepare the package for compilation</c:para>
-
-<c:command c:multilib="false">./configure --prefix=/usr</c:command>
-<c:command c:multilib="true" c:bits="32">CC="gcc ${BUILD32}" ./configure --prefix=/usr</c:command>
-<c:command c:multilib="true" c:bits="n32">CC="gcc ${BUILDN32}" ./configure --prefix=/usr</c:command>
-<c:command c:multilib="true" c:bits="64">CC="gcc ${BUILD64}" ./configure --prefix=/usr</c:command>
-
- <c:para>Compile <c:filename>the</c:filename> package:</c:para>
-
-<c:command>make</c:command>
-
- <c:para>To test the results, issue:
- <c:command>make tests</c:command>.</c:para>
-
- <c:para>Install the package:</c:para>
-
-<c:command>make install</c:command>
-
- </c:install>
-
- <c:contents c:ref="ch-system-bash2" />
-
-</c:package>
-
- </chapter>
-
- </part>
diff --git a/BOOK/x86-index.xml b/BOOK/x86-index.xml
index eb2d517..b450daa 100644
--- a/BOOK/x86-index.xml
+++ b/BOOK/x86-index.xml
@@ -8,7 +8,6 @@
<book>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/x86/bookinfo.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testpart.xml"/>
<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/dedication.xml"/>
-->
diff --git a/BOOK/x86_64-index.xml b/BOOK/x86_64-index.xml
index ca6aae2..1ebe4fa 100644
--- a/BOOK/x86_64-index.xml
+++ b/BOOK/x86_64-index.xml
@@ -8,7 +8,6 @@
<book xmlns:c="http://schema.cross-lfs.org/book">
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/x86_64/bookinfo.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="testpart.xml"/>
<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prologue/dedication.xml"/>
-->
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/common/bash.xml | 156 +++++++++++++--------------------
BOOK/final-system/mips64-chapter.xml | 2 +-
BOOK/final-system/multilib/bash.xml | 87 ------------------
BOOK/final-system/ppc64-chapter.xml | 2 +-
BOOK/final-system/sparc64-chapter.xml | 2 +-
BOOK/final-system/x86_64-chapter.xml | 2 +-
BOOK/schema/clfs/0.1/rng/clfs.rnc | 10 ++-
BOOK/schema/clfs/0.1/rng/clfs.rng | 19 ++++-
BOOK/stylesheets/clfs-profile.xsl | 43 +++++++++-
BOOK/temp-system/common/bash.xml | 22 +++---
BOOK/temp-system/multilib/bash.xml | 16 ++--
BOOK/testpart.xml | 128 ---------------------------
BOOK/x86-index.xml | 1 -
BOOK/x86_64-index.xml | 1 -
14 files changed, 151 insertions(+), 340 deletions(-)
delete mode 100644 BOOK/final-system/multilib/bash.xml
delete mode 100644 BOOK/testpart.xml
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list