[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.1.0-1307-g4f7a1c6
git
git at cross-lfs.org
Thu Jun 26 02:52:42 PDT 2014
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 4f7a1c6b3bdbdf5dc57b57406861a38179e2cedc (commit)
from 5c5947ef3af557eb28be078a3253fb2e7d78a4ee (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 4f7a1c6b3bdbdf5dc57b57406861a38179e2cedc
Author: Chris Staub <chris at beaker67.com>
Date: Thu Jun 26 05:49:55 2014 -0400
Kbd is installed before libpipeline, so move explanation of PKG_CONFIG_PATH to kbd
diff --git a/BOOK/final-system/common/kbd.xml b/BOOK/final-system/common/kbd.xml
index 22d97e8..3100bb9 100644
--- a/BOOK/final-system/common/kbd.xml
+++ b/BOOK/final-system/common/kbd.xml
@@ -30,27 +30,39 @@
<screen os="b"><userinput>PKG_CONFIG_PATH="/tools/lib/pkgconfig" \
./configure --prefix=/usr --disable-vlock --enable-optional-progs</userinput></screen>
- <para os="c">Compile the package:</para>
+ <variablelist os="c">
+ <title>The meaning of the configure option:</title>
-<screen os="d"><userinput>make</userinput></screen>
+ <varlistentry>
+ <term><envar>PKG_CONFIG_PATH</envar></term>
+ <listitem>
+ <para>Use pkg-config to obtain the location of the test library
+ metadata built in <xref linkend="ch-temp-system-check"/>.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <para os="d">Compile the package:</para>
+
+<screen os="e"><userinput>make</userinput></screen>
- <para os="e">To test the results, issue:</para>
+ <para os="f">To test the results, issue:</para>
-<screen os="f"><userinput remap="test">make check</userinput></screen>
+<screen os="g"><userinput remap="test">make check</userinput></screen>
- <para os="g">Install the package:</para>
+ <para os="h">Install the package:</para>
-<screen os="h"><userinput>make install</userinput></screen>
+<screen os="i"><userinput>make install</userinput></screen>
- <para os="i">Some of the programs from Kbd are used by systemd to
+ <para os="j">Some of the programs from Kbd are used by systemd to
initialize the system, those binaries need to be on the root
partition:</para>
-<screen os="j"><userinput>mv -v /usr/bin/{loadkeys,setfont} /bin</userinput></screen>
+<screen os="k"><userinput>mv -v /usr/bin/{loadkeys,setfont} /bin</userinput></screen>
- <para os="k">Install the documentation:</para>
+ <para os="l">Install the documentation:</para>
-<screen os="l"><userinput>mkdir -v /usr/share/doc/kbd-&kbd-version;
+<screen os="m"><userinput>mkdir -v /usr/share/doc/kbd-&kbd-version;
cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
</sect2>
diff --git a/BOOK/final-system/common/libpipeline.xml b/BOOK/final-system/common/libpipeline.xml
index 7971821..edc10e9 100644
--- a/BOOK/final-system/common/libpipeline.xml
+++ b/BOOK/final-system/common/libpipeline.xml
@@ -29,29 +29,17 @@
<screen os="b"><userinput>PKG_CONFIG_PATH=/tools/lib/pkgconfig ./configure --prefix=/usr</userinput></screen>
- <variablelist os="c">
- <title>The meaning of the configure option:</title>
+ <para os="c">Compile the package:</para>
- <varlistentry>
- <term><envar>PKG_CONFIG_PATH</envar></term>
- <listitem>
- <para>Use pkg-config to obtain the location of the test library
- metadata built in <xref linkend="ch-temp-system-check"/>.</para>
- </listitem>
- </varlistentry>
- </variablelist>
-
- <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
- <para os="f">To test the results, issue:</para>
+ <para os="e">To test the results, issue:</para>
-<screen os="g"><userinput remap="test">make check</userinput></screen>
+<screen os="f"><userinput remap="test">make check</userinput></screen>
- <para os="h">Install the package:</para>
+ <para os="g">Install the package:</para>
-<screen os="i"><userinput>make install</userinput></screen>
+<screen os="h"><userinput>make install</userinput></screen>
</sect2>
diff --git a/BOOK/final-system/multilib/kbd.xml b/BOOK/final-system/multilib/kbd.xml
index 5b0fe66..8e4a248 100644
--- a/BOOK/final-system/multilib/kbd.xml
+++ b/BOOK/final-system/multilib/kbd.xml
@@ -32,7 +32,9 @@
href="../common/kbd.xml"
xpointer="xpointer(//*[@os='c'])"/>
-<screen os="d"><userinput>make</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/kbd.xml"
+ xpointer="xpointer(//*[@os='d'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/kbd.xml"
@@ -66,6 +68,10 @@
href="../common/kbd.xml"
xpointer="xpointer(//*[@os='l'])"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/kbd.xml"
+ xpointer="xpointer(//*[@os='m'])"/>
+
</sect2>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/libpipeline-64bit.xml b/BOOK/final-system/multilib/libpipeline-64bit.xml
index 20b35a8..f012952 100644
--- a/BOOK/final-system/multilib/libpipeline-64bit.xml
+++ b/BOOK/final-system/multilib/libpipeline-64bit.xml
@@ -54,10 +54,6 @@
href="../common/libpipeline.xml"
xpointer="xpointer(//*[@os='h'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/libpipeline.xml"
- xpointer="xpointer(//*[@os='i'])"/>
-
</sect2>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/libpipeline-n32.xml b/BOOK/final-system/multilib/libpipeline-n32.xml
index bc5637f..0767665 100644
--- a/BOOK/final-system/multilib/libpipeline-n32.xml
+++ b/BOOK/final-system/multilib/libpipeline-n32.xml
@@ -31,19 +31,19 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/libpipeline.xml"
- xpointer="xpointer(//*[@os='d'])"/>
+ xpointer="xpointer(//*[@os='c'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/libpipeline.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ xpointer="xpointer(//*[@os='d'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/libpipeline.xml"
- xpointer="xpointer(//*[@os='h'])"/>
+ xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/libpipeline.xml"
- xpointer="xpointer(//*[@os='i'])"/>
+ xpointer="xpointer(//*[@os='h'])"/>
</sect2>
diff --git a/BOOK/final-system/multilib/libpipeline.xml b/BOOK/final-system/multilib/libpipeline.xml
index e35d6cd..14031b1 100644
--- a/BOOK/final-system/multilib/libpipeline.xml
+++ b/BOOK/final-system/multilib/libpipeline.xml
@@ -31,19 +31,19 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/libpipeline.xml"
- xpointer="xpointer(//*[@os='d'])"/>
+ xpointer="xpointer(//*[@os='c'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/libpipeline.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ xpointer="xpointer(//*[@os='d'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/libpipeline.xml"
- xpointer="xpointer(//*[@os='h'])"/>
+ xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/libpipeline.xml"
- xpointer="xpointer(//*[@os='i'])"/>
+ xpointer="xpointer(//*[@os='h'])"/>
</sect2>
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/common/kbd.xml | 32 +++++++++++++++-------
BOOK/final-system/common/libpipeline.xml | 24 ++++------------
BOOK/final-system/multilib/kbd.xml | 8 +++++-
BOOK/final-system/multilib/libpipeline-64bit.xml | 4 ---
BOOK/final-system/multilib/libpipeline-n32.xml | 8 +++---
BOOK/final-system/multilib/libpipeline.xml | 8 +++---
6 files changed, 43 insertions(+), 41 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list