[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.0.0-553-g686839b
git
git at cross-lfs.org
Thu Dec 12 11:19:40 PST 2013
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, master has been updated
via 686839b2795fdf7b4909119c5e2fce7501a97c2d (commit)
via 3693f5720b9e09a6cfc7da542c94e743a5355acb (commit)
from 5931c7f6068268cf411d0af00ce0f945bf52f7ef (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 686839b2795fdf7b4909119c5e2fce7501a97c2d
Author: William Harrington <kb0iic at berzerkula.org>
Date: Thu Dec 12 13:19:29 2013 -0600
Add screen tags around userinput test commands and remap userinput for test commands as remap="test".
diff --git a/BOOK/final-system/common/autoconf.xml b/BOOK/final-system/common/autoconf.xml
index 646adef..e9ed663 100644
--- a/BOOK/final-system/common/autoconf.xml
+++ b/BOOK/final-system/common/autoconf.xml
@@ -33,10 +33,13 @@
<screen os="d"><userinput>make</userinput></screen>
- <para os="e">To test the results, issue:
- <userinput>make check VERBOSE=yes</userinput>. 17 tests are skipped that use
- Automake and different GCC languages. For full test coverage, Autoconf can
- be re-tested after Automake has been installed.</para>
+ <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check VERBOSE=yes</userinput></screen>
+
+ <para os="e3">17 tests are skipped that use Automake and different GCC languages.
+ For full test coverage, Autoconf can be re-tested after Automake has been
+ installed.</para>
<para os="f">Install the package:</para>
diff --git a/BOOK/final-system/common/automake.xml b/BOOK/final-system/common/automake.xml
index fe2a53d..2c8b1fe 100644
--- a/BOOK/final-system/common/automake.xml
+++ b/BOOK/final-system/common/automake.xml
@@ -33,8 +33,9 @@
<screen os="d"><userinput>make</userinput></screen>
- <para os="e">To test the results, issue:
- <userinput>make check</userinput>.</para>
+ <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
<para os="f">Install the package:</para>
diff --git a/BOOK/final-system/common/bash.xml b/BOOK/final-system/common/bash.xml
index 349b97f..983ffb1 100644
--- a/BOOK/final-system/common/bash.xml
+++ b/BOOK/final-system/common/bash.xml
@@ -52,8 +52,9 @@
<screen os="e"><userinput>make</userinput></screen>
- <para os="f">To test the results, issue:
- <userinput>make tests</userinput>.</para>
+ <para os="f">To test the results, issue:</para>
+
+<screen os="f2"><userinput remap="test">make tests</userinput></screen>
<para os="g">Install the package:</para>
diff --git a/BOOK/final-system/common/bc.xml b/BOOK/final-system/common/bc.xml
index fb4bc23..56c0d2b 100644
--- a/BOOK/final-system/common/bc.xml
+++ b/BOOK/final-system/common/bc.xml
@@ -32,8 +32,9 @@
<screen os="d"><userinput>make</userinput></screen>
- <para os="e">To test the results, issue:
- <userinput>echo "quit" | ./bc/bc -l Test/checklib.b</userinput></para>
+ <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">echo "quit" | ./bc/bc -l Test/checklib.b</userinput></screen>
<para os="f">Install the package:</para>
diff --git a/BOOK/final-system/common/binutils.xml b/BOOK/final-system/common/binutils.xml
index 2b295ec..531939e 100644
--- a/BOOK/final-system/common/binutils.xml
+++ b/BOOK/final-system/common/binutils.xml
@@ -97,7 +97,7 @@ can get `Flex' from any GNU archive site.</computeroutput></screen>
<para os="p">Test the results:</para>
-<screen os="q"><userinput>make check</userinput></screen>
+<screen os="q"><userinput remap="test">make check</userinput></screen>
<para os="r">Install the package:</para>
diff --git a/BOOK/final-system/common/bison.xml b/BOOK/final-system/common/bison.xml
index 5b69a81..c70b912 100644
--- a/BOOK/final-system/common/bison.xml
+++ b/BOOK/final-system/common/bison.xml
@@ -37,8 +37,9 @@
<screen os="d"><userinput>make</userinput></screen>
- <para os="e">To test the results, issue:
- <userinput>make check</userinput>.</para>
+ <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
<para os="f">Install the package:</para>
diff --git a/BOOK/final-system/common/cloog.xml b/BOOK/final-system/common/cloog.xml
index 388ebc2..6a0343a 100644
--- a/BOOK/final-system/common/cloog.xml
+++ b/BOOK/final-system/common/cloog.xml
@@ -44,7 +44,7 @@ LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
<para os="f">Test the results:</para>
-<screen os="g"><userinput>make check</userinput></screen>
+<screen os="g"><userinput remap="test">make check</userinput></screen>
<para os="h">Install the package:</para>
diff --git a/BOOK/final-system/common/coreutils.xml b/BOOK/final-system/common/coreutils.xml
index c4d53af..47e0a43 100644
--- a/BOOK/final-system/common/coreutils.xml
+++ b/BOOK/final-system/common/coreutils.xml
@@ -66,24 +66,24 @@
the tests that are meant to be run as user
<systemitem class="username">root</systemitem>:</para>
-<screen os="i"><userinput>make NON_ROOT_USERNAME=dummy</userinput></screen>
+<screen os="i"><userinput remap="test">make NON_ROOT_USERNAME=dummy</userinput></screen>
<para os="j">The testsuite will now be run as the
<systemitem class="username">dummy</systemitem> user. Fix the permissions
for a few files to allow this:</para>
-<screen os="k"><userinput>chown -Rv dummy .</userinput></screen>
+<screen os="k"><userinput remap="test">chown -Rv dummy .</userinput></screen>
<para os="l">Then run the remainder of the tests as the
<systemitem class="username">dummy</systemitem> user:</para>
-<screen os="m"><userinput>su dummy -s /bin/bash \
+<screen os="m"><userinput remap="test">su dummy -s /bin/bash \
-c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes -k check || true"</userinput></screen>
<para os="n">When testing is complete, remove the
<systemitem class="username">dummy</systemitem> user and groups:</para>
-<screen os="o"><userinput>sed -i '/dummy/d' /etc/passwd /etc/group</userinput></screen>
+<screen os="o"><userinput remap="test">sed -i '/dummy/d' /etc/passwd /etc/group</userinput></screen>
<para os="p">Install the package:</para>
diff --git a/BOOK/final-system/common/diffutils.xml b/BOOK/final-system/common/diffutils.xml
index 2c289ea..3d5a36d 100644
--- a/BOOK/final-system/common/diffutils.xml
+++ b/BOOK/final-system/common/diffutils.xml
@@ -38,7 +38,9 @@
<screen os="d"><userinput>make</userinput></screen>
- <para os="e">To test the results, issue: <userinput>make check</userinput>.</para>
+ <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
<para os="f">Install the package:</para>
diff --git a/BOOK/final-system/common/e2fsprogs.xml b/BOOK/final-system/common/e2fsprogs.xml
index 9e0175e..00b8ff0 100644
--- a/BOOK/final-system/common/e2fsprogs.xml
+++ b/BOOK/final-system/common/e2fsprogs.xml
@@ -72,8 +72,9 @@ cd build</userinput></screen>
<screen os="g"><userinput>make</userinput></screen>
- <para os="h">To test the results, issue:
- <userinput>make check</userinput>.</para>
+ <para os="h">To test the results, issue:</para>
+
+<screen os="h2"><userinput remap="test">make check</userinput></screen>
<para os="i">Install the binaries, documentation and shared libraries:</para>
diff --git a/BOOK/final-system/common/eglibc.xml b/BOOK/final-system/common/eglibc.xml
index 494930b..11670b3 100644
--- a/BOOK/final-system/common/eglibc.xml
+++ b/BOOK/final-system/common/eglibc.xml
@@ -107,7 +107,7 @@ cd ../eglibc-build</userinput></screen>
<!-- items n,o,p no longer the master, use x86_64 which has no failures -->
-<screen os="n"><userinput>cp -v ../eglibc-&eglibc-version;/iconvdata/gconv-modules iconvdata
+<screen os="n"><userinput remap="test">cp -v ../eglibc-&eglibc-version;/iconvdata/gconv-modules iconvdata
make -k check 2>&1 | tee eglibc-check-log; grep Error eglibc-check-log</userinput></screen>
<para os="o">The EGLIBC test suite is highly dependent on certain functions of
diff --git a/BOOK/final-system/common/eudev.xml b/BOOK/final-system/common/eudev.xml
index a7b4af0..1871d81 100644
--- a/BOOK/final-system/common/eudev.xml
+++ b/BOOK/final-system/common/eudev.xml
@@ -38,7 +38,9 @@
<screen os="d"><userinput>make</userinput></screen>
- <para os="e">To test the results, issue: <userinput>make check</userinput>.</para>
+ <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
<para os="g">Install the package:</para>
diff --git a/BOOK/final-system/common/file.xml b/BOOK/final-system/common/file.xml
index 77b3b7e..e5aba3b 100644
--- a/BOOK/final-system/common/file.xml
+++ b/BOOK/final-system/common/file.xml
@@ -33,7 +33,9 @@
<screen os="d"><userinput>make</userinput></screen>
- <para os="e">This package does not come with a test suite.</para>
+ <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
<para os="f">Install the package:</para>
diff --git a/BOOK/final-system/common/findutils.xml b/BOOK/final-system/common/findutils.xml
index 9b44623..96682f3 100644
--- a/BOOK/final-system/common/findutils.xml
+++ b/BOOK/final-system/common/findutils.xml
@@ -50,8 +50,9 @@
<screen os="e"><userinput>make</userinput></screen>
- <para os="f">To test the results, issue:
- <userinput>make check</userinput>.</para>
+ <para os="f">To test the results, issue:</para>
+
+<screen os="f2"><userinput remap="test">make check</userinput></screen>
<para os="g">Install the package:</para>
diff --git a/BOOK/final-system/common/flex.xml b/BOOK/final-system/common/flex.xml
index f0067a9..89c185b 100644
--- a/BOOK/final-system/common/flex.xml
+++ b/BOOK/final-system/common/flex.xml
@@ -33,8 +33,9 @@
<screen os="d"><userinput>make</userinput></screen>
- <para os="e">To test the results, issue:
- <userinput>make check</userinput>.</para>
+ <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
<para os="f">Install the package:</para>
diff --git a/BOOK/final-system/common/gawk.xml b/BOOK/final-system/common/gawk.xml
index 5dbdc39..1725a5c 100644
--- a/BOOK/final-system/common/gawk.xml
+++ b/BOOK/final-system/common/gawk.xml
@@ -33,8 +33,9 @@
<screen os="d"><userinput>make</userinput></screen>
- <para os="e">To test the results, issue:
- <userinput>make check</userinput>.</para>
+ <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
<para os="f">Install the package:</para>
diff --git a/BOOK/final-system/common/gcc.xml b/BOOK/final-system/common/gcc.xml
index 282012d..68b8289 100644
--- a/BOOK/final-system/common/gcc.xml
+++ b/BOOK/final-system/common/gcc.xml
@@ -78,14 +78,14 @@ LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
<para os="m">Test the results, but do not stop at errors:</para>
-<screen os="n"><userinput>make -k check</userinput></screen>
+<screen os="n"><userinput remap="test">make -k check</userinput></screen>
<para os="o">The <parameter>-k</parameter> flag is used to make the test suite
run through to completion and not stop at the first failure. The GCC test
suite is very comprehensive and is almost guaranteed to generate a few
failures. To receive a summary of the test suite results, run:</para>
-<screen os="p"><userinput>../gcc-&gcc-version;/contrib/test_summary</userinput></screen>
+<screen os="p"><userinput remap="test">../gcc-&gcc-version;/contrib/test_summary</userinput></screen>
<para os="q">For only the summaries, pipe the output through
<userinput>grep -A7 Summ</userinput>.</para>
diff --git a/BOOK/final-system/common/gettext.xml b/BOOK/final-system/common/gettext.xml
index baf3c5f..8a1cfb5 100644
--- a/BOOK/final-system/common/gettext.xml
+++ b/BOOK/final-system/common/gettext.xml
@@ -35,7 +35,9 @@
<screen os="d"><userinput>make</userinput></screen>
- <para os="e">To test the results, issue: <userinput>make check</userinput>.</para>
+ <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
<para os="f">Install the package:</para>
diff --git a/BOOK/final-system/common/gmp.xml b/BOOK/final-system/common/gmp.xml
index cd575da..a505d9e 100644
--- a/BOOK/final-system/common/gmp.xml
+++ b/BOOK/final-system/common/gmp.xml
@@ -63,7 +63,7 @@ LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
<para os="f">Test the results:</para>
-<screen os="g"><userinput>make check</userinput></screen>
+<screen os="g"><userinput remap="test">make check</userinput></screen>
<para os="h">Install the package:</para>
diff --git a/BOOK/final-system/common/grep.xml b/BOOK/final-system/common/grep.xml
index 0a6671f..4f50aa2 100644
--- a/BOOK/final-system/common/grep.xml
+++ b/BOOK/final-system/common/grep.xml
@@ -33,8 +33,9 @@
<screen os="d"><userinput>make</userinput></screen>
- <para os="e">To test the results, issue:
- <userinput>make check</userinput>.</para>
+ <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
<para os="f">Install the package:</para>
diff --git a/BOOK/final-system/common/gzip.xml b/BOOK/final-system/common/gzip.xml
index a614aa7..fb5c48a 100644
--- a/BOOK/final-system/common/gzip.xml
+++ b/BOOK/final-system/common/gzip.xml
@@ -33,7 +33,9 @@
<screen os="d"><userinput>make</userinput></screen>
- <para os="e">To test the results, issue: <command>make check</command>.</para>
+ <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
<para os="f">Install the package:</para>
diff --git a/BOOK/final-system/common/isl.xml b/BOOK/final-system/common/isl.xml
index fb63a5e..425b109 100644
--- a/BOOK/final-system/common/isl.xml
+++ b/BOOK/final-system/common/isl.xml
@@ -42,7 +42,7 @@ LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
<para os="f">Test the results:</para>
-<screen os="g"><userinput>make check</userinput></screen>
+<screen os="g"><userinput remap="test">make check</userinput></screen>
<para os="h">Install the package:</para>
diff --git a/BOOK/final-system/common/kmod.xml b/BOOK/final-system/common/kmod.xml
index 39fb4f5..517973d 100644
--- a/BOOK/final-system/common/kmod.xml
+++ b/BOOK/final-system/common/kmod.xml
@@ -57,7 +57,9 @@
<screen os="e"><userinput>make</userinput></screen>
- <para os="f">To test the results, issue: <userinput>make check</userinput></para>
+ <para os="f">To test the results, issue:</para>
+
+<screen os="f2"><userinput remap="test">make check</userinput></screen>
<para os="g">Install the package:</para>
diff --git a/BOOK/final-system/common/libtool.xml b/BOOK/final-system/common/libtool.xml
index b8cc5af..c3d7ef1 100644
--- a/BOOK/final-system/common/libtool.xml
+++ b/BOOK/final-system/common/libtool.xml
@@ -34,8 +34,9 @@
<screen os="d"><userinput>make</userinput></screen>
- <para os="e">To test the results, issue:
- <userinput>make check</userinput>.</para>
+ <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
<para os="f">Install the package:</para>
diff --git a/BOOK/final-system/common/m4.xml b/BOOK/final-system/common/m4.xml
index 62ae241..ea92a21 100644
--- a/BOOK/final-system/common/m4.xml
+++ b/BOOK/final-system/common/m4.xml
@@ -32,8 +32,9 @@
<screen os="d"><userinput>make</userinput></screen>
- <para os="e">To test the results, issue:
- <userinput>make check</userinput>.</para>
+ <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
<para os="f">Install the package:</para>
diff --git a/BOOK/final-system/common/make.xml b/BOOK/final-system/common/make.xml
index 3090bed..1224c03 100644
--- a/BOOK/final-system/common/make.xml
+++ b/BOOK/final-system/common/make.xml
@@ -32,8 +32,9 @@
<screen os="d"><userinput>make</userinput></screen>
- <para os="e">To test the results, issue:
- <userinput>make check</userinput>.</para>
+ <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
<para os="f">Install the package:</para>
diff --git a/BOOK/final-system/common/mpc.xml b/BOOK/final-system/common/mpc.xml
index a1cb5bd..f70f42b 100644
--- a/BOOK/final-system/common/mpc.xml
+++ b/BOOK/final-system/common/mpc.xml
@@ -42,7 +42,7 @@ LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
<para os="f">Test the results:</para>
-<screen os="g"><userinput>make check</userinput></screen>
+<screen os="g"><userinput remap="test">make check</userinput></screen>
<para os="h">Install the package:</para>
diff --git a/BOOK/final-system/common/mpfr.xml b/BOOK/final-system/common/mpfr.xml
index 85acd77..395d428 100644
--- a/BOOK/final-system/common/mpfr.xml
+++ b/BOOK/final-system/common/mpfr.xml
@@ -47,7 +47,7 @@ LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
<para os="f">Test the results:</para>
-<screen os="g"><userinput>make check</userinput></screen>
+<screen os="g"><userinput remap="test">make check</userinput></screen>
<para os="h">Install the package:</para>
diff --git a/BOOK/final-system/common/patch.xml b/BOOK/final-system/common/patch.xml
index 41617e4..b76f71e 100644
--- a/BOOK/final-system/common/patch.xml
+++ b/BOOK/final-system/common/patch.xml
@@ -34,7 +34,9 @@
<screen os="d"><userinput>make</userinput></screen>
- <para os="e">To test the results, issue: <userinput>make check</userinput>.</para>
+ <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
<para os="f">Install the package:</para>
@@ -76,3 +78,4 @@
</sect2>
</sect1>
+
diff --git a/BOOK/final-system/common/perl.xml b/BOOK/final-system/common/perl.xml
index 137cd9d..e9d83e2 100644
--- a/BOOK/final-system/common/perl.xml
+++ b/BOOK/final-system/common/perl.xml
@@ -38,15 +38,15 @@
<para>If you are following the boot method you will need to enable the
loopback device as well as set a hostname for some of the tests:</para>
- <screen><userinput>ip link set lo up
+ <screen os="a01"><userinput remap="test">ip link set lo up
hostname clfs</userinput></screen>
</note>
- <para os="a01">Before starting to configure, create a basic
+ <para os="a02">Before starting to configure, create a basic
<filename>/etc/hosts</filename> file which will be referenced by one
of Perl's configuration files as well as used by the testsuite:</para>
-<screen os="a02"><userinput>echo "127.0.0.1 localhost $(hostname)" > /etc/hosts</userinput></screen>
+<screen os="a03"><userinput remap="test">echo "127.0.0.1 localhost $(hostname)" > /etc/hosts</userinput></screen>
<para os="a">To have full control over the way Perl is set up, you can
run the interactive <command>Configure</command> script and hand-pick
@@ -100,8 +100,9 @@ hostname clfs</userinput></screen>
<screen os="e"><userinput>make</userinput></screen>
- <para os="h">To test the results, issue:
- <userinput>make test</userinput>.</para>
+ <para os="h">To test the results, issue:</para>
+
+<screen os="h2"><userinput remap="test">make test</userinput></screen>
<para os="j">Install the package:</para>
diff --git a/BOOK/final-system/common/pkg-config-lite.xml b/BOOK/final-system/common/pkg-config-lite.xml
index fa9fb74..e2a4e0e 100644
--- a/BOOK/final-system/common/pkg-config-lite.xml
+++ b/BOOK/final-system/common/pkg-config-lite.xml
@@ -33,8 +33,9 @@
<screen os="d"><userinput>make</userinput></screen>
- <para os="e">To test the results, issue:
- <userinput>make check</userinput>.</para>
+ <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
<para os="f">Install the package:</para>
diff --git a/BOOK/final-system/common/rsyslog.xml b/BOOK/final-system/common/rsyslog.xml
index 837e26b..04ff348 100644
--- a/BOOK/final-system/common/rsyslog.xml
+++ b/BOOK/final-system/common/rsyslog.xml
@@ -33,7 +33,9 @@
<screen os="d"><userinput>make</userinput></screen>
- <para os="e">To test the results, issue: <userinput>make check</userinput>.</para>
+ <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
<para os="f">Install the package:</para>
diff --git a/BOOK/final-system/common/sed.xml b/BOOK/final-system/common/sed.xml
index f2875df..1d4c0f7 100644
--- a/BOOK/final-system/common/sed.xml
+++ b/BOOK/final-system/common/sed.xml
@@ -36,8 +36,9 @@
<screen os="f"><userinput>make html</userinput></screen>
- <para os="g">To test the results, issue:
- <userinput>make check</userinput>.</para>
+ <para os="g">To test the results, issue:</para>
+
+<screen os="g2"><userinput remap="test">make check</userinput></screen>
<para os="h">Install the package:</para>
diff --git a/BOOK/final-system/common/tar.xml b/BOOK/final-system/common/tar.xml
index 4212b00..e49137e 100644
--- a/BOOK/final-system/common/tar.xml
+++ b/BOOK/final-system/common/tar.xml
@@ -38,8 +38,9 @@
<screen os="d"><userinput>make</userinput></screen>
- <para os="e">To test the results, issue:
- <userinput>make check</userinput>.</para>
+ <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
<para os="f">Install the package:</para>
diff --git a/BOOK/final-system/common/texinfo.xml b/BOOK/final-system/common/texinfo.xml
index 0898fee..a1cec8e 100644
--- a/BOOK/final-system/common/texinfo.xml
+++ b/BOOK/final-system/common/texinfo.xml
@@ -33,8 +33,9 @@
<screen os="d"><userinput>make</userinput></screen>
- <para os="e">To test the results, issue:
- <userinput>make check</userinput>.</para>
+ <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
<para os="f">Install the package:</para>
diff --git a/BOOK/final-system/common/util-linux.xml b/BOOK/final-system/common/util-linux.xml
index 659d7ba..5201cc3 100644
--- a/BOOK/final-system/common/util-linux.xml
+++ b/BOOK/final-system/common/util-linux.xml
@@ -64,12 +64,14 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
<para os="dummy1">Create two <systemitem class="groupname">dummy</systemitem> groups and a <systemitem class="username">dummy</systemitem> user to be used during Util-linux and Coreutils test suites:</para>
-<screen os="dummy2"><userinput>echo "dummy1:x:1000:" >> /etc/group
+<screen os="dummy2"><userinput remap="test">echo "dummy1:x:1000:" >> /etc/group
echo "dummy2:x:1001:dummy" >> /etc/group
echo "dummy:x:1000:1000::/root:/bin/bash" >> /etc/passwd</userinput></screen>
- <para os="f">To test the results, issue:
- <userinput>chown -Rv dummy . && su dummy -s /bin/bash -c "PATH=$PATH make -k check"</userinput></para>
+ <para os="f">To test the results, issue:</para>
+
+<screen os="f2"><userinput remap="test">chown -Rv dummy . &&
+su dummy -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
<para os="g">Install the package:</para>
diff --git a/BOOK/final-system/common/vim.xml b/BOOK/final-system/common/vim.xml
index 8c6a782..9a7a7e8 100644
--- a/BOOK/final-system/common/vim.xml
+++ b/BOOK/final-system/common/vim.xml
@@ -70,8 +70,11 @@
<screen os="h"><userinput>make</userinput></screen>
- <para os="i">To test the results, issue: <userinput>make test</userinput>.
- However, this test suite outputs a lot of binary data to the
+ <para os="i">To test the results, issue:</para>
+
+<screen os="i2"><userinput remap="test">make test</userinput></screen>
+
+ <para os="i3">However, this test suite outputs a lot of binary data to the
screen, which can cause issues with the settings of the current terminal.
This can be resolved by redirecting the output to a log file.</para>
diff --git a/BOOK/final-system/common/xz.xml b/BOOK/final-system/common/xz.xml
index 26bb53d..bb8f6fc 100644
--- a/BOOK/final-system/common/xz.xml
+++ b/BOOK/final-system/common/xz.xml
@@ -35,9 +35,9 @@
<screen os="d"><userinput>make</userinput></screen>
- <para os="e">To test the results, issue:
- <userinput>make check</userinput>.</para>
+ <para os="e">To test the results, issue:</para>
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
<para os="f">Install the programs:</para>
diff --git a/BOOK/final-system/common/zlib.xml b/BOOK/final-system/common/zlib.xml
index d8f5cb2..0967c55 100644
--- a/BOOK/final-system/common/zlib.xml
+++ b/BOOK/final-system/common/zlib.xml
@@ -36,8 +36,9 @@ LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
<screen os="d"><userinput>make</userinput></screen>
- <para os="e">To test the results, issue:
- <userinput>make check</userinput>.</para>
+ <para os="e">To test the results, issue:</para>
+
+<screen os="e2" ><userinput remap="test">make check</userinput></screen>
<para os="f">Install the package:</para>
diff --git a/BOOK/final-system/mips64/pkg-config-lite.xml b/BOOK/final-system/mips64/pkg-config-lite.xml
index 07813ab..24af78f 100644
--- a/BOOK/final-system/mips64/pkg-config-lite.xml
+++ b/BOOK/final-system/mips64/pkg-config-lite.xml
@@ -43,6 +43,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/pkg-config-lite.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/pkg-config-lite.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/autoconf.xml b/BOOK/final-system/multilib/autoconf.xml
index bffc962..600d94b 100644
--- a/BOOK/final-system/multilib/autoconf.xml
+++ b/BOOK/final-system/multilib/autoconf.xml
@@ -41,6 +41,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/autoconf.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/autoconf.xml"
+ xpointer="xpointer(//*[@os='e3'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/autoconf.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/automake.xml b/BOOK/final-system/multilib/automake.xml
index 9c89f21..5bc0000 100644
--- a/BOOK/final-system/multilib/automake.xml
+++ b/BOOK/final-system/multilib/automake.xml
@@ -40,6 +40,10 @@
xpointer="xpointer(//*[@os='e'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/automake.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/autoconf.xml"
xpointer="xpointer(//*[@os='f'])"/>
diff --git a/BOOK/final-system/multilib/bash.xml b/BOOK/final-system/multilib/bash.xml
index c644e0a..8c0b98b 100644
--- a/BOOK/final-system/multilib/bash.xml
+++ b/BOOK/final-system/multilib/bash.xml
@@ -60,6 +60,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/bash.xml"
+ xpointer="xpointer(//*[@os='f2'])"/>
+
+ <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"
diff --git a/BOOK/final-system/multilib/bc.xml b/BOOK/final-system/multilib/bc.xml
index 20b378a..12a14ed 100644
--- a/BOOK/final-system/multilib/bc.xml
+++ b/BOOK/final-system/multilib/bc.xml
@@ -41,6 +41,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/bc.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/bc.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/bison-64bit.xml b/BOOK/final-system/multilib/bison-64bit.xml
index 8b6a497..7d05b00 100644
--- a/BOOK/final-system/multilib/bison-64bit.xml
+++ b/BOOK/final-system/multilib/bison-64bit.xml
@@ -49,6 +49,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/bison.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/bison.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/bison-n32.xml b/BOOK/final-system/multilib/bison-n32.xml
index d48d82c..66fb9bb 100644
--- a/BOOK/final-system/multilib/bison-n32.xml
+++ b/BOOK/final-system/multilib/bison-n32.xml
@@ -50,6 +50,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/bison.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/bison.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/bison.xml b/BOOK/final-system/multilib/bison.xml
index 793a477..ff9c4c0 100644
--- a/BOOK/final-system/multilib/bison.xml
+++ b/BOOK/final-system/multilib/bison.xml
@@ -50,6 +50,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/bison.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/bison.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/diffutils.xml b/BOOK/final-system/multilib/diffutils.xml
index f283b2c..0613b03 100644
--- a/BOOK/final-system/multilib/diffutils.xml
+++ b/BOOK/final-system/multilib/diffutils.xml
@@ -49,6 +49,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/diffutils.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/diffutils.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/e2fsprogs-64bit.xml b/BOOK/final-system/multilib/e2fsprogs-64bit.xml
index 0416ca8..09b3a21 100644
--- a/BOOK/final-system/multilib/e2fsprogs-64bit.xml
+++ b/BOOK/final-system/multilib/e2fsprogs-64bit.xml
@@ -62,6 +62,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/e2fsprogs.xml"
+ xpointer="xpointer(//*[@os='h2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/e2fsprogs.xml"
xpointer="xpointer(//*[@os='i'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/eudev-64bit.xml b/BOOK/final-system/multilib/eudev-64bit.xml
index 1a54f58..caed927 100644
--- a/BOOK/final-system/multilib/eudev-64bit.xml
+++ b/BOOK/final-system/multilib/eudev-64bit.xml
@@ -47,6 +47,10 @@ CC="gcc ${BUILD64}" ./configure --prefix=/usr --sysconfdir=/etc \
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/eudev.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eudev.xml"
xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/eudev-n32.xml b/BOOK/final-system/multilib/eudev-n32.xml
index d7f2815..67b6b6d 100644
--- a/BOOK/final-system/multilib/eudev-n32.xml
+++ b/BOOK/final-system/multilib/eudev-n32.xml
@@ -48,6 +48,10 @@ CC="gcc ${BUILDN32}" ./configure --prefix=/usr --sysconfdir=/etc \
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/eudev.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eudev.xml"
xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/eudev.xml b/BOOK/final-system/multilib/eudev.xml
index 593646f..8558a5a 100644
--- a/BOOK/final-system/multilib/eudev.xml
+++ b/BOOK/final-system/multilib/eudev.xml
@@ -47,6 +47,10 @@ CC="gcc ${BUILD32}" ./configure --prefix=/usr --sysconfdir=/etc \
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/eudev.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eudev.xml"
xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/file-64bit.xml b/BOOK/final-system/multilib/file-64bit.xml
index 1a9e9e8..b0f4388 100644
--- a/BOOK/final-system/multilib/file-64bit.xml
+++ b/BOOK/final-system/multilib/file-64bit.xml
@@ -42,6 +42,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="file.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="file.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/file-n32.xml b/BOOK/final-system/multilib/file-n32.xml
index 396cf3c..3ad37cc 100644
--- a/BOOK/final-system/multilib/file-n32.xml
+++ b/BOOK/final-system/multilib/file-n32.xml
@@ -41,6 +41,10 @@
href="file.xml"
xpointer="xpointer(//*[@os='e'])"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="file.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="file.xml"
xpointer="xpointer(//*[@os='f'])"/>
diff --git a/BOOK/final-system/multilib/file.xml b/BOOK/final-system/multilib/file.xml
index e432ad5..62ce3e2 100644
--- a/BOOK/final-system/multilib/file.xml
+++ b/BOOK/final-system/multilib/file.xml
@@ -42,6 +42,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/file.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/file.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/findutils.xml b/BOOK/final-system/multilib/findutils.xml
index f656065..3e32652 100644
--- a/BOOK/final-system/multilib/findutils.xml
+++ b/BOOK/final-system/multilib/findutils.xml
@@ -56,6 +56,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/findutils.xml"
+ xpointer="xpointer(//*[@os='f2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/findutils.xml"
xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/flex-64bit.xml b/BOOK/final-system/multilib/flex-64bit.xml
index c3002c6..5a1c673 100644
--- a/BOOK/final-system/multilib/flex-64bit.xml
+++ b/BOOK/final-system/multilib/flex-64bit.xml
@@ -41,6 +41,10 @@
xpointer="xpointer(//*[@os='e'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/flex.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="flex.xml"
xpointer="xpointer(//*[@os='f'])"/>
diff --git a/BOOK/final-system/multilib/gawk.xml b/BOOK/final-system/multilib/gawk.xml
index 12cf9c6..5f4d4d6 100644
--- a/BOOK/final-system/multilib/gawk.xml
+++ b/BOOK/final-system/multilib/gawk.xml
@@ -42,6 +42,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/gawk.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/gawk.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/gettext-64bit.xml b/BOOK/final-system/multilib/gettext-64bit.xml
index c4240b0..0355286 100644
--- a/BOOK/final-system/multilib/gettext-64bit.xml
+++ b/BOOK/final-system/multilib/gettext-64bit.xml
@@ -42,6 +42,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/gettext.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/gettext.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/gettext-n32.xml b/BOOK/final-system/multilib/gettext-n32.xml
index 82ad33f..9e64156 100644
--- a/BOOK/final-system/multilib/gettext-n32.xml
+++ b/BOOK/final-system/multilib/gettext-n32.xml
@@ -43,6 +43,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/gettext.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/gettext.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/gettext.xml b/BOOK/final-system/multilib/gettext.xml
index b16baf9..a965ff7 100644
--- a/BOOK/final-system/multilib/gettext.xml
+++ b/BOOK/final-system/multilib/gettext.xml
@@ -41,6 +41,10 @@
href="../common/gettext.xml"
xpointer="xpointer(//*[@os='e'])"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/gettext.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/gettext.xml"
xpointer="xpointer(//*[@os='f'])"/>
diff --git a/BOOK/final-system/multilib/grep.xml b/BOOK/final-system/multilib/grep.xml
index 67a6125..adf8565 100644
--- a/BOOK/final-system/multilib/grep.xml
+++ b/BOOK/final-system/multilib/grep.xml
@@ -42,6 +42,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/grep.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/grep.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/gzip.xml b/BOOK/final-system/multilib/gzip.xml
index e91ac3e..77db18b 100644
--- a/BOOK/final-system/multilib/gzip.xml
+++ b/BOOK/final-system/multilib/gzip.xml
@@ -41,6 +41,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/gzip.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/gzip.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/kmod-64bit.xml b/BOOK/final-system/multilib/kmod-64bit.xml
index 7f0c4c5..2072018 100644
--- a/BOOK/final-system/multilib/kmod-64bit.xml
+++ b/BOOK/final-system/multilib/kmod-64bit.xml
@@ -49,6 +49,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/kmod.xml"
+ xpointer="xpointer(//*[@os='f2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/kmod.xml"
xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/kmod-n32.xml b/BOOK/final-system/multilib/kmod-n32.xml
index eb9bb57..c615ab1 100644
--- a/BOOK/final-system/multilib/kmod-n32.xml
+++ b/BOOK/final-system/multilib/kmod-n32.xml
@@ -50,6 +50,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/kmod.xml"
+ xpointer="xpointer(//*[@os='f2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/kmod.xml"
xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/kmod.xml b/BOOK/final-system/multilib/kmod.xml
index d06f93a..bc4eee8 100644
--- a/BOOK/final-system/multilib/kmod.xml
+++ b/BOOK/final-system/multilib/kmod.xml
@@ -50,6 +50,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/kmod.xml"
+ xpointer="xpointer(//*[@os='f2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/kmod.xml"
xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/libtool-64bit.xml b/BOOK/final-system/multilib/libtool-64bit.xml
index cd8f4b1..6e2f2c2 100644
--- a/BOOK/final-system/multilib/libtool-64bit.xml
+++ b/BOOK/final-system/multilib/libtool-64bit.xml
@@ -48,6 +48,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/libtool.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/libtool.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/m4.xml b/BOOK/final-system/multilib/m4.xml
index 73c5116..b0976af 100644
--- a/BOOK/final-system/multilib/m4.xml
+++ b/BOOK/final-system/multilib/m4.xml
@@ -41,6 +41,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/m4.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/m4.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/make.xml b/BOOK/final-system/multilib/make.xml
index 8f27d34..09953e1 100644
--- a/BOOK/final-system/multilib/make.xml
+++ b/BOOK/final-system/multilib/make.xml
@@ -41,6 +41,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/make.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/make.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/patch.xml b/BOOK/final-system/multilib/patch.xml
index f2d687f..dcb9321 100644
--- a/BOOK/final-system/multilib/patch.xml
+++ b/BOOK/final-system/multilib/patch.xml
@@ -41,6 +41,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/patch.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/patch.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/perl-64bit.xml b/BOOK/final-system/multilib/perl-64bit.xml
index b2f048d..d082280 100644
--- a/BOOK/final-system/multilib/perl-64bit.xml
+++ b/BOOK/final-system/multilib/perl-64bit.xml
@@ -101,6 +101,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/perl.xml"
+ xpointer="xpointer(//*[@os='h2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/perl.xml"
xpointer="xpointer(//*[@os='j'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/perl-n32.xml b/BOOK/final-system/multilib/perl-n32.xml
index f8b4c69..c7ddc98 100644
--- a/BOOK/final-system/multilib/perl-n32.xml
+++ b/BOOK/final-system/multilib/perl-n32.xml
@@ -104,6 +104,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/perl.xml"
+ xpointer="xpointer(//*[@os='h2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/perl.xml"
xpointer="xpointer(//*[@os='j'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/perl.xml b/BOOK/final-system/multilib/perl.xml
index c1b421a..f629c27 100644
--- a/BOOK/final-system/multilib/perl.xml
+++ b/BOOK/final-system/multilib/perl.xml
@@ -44,6 +44,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/perl.xml"
+ xpointer="xpointer(//*[@os='a03'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/perl.xml"
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>./configure.gnu --prefix=/usr \
@@ -72,6 +76,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/perl.xml"
+ xpointer="xpointer(//*[@os='h2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/perl.xml"
xpointer="xpointer(//*[@os='j'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/pkg-config-lite.xml b/BOOK/final-system/multilib/pkg-config-lite.xml
index 01363b6..fe8622c 100644
--- a/BOOK/final-system/multilib/pkg-config-lite.xml
+++ b/BOOK/final-system/multilib/pkg-config-lite.xml
@@ -42,6 +42,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/pkg-config-lite.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/pkg-config-lite.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/rsyslog.xml b/BOOK/final-system/multilib/rsyslog.xml
index 057df73..c6f338b 100644
--- a/BOOK/final-system/multilib/rsyslog.xml
+++ b/BOOK/final-system/multilib/rsyslog.xml
@@ -42,6 +42,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/rsyslog.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/rsyslog.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/sed.xml b/BOOK/final-system/multilib/sed.xml
index aaf05d0..ab685dd 100644
--- a/BOOK/final-system/multilib/sed.xml
+++ b/BOOK/final-system/multilib/sed.xml
@@ -50,6 +50,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/sed.xml"
+ xpointer="xpointer(//*[@os='g2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/sed.xml"
xpointer="xpointer(//*[@os='h'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/tar.xml b/BOOK/final-system/multilib/tar.xml
index 88c991c..e178cd6 100644
--- a/BOOK/final-system/multilib/tar.xml
+++ b/BOOK/final-system/multilib/tar.xml
@@ -51,6 +51,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/tar.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/tar.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/texinfo.xml b/BOOK/final-system/multilib/texinfo.xml
index 94b0ae1..7c400d0 100644
--- a/BOOK/final-system/multilib/texinfo.xml
+++ b/BOOK/final-system/multilib/texinfo.xml
@@ -41,6 +41,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/texinfo.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/texinfo.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/util-linux-64bit.xml b/BOOK/final-system/multilib/util-linux-64bit.xml
index d517672..62dac46 100644
--- a/BOOK/final-system/multilib/util-linux-64bit.xml
+++ b/BOOK/final-system/multilib/util-linux-64bit.xml
@@ -50,6 +50,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/util-linux.xml"
+ xpointer="xpointer(//*[@os='f2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/util-linux.xml"
xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/util-linux-n32.xml b/BOOK/final-system/multilib/util-linux-n32.xml
index c566340..212714f 100644
--- a/BOOK/final-system/multilib/util-linux-n32.xml
+++ b/BOOK/final-system/multilib/util-linux-n32.xml
@@ -47,6 +47,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/util-linux.xml"
+ xpointer="xpointer(//*[@os='f2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/util-linux.xml"
xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/util-linux.xml b/BOOK/final-system/multilib/util-linux.xml
index 6aa7bcc..9153e42 100644
--- a/BOOK/final-system/multilib/util-linux.xml
+++ b/BOOK/final-system/multilib/util-linux.xml
@@ -55,6 +55,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/util-linux.xml"
+ xpointer="xpointer(//*[@os='f2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/util-linux.xml"
xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/vim.xml b/BOOK/final-system/multilib/vim.xml
index 156541a..6cc7c32 100644
--- a/BOOK/final-system/multilib/vim.xml
+++ b/BOOK/final-system/multilib/vim.xml
@@ -67,6 +67,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/vim.xml"
+ xpointer="xpointer(//*[@os='i2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/vim.xml"
+ xpointer="xpointer(//*[@os='i3'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/vim.xml"
xpointer="xpointer(//*[@os='j'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/xz-64bit.xml b/BOOK/final-system/multilib/xz-64bit.xml
index 91655e8..38f4bf8 100644
--- a/BOOK/final-system/multilib/xz-64bit.xml
+++ b/BOOK/final-system/multilib/xz-64bit.xml
@@ -41,6 +41,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="xz.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="xz.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/xz-n32.xml b/BOOK/final-system/multilib/xz-n32.xml
index 22cdcf4..b7497d9 100644
--- a/BOOK/final-system/multilib/xz-n32.xml
+++ b/BOOK/final-system/multilib/xz-n32.xml
@@ -42,6 +42,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="xz.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="xz.xml"
xpointer="xpointer(//*[@os='f'])"/>
<screen os="g"><userinput>make install</userinput></screen>
diff --git a/BOOK/final-system/multilib/xz.xml b/BOOK/final-system/multilib/xz.xml
index 84fb1c3..60008e1 100644
--- a/BOOK/final-system/multilib/xz.xml
+++ b/BOOK/final-system/multilib/xz.xml
@@ -42,6 +42,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/xz.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/xz.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/zlib-64bit.xml b/BOOK/final-system/multilib/zlib-64bit.xml
index c2190f0..ec84a9c 100644
--- a/BOOK/final-system/multilib/zlib-64bit.xml
+++ b/BOOK/final-system/multilib/zlib-64bit.xml
@@ -44,6 +44,10 @@ LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="zlib.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="zlib.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/zlib-n32.xml b/BOOK/final-system/multilib/zlib-n32.xml
index 44b2090..16b0fce 100644
--- a/BOOK/final-system/multilib/zlib-n32.xml
+++ b/BOOK/final-system/multilib/zlib-n32.xml
@@ -45,6 +45,10 @@ LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="zlib.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="zlib.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/zlib.xml b/BOOK/final-system/multilib/zlib.xml
index 93fdd78..195d4a7 100644
--- a/BOOK/final-system/multilib/zlib.xml
+++ b/BOOK/final-system/multilib/zlib.xml
@@ -45,6 +45,10 @@ LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/zlib.xml"
+ xpointer="xpointer(//*[@os='e2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/zlib.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/x86/grub.xml b/BOOK/final-system/x86/grub.xml
index cfd6984..a9d6494 100644
--- a/BOOK/final-system/x86/grub.xml
+++ b/BOOK/final-system/x86/grub.xml
@@ -51,8 +51,9 @@
<screen os="d"><userinput>make</userinput></screen>
- <para os="e">To test GRUB you must have QEMU installed and then, issue:
- <userinput>make check</userinput>.</para>
+ <para os="e">To test GRUB you must have QEMU installed and then, issue:</para>
+
+<screen os="d2"><userinput remap="test">make check</userinput></screen>
<para os="f">Install the package:</para>
commit 3693f5720b9e09a6cfc7da542c94e743a5355acb
Author: William Harrington <kb0iic at berzerkula.org>
Date: Thu Dec 12 13:17:35 2013 -0600
Update date.
diff --git a/BOOK/general.ent b/BOOK/general.ent
index 72a4d84..69e4d90 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "12"> <!-- Use two digits -->
<!ENTITY month_name "December">
-<!ENTITY day "08"> <!-- Use two digits -->
+<!ENTITY day "12"> <!-- Use two digits -->
<!ENTITY year "2013"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/common/autoconf.xml | 11 +++++++----
BOOK/final-system/common/automake.xml | 5 +++--
BOOK/final-system/common/bash.xml | 5 +++--
BOOK/final-system/common/bc.xml | 5 +++--
BOOK/final-system/common/binutils.xml | 2 +-
BOOK/final-system/common/bison.xml | 5 +++--
BOOK/final-system/common/cloog.xml | 2 +-
BOOK/final-system/common/coreutils.xml | 8 ++++----
BOOK/final-system/common/diffutils.xml | 4 +++-
BOOK/final-system/common/e2fsprogs.xml | 5 +++--
BOOK/final-system/common/eglibc.xml | 2 +-
BOOK/final-system/common/eudev.xml | 4 +++-
BOOK/final-system/common/file.xml | 4 +++-
BOOK/final-system/common/findutils.xml | 5 +++--
BOOK/final-system/common/flex.xml | 5 +++--
BOOK/final-system/common/gawk.xml | 5 +++--
BOOK/final-system/common/gcc.xml | 4 ++--
BOOK/final-system/common/gettext.xml | 4 +++-
BOOK/final-system/common/gmp.xml | 2 +-
BOOK/final-system/common/grep.xml | 5 +++--
BOOK/final-system/common/gzip.xml | 4 +++-
BOOK/final-system/common/isl.xml | 2 +-
BOOK/final-system/common/kmod.xml | 4 +++-
BOOK/final-system/common/libtool.xml | 5 +++--
BOOK/final-system/common/m4.xml | 5 +++--
BOOK/final-system/common/make.xml | 5 +++--
BOOK/final-system/common/mpc.xml | 2 +-
BOOK/final-system/common/mpfr.xml | 2 +-
BOOK/final-system/common/patch.xml | 5 ++++-
BOOK/final-system/common/perl.xml | 11 ++++++-----
BOOK/final-system/common/pkg-config-lite.xml | 5 +++--
BOOK/final-system/common/rsyslog.xml | 4 +++-
BOOK/final-system/common/sed.xml | 5 +++--
BOOK/final-system/common/tar.xml | 5 +++--
BOOK/final-system/common/texinfo.xml | 5 +++--
BOOK/final-system/common/util-linux.xml | 8 +++++---
BOOK/final-system/common/vim.xml | 7 +++++--
BOOK/final-system/common/xz.xml | 4 ++--
BOOK/final-system/common/zlib.xml | 5 +++--
BOOK/final-system/mips64/pkg-config-lite.xml | 4 ++++
BOOK/final-system/multilib/autoconf.xml | 8 ++++++++
BOOK/final-system/multilib/automake.xml | 4 ++++
BOOK/final-system/multilib/bash.xml | 4 ++++
BOOK/final-system/multilib/bc.xml | 4 ++++
BOOK/final-system/multilib/bison-64bit.xml | 4 ++++
BOOK/final-system/multilib/bison-n32.xml | 4 ++++
BOOK/final-system/multilib/bison.xml | 4 ++++
BOOK/final-system/multilib/diffutils.xml | 4 ++++
BOOK/final-system/multilib/e2fsprogs-64bit.xml | 4 ++++
BOOK/final-system/multilib/eudev-64bit.xml | 4 ++++
BOOK/final-system/multilib/eudev-n32.xml | 4 ++++
BOOK/final-system/multilib/eudev.xml | 4 ++++
BOOK/final-system/multilib/file-64bit.xml | 4 ++++
BOOK/final-system/multilib/file-n32.xml | 4 ++++
BOOK/final-system/multilib/file.xml | 4 ++++
BOOK/final-system/multilib/findutils.xml | 4 ++++
BOOK/final-system/multilib/flex-64bit.xml | 4 ++++
BOOK/final-system/multilib/gawk.xml | 4 ++++
BOOK/final-system/multilib/gettext-64bit.xml | 4 ++++
BOOK/final-system/multilib/gettext-n32.xml | 4 ++++
BOOK/final-system/multilib/gettext.xml | 4 ++++
BOOK/final-system/multilib/grep.xml | 4 ++++
BOOK/final-system/multilib/gzip.xml | 4 ++++
BOOK/final-system/multilib/kmod-64bit.xml | 4 ++++
BOOK/final-system/multilib/kmod-n32.xml | 4 ++++
BOOK/final-system/multilib/kmod.xml | 4 ++++
BOOK/final-system/multilib/libtool-64bit.xml | 4 ++++
BOOK/final-system/multilib/m4.xml | 4 ++++
BOOK/final-system/multilib/make.xml | 4 ++++
BOOK/final-system/multilib/patch.xml | 4 ++++
BOOK/final-system/multilib/perl-64bit.xml | 4 ++++
BOOK/final-system/multilib/perl-n32.xml | 4 ++++
BOOK/final-system/multilib/perl.xml | 8 ++++++++
BOOK/final-system/multilib/pkg-config-lite.xml | 4 ++++
BOOK/final-system/multilib/rsyslog.xml | 4 ++++
BOOK/final-system/multilib/sed.xml | 4 ++++
BOOK/final-system/multilib/tar.xml | 4 ++++
BOOK/final-system/multilib/texinfo.xml | 4 ++++
BOOK/final-system/multilib/util-linux-64bit.xml | 4 ++++
BOOK/final-system/multilib/util-linux-n32.xml | 4 ++++
BOOK/final-system/multilib/util-linux.xml | 4 ++++
BOOK/final-system/multilib/vim.xml | 8 ++++++++
BOOK/final-system/multilib/xz-64bit.xml | 4 ++++
BOOK/final-system/multilib/xz-n32.xml | 4 ++++
BOOK/final-system/multilib/xz.xml | 4 ++++
BOOK/final-system/multilib/zlib-64bit.xml | 4 ++++
BOOK/final-system/multilib/zlib-n32.xml | 4 ++++
BOOK/final-system/multilib/zlib.xml | 4 ++++
BOOK/final-system/x86/grub.xml | 5 +++--
BOOK/general.ent | 2 +-
90 files changed, 326 insertions(+), 74 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list