[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.1.0
git
git at cross-lfs.org
Tue Mar 11 21:57:06 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, systemd has been updated
via c806e361c58f76a097ffaaa801ef2a98c74d31b2 (commit)
via e1e9868774e27861d025f5675b58b8a458760e50 (commit)
via e36f29314db1f7b8dd0b7aec9b3d026798c3de65 (commit)
from aa9865d78da23b534650e15eb0988cd1b274514b (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 c806e361c58f76a097ffaaa801ef2a98c74d31b2
Author: Chris Staub <chris at beaker67.com>
Date: Wed Mar 12 00:57:11 2014 -0400
Actually install html docs for readline
diff --git a/BOOK/final-system/common/readline.xml b/BOOK/final-system/common/readline.xml
index c3ae1e5..8fde29d 100644
--- a/BOOK/final-system/common/readline.xml
+++ b/BOOK/final-system/common/readline.xml
@@ -44,19 +44,15 @@
<para os="f">Install the package:</para>
-<screen os="g"><userinput>make install</userinput></screen>
+<screen os="g"><userinput>make htmldir=/usr/share/doc/readline install</userinput></screen>
- <para os="h">Install the documentation:</para>
+ <para os="h">Now move the static libraries to a more appropriate location:</para>
-<screen os="i"><userinput>make install-doc</userinput></screen>
+<screen os="i"><userinput>mv -v /lib/lib{readline,history}.a /usr/lib</userinput></screen>
- <para os="j">Now move the static libraries to a more appropriate location:</para>
+ <para os="j">Next, relink the dynamic libraries into <filename class="directory">/usr/lib</filename> and remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib</filename>.</para>
-<screen os="k"><userinput>mv -v /lib/lib{readline,history}.a /usr/lib</userinput></screen>
-
- <para os="l">Next, relink the dynamic libraries into <filename class="directory">/usr/lib</filename> and remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib</filename>.</para>
-
-<screen os="m"><userinput>
+<screen os="k"><userinput>
ln -svf ../../lib/$(readlink /lib/libreadline.so) /usr/lib/libreadline.so
ln -svf ../../lib/$(readlink /lib/libhistory.so) /usr/lib/libhistory.so
rm -v /lib/lib{readline,history}.so</userinput></screen>
diff --git a/BOOK/final-system/multilib/readline-64bit.xml b/BOOK/final-system/multilib/readline-64bit.xml
index a43c60d..e413837 100644
--- a/BOOK/final-system/multilib/readline-64bit.xml
+++ b/BOOK/final-system/multilib/readline-64bit.xml
@@ -62,19 +62,11 @@
href="readline.xml"
xpointer="xpointer(//*[@os='h'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="readline.xml"
- xpointer="xpointer(//*[@os='i'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="readline.xml"
- xpointer="xpointer(//*[@os='j'])"/>
-
-<screen os="k"><userinput>mv -v /lib64/lib{readline,history}.a /usr/lib64</userinput></screen>
+<screen os="i"><userinput>mv -v /lib64/lib{readline,history}.a /usr/lib64</userinput></screen>
- <para os="l">Next, relink the dynamic libraries into <filename class="directory">/usr/lib64</filename> and remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib64</filename>.</para>
+ <para os="j">Next, relink the dynamic libraries into <filename class="directory">/usr/lib64</filename> and remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib64</filename>.</para>
-<screen os="m"><userinput>
+<screen os="k"><userinput>
ln -svf ../../lib64/$(readlink /lib64/libreadline.so) /usr/lib64/libreadline.so
ln -svf ../../lib64/$(readlink /lib64/libhistory.so) /usr/lib64/libhistory.so
rm -v /lib64/lib{readline,history}.so</userinput></screen>
diff --git a/BOOK/final-system/multilib/readline-n32.xml b/BOOK/final-system/multilib/readline-n32.xml
index 2c75760..3190321 100644
--- a/BOOK/final-system/multilib/readline-n32.xml
+++ b/BOOK/final-system/multilib/readline-n32.xml
@@ -63,19 +63,11 @@
href="readline.xml"
xpointer="xpointer(//*[@os='h'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="readline.xml"
- xpointer="xpointer(//*[@os='i'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="readline.xml"
- xpointer="xpointer(//*[@os='j'])"/>
-
-<screen os="k"><userinput>mv -v /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
+<screen os="i"><userinput>mv -v /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
- <para os="l">Next, relink the dynamic libraries into <filename class="directory">/usr/lib32</filename> and remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib32</filename>.</para>
+ <para os="j">Next, relink the dynamic libraries into <filename class="directory">/usr/lib32</filename> and remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib32</filename>.</para>
-<screen os="m"><userinput>
+<screen os="k"><userinput>
ln -svf ../../lib32/$(readlink /lib32/libreadline.so) /usr/lib32/libreadline.so
ln -svf ../../lib32/$(readlink /lib32/libhistory.so) /usr/lib32/libhistory.so
rm -v /lib32/lib{readline,history}.so</userinput></screen>
diff --git a/BOOK/final-system/multilib/readline.xml b/BOOK/final-system/multilib/readline.xml
index 6282257..ca65b53 100644
--- a/BOOK/final-system/multilib/readline.xml
+++ b/BOOK/final-system/multilib/readline.xml
@@ -75,14 +75,6 @@
href="../common/readline.xml"
xpointer="xpointer(//*[@os='k'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/readline.xml"
- xpointer="xpointer(//*[@os='l'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/readline.xml"
- xpointer="xpointer(//*[@os='m'])"/>
-
</sect2>
<sect2 role="content">
commit e1e9868774e27861d025f5675b58b8a458760e50
Author: Chris Staub <chris at beaker67.com>
Date: Wed Mar 12 00:50:06 2014 -0400
Updated bash doc instructions for multilib as well
diff --git a/BOOK/final-system/multilib/bash.xml b/BOOK/final-system/multilib/bash.xml
index 6234ede..3578078 100644
--- a/BOOK/final-system/multilib/bash.xml
+++ b/BOOK/final-system/multilib/bash.xml
@@ -42,7 +42,8 @@
<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
./configure --prefix=/usr --bindir=/bin \
- --without-bash-malloc --with-installed-readline</userinput></screen>
+ --without-bash-malloc --with-installed-readline \
+ --docdir=/usr/share/doc/bash-&bash-version;</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/bash.xml"
commit e36f29314db1f7b8dd0b7aec9b3d026798c3de65
Author: Chris Staub <chris at beaker67.com>
Date: Wed Mar 12 00:48:36 2014 -0400
Updated bash documentation installation
diff --git a/BOOK/final-system/common/bash.xml b/BOOK/final-system/common/bash.xml
index f583389..2fc3219 100644
--- a/BOOK/final-system/common/bash.xml
+++ b/BOOK/final-system/common/bash.xml
@@ -34,7 +34,8 @@
<para os="a">Prepare Bash for compilation:</para>
<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin \
- --without-bash-malloc --with-installed-readline</userinput></screen>
+ --without-bash-malloc --with-installed-readline \
+ --docdir=/usr/share/doc/bash-&bash-version;</userinput></screen>
<variablelist os="c">
<title>The meaning of the configure option:</title>
@@ -60,7 +61,7 @@
<para os="g">Install the package:</para>
-<screen os="h"><userinput>make htmldir=/usr/share/doc/bash-&bash-version; install</userinput></screen>
+<screen os="h"><userinput>make install</userinput></screen>
<para os="i">Run the newly compiled <command>bash</command> program (replacing
the one that is currently being executed):</para>
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/common/bash.xml | 5 +++--
BOOK/final-system/common/readline.xml | 14 +++++---------
BOOK/final-system/multilib/bash.xml | 3 ++-
BOOK/final-system/multilib/readline-64bit.xml | 14 +++-----------
BOOK/final-system/multilib/readline-n32.xml | 14 +++-----------
BOOK/final-system/multilib/readline.xml | 8 --------
6 files changed, 16 insertions(+), 42 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list