[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, simp, updated. 268f64e69ca761ec5778e8506c417d405e1cbfbb
git
git at cross-lfs.org
Sun Apr 24 14:17:30 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 268f64e69ca761ec5778e8506c417d405e1cbfbb (commit)
via 3f2c36da3f00c46ed09333f220307c16fbff68d0 (commit)
via 8823a9795cd5b8801fea98ae8d076fd1ac27bf3f (commit)
via 41fab2ec1a23fea64c08b089783a7387691b12af (commit)
via 1bdabc9d46f493394b9f70a60934acd1b334475a (commit)
via d4c109d6dcb38b8b270b6ee6a4b1adb2e8ac83e3 (commit)
from 6d86eb17455f109b19738660fac7f157fe788efd (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 268f64e69ca761ec5778e8506c417d405e1cbfbb
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Apr 24 17:17:16 2011 -0400
Convert Bash in the temp-system.
diff --git a/BOOK/final-system/common/bash.xml b/BOOK/final-system/common/bash.xml
index 5b14d91..a98df87 100644
--- a/BOOK/final-system/common/bash.xml
+++ b/BOOK/final-system/common/bash.xml
@@ -4,7 +4,8 @@
%general-entities;
]>
-<c:package xmlns:c="http://schema.cross-lfs.org/book" id="ch-system-bash" c:multibuild="false">
+<c:package xmlns:c="http://schema.cross-lfs.org/book"
+ id="ch-system-bash" c:multibuild="false">
<c:title>Bash</c:title>
<c:version>&bash-version;</c:version>
@@ -12,10 +13,10 @@
<c:install>
- <c:para>The following patch contains updates from the maintainer. The
+ <c:para c:r="p-bu">The following patch contains updates from the maintainer. The
maintainer of Bash only releases these patches to fix serious issues:</c:para>
-<c:command>patch -Np1 -i ../&bash-branch_update-patch;</c:command>
+<c:command c:r="p-bu">patch -Np1 -i ../&bash-branch_update-patch;</c:command>
<c:para c:multilib="true">The following sed points configure towards the
correct library directory while searching for Readline:</c:para>
diff --git a/BOOK/temp-system/common/bash.xml b/BOOK/temp-system/common/bash.xml
index dc56c5c..8baaf05 100644
--- a/BOOK/temp-system/common/bash.xml
+++ b/BOOK/temp-system/common/bash.xml
@@ -1,44 +1,36 @@
<?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-temp-system-bash" role="wrap">
- <?dbhtml filename="bash.html"?>
+<c:package xmlns:c="http://schema.cross-lfs.org/book"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ id="ch-temp-system-bash" c:multibuild="false">
- <title>Bash-&bash-version;</title>
+ <c:title>Bash</c:title>
+ <c:version>&bash-version;</c:version>
+ <c:variant>temporary system</c:variant>
- <indexterm zone="ch-temp-system-bash">
- <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'])"/>
+ <xi:include href="../../final-system/common/bash.xml"
+ xpointer="xmlns(co=http://schema.cross-lfs.org/book)
+ xpointer(/co:package/co:description[1])" />
- <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
+ <c:install>
+
+ <xi:include href="../../final-system/common/bash.xml"
+ xpointer="xmlns(co=http://schema.cross-lfs.org/book)
+ xpointer(/co:package/co:install/*[@co:r='p-bu'])" />
+
+ <c:para>When Bash is cross-compiled, it cannot test for the presence
+ of named pipes, among other things. If you used <c:command>su</c:command> to
become an unprivileged user, this combination will cause Bash to build
- without <emphasis>process substitution</emphasis>, which will break one
- of the C++ test scripts in <literal>eglibc</literal>. The following prevents
+ without <c:emphasis>process substitution</c:emphasis>, which will break one
+ of the C++ test scripts in <c:literal>eglibc</c:literal>. The following prevents
future problems by skipping the check for named pipes, as well as other
- tests that can not run while cross-compiling or that do not run properly:</para>
+ tests that can not run while cross-compiling or that do not run properly:</c:para>
-<screen os="t2"><userinput>cat > config.cache << "EOF"
+<c:command>cat > config.cache << "EOF"
ac_cv_func_mmap_fixed_mapped=yes
ac_cv_func_strcoll_works=yes
ac_cv_func_working_mktime=yes
@@ -51,21 +43,24 @@ bash_cv_ulimit_maxfds=yes
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>
+EOF</c:command>
+
+ <c:para>Prepare Bash for compilation:</c:para>
+
+<c:command c:arch="alpha,mips,ppc,sparc,x86">./configure -prefix=/tools \
+ -build=${CLFS_HOST} -host=${CLFS_TARGET} \
+ -without-bash-malloc -cache-file=config.cache</c:command>
+<c:command c:arch="mips64-64,mips64,ppc64,sparc64-64,sparc64,x86_64-64,x86_64">CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
+ ./configure --prefix=/tools \
+ --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+ --without-bash-malloc --cache-file=config.cache</c:command>
+<!--
<variablelist os="c">
<title>The meaning of the configure option:</title>
<varlistentry>
- <term><parameter>--without-bash-malloc</parameter></term>
+ <term><parameter>-without-bash-malloc</parameter></term>
<listitem>
<para>This option turns off the use of Bash's memory allocation
(malloc) function which is known to cause segmentation faults.
@@ -75,34 +70,24 @@ 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'])"/>
+-->
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../final-system/common/bash.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ <c:para>Compile the package:</c:para>
- <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>
+<c:command>make</c:command>
- <para os="t3">Make a link for programs that use <command>sh</command> for
- a shell:</para>
+ <c:para>Install the package:</c:para>
-<screen os="t4"><userinput>ln -sv bash /tools/bin/sh</userinput></screen>
+<c:command>make install</c:command>
- </sect2>
-<!--
- <sect2 role="content">
- <title/>
+ <c:para>Make a link for programs that use <c:command>sh</c:command> for
+ a shell:</c:para>
- <para>Details on this package are located in <xref
- linkend="ch-system-bash-contents" role="."/></para>
+<c:command>ln -sv bash /tools/bin/sh</c:command>
+
+ </c:install>
+
+ <c:contents c:ref="ch-system-bash" />
+
+</c:package>
- </sect2>
--->
-</sect1>
diff --git a/BOOK/temp-system/mips64-64-chapter.xml b/BOOK/temp-system/mips64-64-chapter.xml
index 20407cb..ee13bf8 100644
--- a/BOOK/temp-system/mips64-64-chapter.xml
+++ b/BOOK/temp-system/mips64-64-chapter.xml
@@ -22,7 +22,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/ncurses.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/bison.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
diff --git a/BOOK/temp-system/mips64-chapter.xml b/BOOK/temp-system/mips64-chapter.xml
index e8a08f1..1a5fb93 100644
--- a/BOOK/temp-system/mips64-chapter.xml
+++ b/BOOK/temp-system/mips64-chapter.xml
@@ -22,7 +22,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/gcc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.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/bison.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/coreutils.xml"/>
diff --git a/BOOK/temp-system/ppc64-chapter.xml b/BOOK/temp-system/ppc64-chapter.xml
index 947a169..7dde1a0 100644
--- a/BOOK/temp-system/ppc64-chapter.xml
+++ b/BOOK/temp-system/ppc64-chapter.xml
@@ -21,7 +21,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/gcc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.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/bison.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/coreutils.xml"/>
diff --git a/BOOK/temp-system/sparc64-64-chapter.xml b/BOOK/temp-system/sparc64-64-chapter.xml
index 20407cb..ee13bf8 100644
--- a/BOOK/temp-system/sparc64-64-chapter.xml
+++ b/BOOK/temp-system/sparc64-64-chapter.xml
@@ -22,7 +22,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/ncurses.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/bison.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
diff --git a/BOOK/temp-system/sparc64-chapter.xml b/BOOK/temp-system/sparc64-chapter.xml
index 4358af5..635d08f 100644
--- a/BOOK/temp-system/sparc64-chapter.xml
+++ b/BOOK/temp-system/sparc64-chapter.xml
@@ -22,7 +22,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.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/bison.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/coreutils.xml"/>
diff --git a/BOOK/temp-system/x86_64-64-chapter.xml b/BOOK/temp-system/x86_64-64-chapter.xml
index 20407cb..ee13bf8 100644
--- a/BOOK/temp-system/x86_64-64-chapter.xml
+++ b/BOOK/temp-system/x86_64-64-chapter.xml
@@ -22,7 +22,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/ncurses.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/bison.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
diff --git a/BOOK/temp-system/x86_64-chapter.xml b/BOOK/temp-system/x86_64-chapter.xml
index 4358af5..635d08f 100644
--- a/BOOK/temp-system/x86_64-chapter.xml
+++ b/BOOK/temp-system/x86_64-chapter.xml
@@ -22,7 +22,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.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/bison.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/coreutils.xml"/>
commit 3f2c36da3f00c46ed09333f220307c16fbff68d0
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Apr 24 17:16:17 2011 -0400
Add an inline element of c:emphasis.
diff --git a/BOOK/schema/clfs/0.1/rng/clfs.rnc b/BOOK/schema/clfs/0.1/rng/clfs.rnc
index 6f32a21..39b506f 100644
--- a/BOOK/schema/clfs/0.1/rng/clfs.rnc
+++ b/BOOK/schema/clfs/0.1/rng/clfs.rnc
@@ -43,7 +43,8 @@ clfs.attrib.r = attribute c:r { text }?
# Inline Elements
clfs.inline =
- (clfs.inline.literal |
+ (clfs.inline.emphasis |
+ clfs.inline.literal |
clfs.inline.replaceable |
clfs.inline.application |
clfs.inline.dirname |
@@ -56,6 +57,12 @@ clfs.inline.common.attrib =
clfs.attrib.bits,
clfs.attrib.multilib
+clfs.inline.emphasis =
+ element c:emphasis {
+ clfs.inline.common.attrib,
+ clfs.inline
+ }
+
clfs.inline.literal =
element c:literal {
clfs.inline.common.attrib,
diff --git a/BOOK/schema/clfs/0.1/rng/clfs.rng b/BOOK/schema/clfs/0.1/rng/clfs.rng
index 5cf3da3..45f832d 100644
--- a/BOOK/schema/clfs/0.1/rng/clfs.rng
+++ b/BOOK/schema/clfs/0.1/rng/clfs.rng
@@ -93,6 +93,7 @@
<define name="clfs.inline">
<zeroOrMore>
<choice>
+ <ref name="clfs.inline.emphasis"/>
<ref name="clfs.inline.literal"/>
<ref name="clfs.inline.replaceable"/>
<ref name="clfs.inline.application"/>
@@ -108,6 +109,12 @@
<ref name="clfs.attrib.bits"/>
<ref name="clfs.attrib.multilib"/>
</define>
+ <define name="clfs.inline.emphasis">
+ <element name="c:emphasis">
+ <ref name="clfs.inline.common.attrib"/>
+ <ref name="clfs.inline"/>
+ </element>
+ </define>
<define name="clfs.inline.literal">
<element name="c:literal">
<ref name="clfs.inline.common.attrib"/>
diff --git a/BOOK/stylesheets/clfs-profile.xsl b/BOOK/stylesheets/clfs-profile.xsl
index 3798d75..ddc89e0 100644
--- a/BOOK/stylesheets/clfs-profile.xsl
+++ b/BOOK/stylesheets/clfs-profile.xsl
@@ -717,6 +717,28 @@
</xsl:if>
</xsl:template>
+ <xsl:template match="c:emphasis" mode="filter-bits-32">
+ <xsl:variable name="ismultilib">
+ <xsl:choose>
+ <xsl:when test="contains($clfs.multilib, ',')">
+ <xsl:text>true</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>false</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(string-length(@c:arch) = 0) or contains(concat(',', at c:arch,','), concat(',', $clfs.arch, ','))">
+ <xsl:if test="(string-length(@c:multilib) = 0) or contains(concat(',', at c:multilib,','), concat(',', $ismultilib, ','))">
+ <xsl:if test="(string-length(@c:bits) = 0) or contains(concat(',', at c:bits,','), ',32,')">
+ <xsl:element name="emphasis">
+ <xsl:apply-templates select="node()" mode="filter-bits-32" />
+ </xsl:element>
+ </xsl:if>
+ </xsl:if>
+ </xsl:if>
+ </xsl:template>
+
<xsl:template match="c:literal" mode="filter-bits-32">
<xsl:variable name="ismultilib">
<xsl:choose>
@@ -953,6 +975,28 @@
</xsl:if>
</xsl:template>
+ <xsl:template match="c:emphasis" mode="filter-bits-n32">
+ <xsl:variable name="ismultilib">
+ <xsl:choose>
+ <xsl:when test="contains($clfs.multilib, ',')">
+ <xsl:text>true</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>false</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(string-length(@c:arch) = 0) or contains(concat(',', at c:arch,','), concat(',', $clfs.arch, ','))">
+ <xsl:if test="(string-length(@c:multilib) = 0) or contains(concat(',', at c:multilib,','), concat(',', $ismultilib, ','))">
+ <xsl:if test="(string-length(@c:bits) = 0) or contains(concat(',', at c:bits,','), ',n32,')">
+ <xsl:element name="emphasis">
+ <xsl:apply-templates select="node()" mode="filter-bits-n32" />
+ </xsl:element>
+ </xsl:if>
+ </xsl:if>
+ </xsl:if>
+ </xsl:template>
+
<xsl:template match="c:literal" mode="filter-bits-n32">
<xsl:variable name="ismultilib">
<xsl:choose>
@@ -1189,6 +1233,28 @@
</xsl:if>
</xsl:template>
+ <xsl:template match="c:emphasis" mode="filter-bits-64">
+ <xsl:variable name="ismultilib">
+ <xsl:choose>
+ <xsl:when test="contains($clfs.multilib, ',')">
+ <xsl:text>true</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>false</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:if test="(string-length(@c:arch) = 0) or contains(concat(',', at c:arch,','), concat(',', $clfs.arch, ','))">
+ <xsl:if test="(string-length(@c:multilib) = 0) or contains(concat(',', at c:multilib,','), concat(',', $ismultilib, ','))">
+ <xsl:if test="(string-length(@c:bits) = 0) or contains(concat(',', at c:bits,','), ',64,')">
+ <xsl:element name="emphasis">
+ <xsl:apply-templates select="node()" mode="filter-bits-64" />
+ </xsl:element>
+ </xsl:if>
+ </xsl:if>
+ </xsl:if>
+ </xsl:template>
+
<xsl:template match="c:literal" mode="filter-bits-64">
<xsl:variable name="ismultilib">
<xsl:choose>
commit 8823a9795cd5b8801fea98ae8d076fd1ac27bf3f
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Apr 24 17:11:53 2011 -0400
Add an attribute to the schema. c:r, r for reference.
diff --git a/BOOK/schema/clfs/0.1/rng/clfs.rnc b/BOOK/schema/clfs/0.1/rng/clfs.rnc
index b57c891..6f32a21 100644
--- a/BOOK/schema/clfs/0.1/rng/clfs.rnc
+++ b/BOOK/schema/clfs/0.1/rng/clfs.rnc
@@ -38,6 +38,8 @@ clfs.attrib.arch = attribute c:arch { text }?
clfs.attrib.bits = attribute c:bits { text }?
clfs.attrib.multilib = attribute c:multilib { "true" | "false" }?
+clfs.attrib.r = attribute c:r { text }?
+
# Inline Elements
clfs.inline =
@@ -89,33 +91,41 @@ clfs.inline.command =
clfs.package.para =
element c:para {
+ xml.attrib.base,
clfs.attrib.arch,
clfs.attrib.bits,
clfs.attrib.multilib,
+ clfs.attrib.r,
clfs.inline
}
clfs.package.note =
element c:note {
+ xml.attrib.base,
clfs.attrib.arch,
clfs.attrib.bits,
clfs.attrib.multilib,
+ clfs.attrib.r,
(clfs.package.para | clfs.package.command)*
}
clfs.package.warning =
element c:note {
+ xml.attrib.base,
clfs.attrib.arch,
clfs.attrib.bits,
clfs.attrib.multilib,
+ clfs.attrib.r,
(clfs.package.para | clfs.package.command)*
}
clfs.package.command =
element c:command {
+ xml.attrib.base,
clfs.attrib.arch,
clfs.attrib.bits,
clfs.attrib.multilib,
+ clfs.attrib.r,
attribute c:nodump {
"true" | "false"
}?,
diff --git a/BOOK/schema/clfs/0.1/rng/clfs.rng b/BOOK/schema/clfs/0.1/rng/clfs.rng
index f74aadf..5cf3da3 100644
--- a/BOOK/schema/clfs/0.1/rng/clfs.rng
+++ b/BOOK/schema/clfs/0.1/rng/clfs.rng
@@ -84,6 +84,11 @@
</attribute>
</optional>
</define>
+ <define name="clfs.attrib.r">
+ <optional>
+ <attribute name="c:r"/>
+ </optional>
+ </define>
<!-- Inline Elements -->
<define name="clfs.inline">
<zeroOrMore>
@@ -142,17 +147,21 @@
<!-- Block Elements -->
<define name="clfs.package.para">
<element name="c:para">
+ <ref name="xml.attrib.base"/>
<ref name="clfs.attrib.arch"/>
<ref name="clfs.attrib.bits"/>
<ref name="clfs.attrib.multilib"/>
+ <ref name="clfs.attrib.r"/>
<ref name="clfs.inline"/>
</element>
</define>
<define name="clfs.package.note">
<element name="c:note">
+ <ref name="xml.attrib.base"/>
<ref name="clfs.attrib.arch"/>
<ref name="clfs.attrib.bits"/>
<ref name="clfs.attrib.multilib"/>
+ <ref name="clfs.attrib.r"/>
<zeroOrMore>
<choice>
<ref name="clfs.package.para"/>
@@ -163,9 +172,11 @@
</define>
<define name="clfs.package.warning">
<element name="c:note">
+ <ref name="xml.attrib.base"/>
<ref name="clfs.attrib.arch"/>
<ref name="clfs.attrib.bits"/>
<ref name="clfs.attrib.multilib"/>
+ <ref name="clfs.attrib.r"/>
<zeroOrMore>
<choice>
<ref name="clfs.package.para"/>
@@ -176,9 +187,11 @@
</define>
<define name="clfs.package.command">
<element name="c:command">
+ <ref name="xml.attrib.base"/>
<ref name="clfs.attrib.arch"/>
<ref name="clfs.attrib.bits"/>
<ref name="clfs.attrib.multilib"/>
+ <ref name="clfs.attrib.r"/>
<optional>
<attribute name="c:nodump">
<choice>
commit 41fab2ec1a23fea64c08b089783a7387691b12af
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Apr 24 16:38:14 2011 -0400
Prevent unwanted attributes from being processed when dealing with the c:description tag is included via xi:include.
diff --git a/BOOK/stylesheets/clfs-profile.xsl b/BOOK/stylesheets/clfs-profile.xsl
index a63378a..3798d75 100644
--- a/BOOK/stylesheets/clfs-profile.xsl
+++ b/BOOK/stylesheets/clfs-profile.xsl
@@ -192,13 +192,13 @@
<xsl:element name="para">
<xsl:choose>
<xsl:when test="$bits = '32'">
- <xsl:apply-templates select="c:description/@*|c:description/node()" mode="filter-bits-32" />
+ <xsl:apply-templates select="c:description/node()" mode="filter-bits-32" />
</xsl:when>
<xsl:when test="$bits = 'n32'">
- <xsl:apply-templates select="c:description/@*|c:description/node()" mode="filter-bits-n32" />
+ <xsl:apply-templates select="c:description/node()" mode="filter-bits-n32" />
</xsl:when>
<xsl:when test="$bits = '64'">
- <xsl:apply-templates select="c:description/@*|c:description/node()" mode="filter-bits-64" />
+ <xsl:apply-templates select="c:description/node()" mode="filter-bits-64" />
</xsl:when>
</xsl:choose>
</xsl:element>
@@ -461,7 +461,7 @@
<xsl:text>
 </xsl:text>
<xsl:element name="para">
- <xsl:apply-templates select="c:description/@*|c:description/node()" />
+ <xsl:apply-templates select="c:description/node()" />
</xsl:element>
<xsl:text>
 </xsl:text>
@@ -517,7 +517,7 @@
<xsl:text>
 </xsl:text>
<xsl:element name="para">
- <xsl:apply-templates select="c:description/@*|c:description/node()" />
+ <xsl:apply-templates select="c:description/node()" />
</xsl:element>
<xsl:text>
 </xsl:text>
@@ -574,7 +574,7 @@
<xsl:text>
 </xsl:text>
<xsl:element name="para">
- <xsl:apply-templates select="c:description/@*|c:description/node()" />
+ <xsl:apply-templates select="c:description/node()" />
</xsl:element>
<xsl:text>
 </xsl:text>
commit 1bdabc9d46f493394b9f70a60934acd1b334475a
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Apr 24 16:37:05 2011 -0400
Clean up the schema a bit.
diff --git a/BOOK/schema/clfs/0.1/rng/clfs.rnc b/BOOK/schema/clfs/0.1/rng/clfs.rnc
index 94a76ce..b57c891 100644
--- a/BOOK/schema/clfs/0.1/rng/clfs.rnc
+++ b/BOOK/schema/clfs/0.1/rng/clfs.rnc
@@ -122,6 +122,30 @@ clfs.package.command =
(element c:literal { text } | text)+
}
+clfs.package.title =
+ element c:title {
+ xml.attrib.base,
+ text
+ }
+
+clfs.package.version =
+ element c:version {
+ xml.attrib.base,
+ text
+ }
+
+clfs.package.variant =
+ element c:variant {
+ xml.attrib.base,
+ text
+ }?
+
+clfs.package.description =
+ element c:description {
+ xml.attrib.base,
+ clfs.inline
+ }
+
# The Package
clfs.sect.package =
element c:package {
@@ -134,23 +158,11 @@ clfs.sect.package =
"true" | "false"
},
- element c:title {
- xml.attrib.base,
- text
- },
- element c:version {
- xml.attrib.base,
- text
- },
- element c:variant {
- xml.attrib.base,
- text
- }?,
- element c:description {
- xml.attrib.base,
- clfs.inline
- },
-
+ clfs.package.title,
+ clfs.package.version,
+ clfs.package.variant,
+ clfs.package.description,
+
element c:install {
(clfs.package.para |
clfs.package.command |
diff --git a/BOOK/schema/clfs/0.1/rng/clfs.rng b/BOOK/schema/clfs/0.1/rng/clfs.rng
index ed25cb9..f74aadf 100644
--- a/BOOK/schema/clfs/0.1/rng/clfs.rng
+++ b/BOOK/schema/clfs/0.1/rng/clfs.rng
@@ -197,6 +197,32 @@
</oneOrMore>
</element>
</define>
+ <define name="clfs.package.title">
+ <element name="c:title">
+ <ref name="xml.attrib.base"/>
+ <text/>
+ </element>
+ </define>
+ <define name="clfs.package.version">
+ <element name="c:version">
+ <ref name="xml.attrib.base"/>
+ <text/>
+ </element>
+ </define>
+ <define name="clfs.package.variant">
+ <optional>
+ <element name="c:variant">
+ <ref name="xml.attrib.base"/>
+ <text/>
+ </element>
+ </optional>
+ </define>
+ <define name="clfs.package.description">
+ <element name="c:description">
+ <ref name="xml.attrib.base"/>
+ <ref name="clfs.inline"/>
+ </element>
+ </define>
<!-- The Package -->
<define name="clfs.sect.package">
<element name="c:package">
@@ -211,24 +237,10 @@
<value>false</value>
</choice>
</attribute>
- <element name="c:title">
- <ref name="xml.attrib.base"/>
- <text/>
- </element>
- <element name="c:version">
- <ref name="xml.attrib.base"/>
- <text/>
- </element>
- <optional>
- <element name="c:variant">
- <ref name="xml.attrib.base"/>
- <text/>
- </element>
- </optional>
- <element name="c:description">
- <ref name="xml.attrib.base"/>
- <ref name="clfs.inline"/>
- </element>
+ <ref name="clfs.package.title"/>
+ <ref name="clfs.package.version"/>
+ <ref name="clfs.package.variant"/>
+ <ref name="clfs.package.description"/>
<optional>
<element name="c:install">
<oneOrMore>
commit d4c109d6dcb38b8b270b6ee6a4b1adb2e8ac83e3
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Apr 24 16:02:46 2011 -0400
Add xml:base to items that may be included in another page using an xi:include.
diff --git a/BOOK/schema/clfs/0.1/rng/clfs.rnc b/BOOK/schema/clfs/0.1/rng/clfs.rnc
index b911431..94a76ce 100644
--- a/BOOK/schema/clfs/0.1/rng/clfs.rnc
+++ b/BOOK/schema/clfs/0.1/rng/clfs.rnc
@@ -17,6 +17,16 @@ include "../../../docbook/4.5/rng/docbook.rnc" {
} | clfs.sect.package )
}
+# Common Attributes
+xml.attrib.base =
+ attribute xml:base {
+ text
+ }?
+xml.attrib.id =
+ attribute id {
+ text
+ }
+
# Extend the standard profiling attributes
local.effectivity.attrib &=
clfs.attrib.arch,
@@ -115,8 +125,8 @@ clfs.package.command =
# The Package
clfs.sect.package =
element c:package {
- attribute xml:base { text }?,
- attribute id { text },
+ xml.attrib.base,
+ xml.attrib.id,
clfs.attrib.arch,
clfs.attrib.bits,
clfs.attrib.multilib,
@@ -124,10 +134,22 @@ clfs.sect.package =
"true" | "false"
},
- element c:title { text },
- element c:version { text },
- element c:variant { text }?,
- element c:description { clfs.inline },
+ element c:title {
+ xml.attrib.base,
+ text
+ },
+ element c:version {
+ xml.attrib.base,
+ text
+ },
+ element c:variant {
+ xml.attrib.base,
+ text
+ }?,
+ element c:description {
+ xml.attrib.base,
+ clfs.inline
+ },
element c:install {
(clfs.package.para |
diff --git a/BOOK/schema/clfs/0.1/rng/clfs.rng b/BOOK/schema/clfs/0.1/rng/clfs.rng
index 1a08c35..ed25cb9 100644
--- a/BOOK/schema/clfs/0.1/rng/clfs.rng
+++ b/BOOK/schema/clfs/0.1/rng/clfs.rng
@@ -48,6 +48,15 @@
</choice>
</define>
</include>
+ <!-- Common Attributes -->
+ <define name="xml.attrib.base">
+ <optional>
+ <attribute name="xml:base"/>
+ </optional>
+ </define>
+ <define name="xml.attrib.id">
+ <attribute name="id"/>
+ </define>
<!-- Extend the standard profiling attributes -->
<define name="local.effectivity.attrib" combine="interleave">
<ref name="clfs.attrib.arch"/>
@@ -191,10 +200,8 @@
<!-- The Package -->
<define name="clfs.sect.package">
<element name="c:package">
- <optional>
- <attribute name="xml:base"/>
- </optional>
- <attribute name="id"/>
+ <ref name="xml.attrib.base"/>
+ <ref name="xml.attrib.id"/>
<ref name="clfs.attrib.arch"/>
<ref name="clfs.attrib.bits"/>
<ref name="clfs.attrib.multilib"/>
@@ -205,17 +212,21 @@
</choice>
</attribute>
<element name="c:title">
+ <ref name="xml.attrib.base"/>
<text/>
</element>
<element name="c:version">
+ <ref name="xml.attrib.base"/>
<text/>
</element>
<optional>
<element name="c:variant">
+ <ref name="xml.attrib.base"/>
<text/>
</element>
</optional>
<element name="c:description">
+ <ref name="xml.attrib.base"/>
<ref name="clfs.inline"/>
</element>
<optional>
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/common/bash.xml | 7 +-
BOOK/schema/clfs/0.1/rng/clfs.rnc | 67 ++++++++++++++++--
BOOK/schema/clfs/0.1/rng/clfs.rng | 79 +++++++++++++++++-----
BOOK/stylesheets/clfs-profile.xsl | 78 ++++++++++++++++++++--
BOOK/temp-system/common/bash.xml | 113 +++++++++++++-----------------
BOOK/temp-system/mips64-64-chapter.xml | 2 +-
BOOK/temp-system/mips64-chapter.xml | 2 +-
BOOK/temp-system/ppc64-chapter.xml | 2 +-
BOOK/temp-system/sparc64-64-chapter.xml | 2 +-
BOOK/temp-system/sparc64-chapter.xml | 2 +-
BOOK/temp-system/x86_64-64-chapter.xml | 2 +-
BOOK/temp-system/x86_64-chapter.xml | 2 +-
12 files changed, 252 insertions(+), 106 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list