[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.1.0-630-g4c1c923
git
git at cross-lfs.org
Wed Apr 2 19:27:37 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 4c1c923aa4f31850c743b8fe71db6a4b13f67af3 (commit)
via 72d6a1b070122b57554075d13ae42e2ff9f5563d (commit)
via bb525acec6d2e30a7d36581671b72c4979ad2f84 (commit)
via dd84185c2ae7db71b24143efd574aee2f4b2828f (commit)
from 205fbc0c18dc95c7333806f20abf22883f91e2eb (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 4c1c923aa4f31850c743b8fe71db6a4b13f67af3
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Wed Apr 2 21:27:28 2014 -0500
Add test suite commands and sed for doc install with version.
diff --git a/BOOK/final-system/common/attr.xml b/BOOK/final-system/common/attr.xml
index c56e890..ca438a7 100644
--- a/BOOK/final-system/common/attr.xml
+++ b/BOOK/final-system/common/attr.xml
@@ -25,29 +25,38 @@
<sect2 role="installation">
<title>Installation of Attr</title>
- <para os="a">Prepare Attr for compilation:</para>
+ <para os="a">Apply a sed to install the documentation with a versioned
+ directory:</para>
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>sed -i -e 's|/@pkg_name@|&- at pkg_version@|' include/builddefs.in</userinput></screen>
- <para os="c">Compile the package:</para>
+ <para os="c">Prepare Attr for compilation:</para>
-<screen os="d"><userinput>make</userinput></screen>
+<screen os="d"><userinput>./configure --prefix=/usr</userinput></screen>
- <para os="e">This package does not come with a test suite.</para>
+ <para os="e">Compile the package:</para>
- <para os="f">Install the package:</para>
+<screen os="f"><userinput>make</userinput></screen>
-<screen os="g"><userinput>make install install-dev install-lib</userinput></screen>
+ <para os="g">The tests need to run with a filesystem which supports extended
+ attributes. Test the results:</para>
- <para os="h">Move the shared library to <filename class="directory">/lib</filename>
- and recreate the symlink in <filename class="directory">/usr/lib</filename>:</para>
+<screen os="h"><userinput remap="test">make -j1 tests root-tests</userinput></screen>
-<screen os="i"><userinput>mv -v /usr/lib/libattr.so.* /lib
+ <para os="i">Install the package:</para>
+
+<screen os="j"><userinput>make install install-dev install-lib</userinput></screen>
+
+ <para os="k">Move the shared library to <filename class="directory">/lib
+ </filename> and recreate the symlink in <filename class="directory">/usr/lib
+ </filename>:</para>
+
+<screen os="l"><userinput>mv -v /usr/lib/libattr.so.* /lib
ln -sfv ../../lib/$(readlink /usr/lib/libattr.so) /usr/lib/libattr.so</userinput></screen>
- <para os="j">Set the proper permissions on the shared library:</para>
+ <para os="m">Set the proper permissions on the shared library:</para>
-<screen os="k"><userinput>chmod 755 -v /lib/libattr.so.1.1.0</userinput></screen>
+<screen os="n"><userinput>chmod 755 -v /lib/libattr.so.1.1.0</userinput></screen>
</sect2>
diff --git a/BOOK/final-system/multilib/attr-64bit.xml b/BOOK/final-system/multilib/attr-64bit.xml
index 74a48d6..670d66b 100644
--- a/BOOK/final-system/multilib/attr-64bit.xml
+++ b/BOOK/final-system/multilib/attr-64bit.xml
@@ -22,44 +22,58 @@
<title>Installation of Attr</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/attr.xml"
- xpointer="xpointer(//*[@os='a'])"/>
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='b'])"/>
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure \
--prefix=/usr --libdir=/lib64 \
--libexecdir=/usr/lib64</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/attr.xml"
- xpointer="xpointer(//*[@os='c'])"/>
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='e'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/attr.xml"
- xpointer="xpointer(//*[@os='d'])"/>
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/attr.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/attr.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='h'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/attr.xml"
- xpointer="xpointer(//*[@os='g'])"/>
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
- <para os="h">Recreate the symlink in <filename class="directory">/usr/lib64</filename> and remove the shared link from <filename class="directory">/lib64</filename>:</para>
+ <para os="j">Recreate the symlink in <filename class="directory">/usr/lib64
+ </filename> and remove the shared link from <filename class="directory">
+ /lib64</filename>:</para>
-<screen os="i"><userinput>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='k'])"/>
+
+<screen os="l"><userinput>
ln -sfv ../../lib64/$(readlink /lib64/libattr.so) /usr/lib64/libattr.so
rm -v /lib64/libattr.so</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/attr.xml"
- xpointer="xpointer(//*[@os='j'])"/>
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='m'])"/>
-<screen os="k"><userinput>chmod 755 -v /lib64/libattr.so.1.1.0</userinput></screen>
+<screen os="n"><userinput>chmod 755 -v /lib64/libattr.so.1.1.0</userinput></screen>
</sect2>
diff --git a/BOOK/final-system/multilib/attr-n32.xml b/BOOK/final-system/multilib/attr-n32.xml
index 1cf4301..460ec5c 100644
--- a/BOOK/final-system/multilib/attr-n32.xml
+++ b/BOOK/final-system/multilib/attr-n32.xml
@@ -23,44 +23,58 @@
<title>Installation of Attr</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/attr.xml"
- xpointer="xpointer(//*[@os='a'])"/>
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='b'])"/>
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure \
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><userinput>CC="gcc ${BUILDN32}" ./configure \
--prefix=/usr --libdir=/lib32 \
--libexecdir=/usr/lib32</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/attr.xml"
- xpointer="xpointer(//*[@os='c'])"/>
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='e'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/attr.xml"
- xpointer="xpointer(//*[@os='d'])"/>
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/attr.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='h'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/attr.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/attr.xml"
- xpointer="xpointer(//*[@os='g'])"/>
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='j'])"/>
- <para os="h">Recreate the symlink in <filename class="directory">/usr/lib32</filename> and remove the shared link from <filename class="directory">/lib32</filename>:</para>
+ <para os="k">Recreate the symlink in <filename class="directory">/usr/lib32
+ </filename> and remove the shared link from <filename class="directory">
+ /lib32</filename>:</para>
-<screen os="i"><userinput>
+<screen os="l"><userinput>
ln -sfv ../../lib32/$(readlink /lib32/libattr.so) /usr/lib32/libattr.so
rm -v /lib32/libattr.so</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/attr.xml"
- xpointer="xpointer(//*[@os='j'])"/>
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='m'])"/>
-<screen os="k"><userinput>chmod 755 -v /lib32/libattr.so.1.1.0</userinput></screen>
+<screen os="n"><userinput>chmod 755 -v /lib32/libattr.so.1.1.0</userinput></screen>
</sect2>
diff --git a/BOOK/final-system/multilib/attr.xml b/BOOK/final-system/multilib/attr.xml
index 21139eb..4f2cb82 100644
--- a/BOOK/final-system/multilib/attr.xml
+++ b/BOOK/final-system/multilib/attr.xml
@@ -23,46 +23,60 @@
<title>Installation of Attr</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/attr.xml"
- xpointer="xpointer(//*[@os='a'])"/>
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='b'])"/>
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure \
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><userinput>CC="gcc ${BUILD32}" ./configure \
--prefix=/usr --libdir=/lib \
--libexecdir=/usr/lib</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/attr.xml"
- xpointer="xpointer(//*[@os='c'])"/>
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='e'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/attr.xml"
- xpointer="xpointer(//*[@os='d'])"/>
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/attr.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/attr.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='h'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/attr.xml"
- xpointer="xpointer(//*[@os='g'])"/>
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
- <para os="h">Recreate the symlink in <filename class="directory">/usr/lib</filename> and remove the shared link from <filename class="directory">/lib</filename>:</para>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='j'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='k'])"/>
-<screen os="i"><userinput>
-ln -sfv ../../lib/$(readlink /lib/libattr.so) /usr/lib/libattr.so
-rm -v /lib/libattr.so</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='l'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/attr.xml"
- xpointer="xpointer(//*[@os='j'])"/>
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='m'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/attr.xml"
- xpointer="xpointer(//*[@os='k'])"/>
+ href="../common/attr.xml"
+ xpointer="xpointer(//*[@os='n'])"/>
</sect2>
commit 72d6a1b070122b57554075d13ae42e2ff9f5563d
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Wed Apr 2 21:26:57 2014 -0500
Tidy up Acl xml, add sed for doc directory install with version, add sed for test suite fix, and add test suite commands.
diff --git a/BOOK/final-system/common/acl.xml b/BOOK/final-system/common/acl.xml
index f152927..42137a6 100644
--- a/BOOK/final-system/common/acl.xml
+++ b/BOOK/final-system/common/acl.xml
@@ -24,29 +24,42 @@
<sect2 role="installation">
<title>Installation of ACL</title>
- <para os="a">Prepare ACL for compilation:</para>
+ <para os="a">Apply a sed to install the documentation with a versioned
+ directory:</para>
-<screen os="b"><userinput>./configure --prefix=/usr --libexecdir=/usr/lib</userinput></screen>
+<screen os="b"><userinput>sed -i -e 's|/@pkg_name@|&- at pkg_version@|' include/builddefs.in</userinput></screen>
- <para os="c">Compile the package:</para>
+ <para os="c">Apply a sed to fix a few tests:</para>
-<screen os="d"><userinput>make</userinput></screen>
+<screen os="d"><userinput>sed -i "s:| sed.*::g" test/{sbits-restore,cp,misc}.test</userinput></screen>
+
+ <para os="e">Prepare ACL for compilation:</para>
- <para os="e">This package does not come with a test suite.</para>
+<screen os="f"><userinput>./configure --prefix=/usr --libexecdir=/usr/lib</userinput></screen>
- <para os="f">Install the package:</para>
+ <para os="g">Compile the package:</para>
-<screen os="g"><userinput>make install install-dev install-lib</userinput></screen>
+<screen os="h"><userinput>make</userinput></screen>
- <para os="h">Move the shared library to <filename class="directory">/lib</filename>
+ <para os="i">The Acl tests need a filesystem which supports access controls
+ after Coreutils has been built with the Acl libraries. Return to this
+ section after Coreutils has been installed. Test the results:</para>
+
+<screen os="j"><userinput remap="test">make tests</userinput></screen>
+
+ <para os="k">Install the package:</para>
+
+<screen os="l"><userinput>make install install-dev install-lib</userinput></screen>
+
+ <para os="m">Move the shared library to <filename class="directory">/lib</filename>
and recreate the symlink in <filename class="directory">/usr/lib</filename>:</para>
-<screen os="i"><userinput>mv -v /usr/lib/libacl.so.* /lib
+<screen os="n"><userinput>mv -v /usr/lib/libacl.so.* /lib
ln -sfv ../../lib/libacl.so.1 /usr/lib/libacl.so</userinput></screen>
- <para os="j">Set the proper permissions on the shared library:</para>
+ <para os="o">Set the proper permissions on the shared library:</para>
-<screen os="k"><userinput>chmod 755 -v /lib/libacl.so.1.1.0</userinput></screen>
+<screen os="p"><userinput>chmod 755 -v /lib/libacl.so.1.1.0</userinput></screen>
</sect2>
diff --git a/BOOK/final-system/multilib/acl-64bit.xml b/BOOK/final-system/multilib/acl-64bit.xml
index 42c7dc7..c9b4db8 100644
--- a/BOOK/final-system/multilib/acl-64bit.xml
+++ b/BOOK/final-system/multilib/acl-64bit.xml
@@ -22,43 +22,65 @@
<title>Installation of Acl</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/acl.xml"
- xpointer="xpointer(//*[@os='a'])"/>
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
- --prefix=/usr --libdir=/lib64 \
- --libexecdir=/usr/lib64</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='b'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/acl.xml"
- xpointer="xpointer(//*[@os='c'])"/>
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='c'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/acl.xml"
- xpointer="xpointer(//*[@os='d'])"/>
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='d'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/acl.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='e'])"/>
+
+<screen os="f"><userinput>CC="gcc ${BUILD64}" ./configure \
+ --prefix=/usr --libdir=/lib64 \
+ --libexecdir=/usr/lib64</userinput></screen>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/acl.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='h'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='j'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='k'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/acl.xml"
- xpointer="xpointer(//*[@os='g'])"/>
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='l'])"/>
- <para os="h">Recreate the symlink in <filename class="directory">/usr/lib64</filename> and remove the shared link from <filename class="directory">/lib64</filename>:</para>
+ <para os="m">Recreate the symlink in <filename class="directory">/usr/lib64
+ </filename> and remove the shared link from <filename class="directory">
+ /lib64</filename>:</para>
-<screen os="i"><userinput>ln -sfv ../../lib64/$(readlink /lib64/libacl.so) /usr/lib64/libacl.so
+<screen os="n"><userinput>ln -sfv ../../lib64/$(readlink /lib64/libacl.so) /usr/lib64/libacl.so
rm -v /lib64/libacl.so</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/acl.xml"
- xpointer="xpointer(//*[@os='j'])"/>
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='o'])"/>
-<screen os="k"><userinput>chmod 755 -v /lib64/libacl.so.1.1.0</userinput></screen>
+<screen os="p"><userinput>chmod 755 -v /lib64/libacl.so.1.1.0</userinput></screen>
</sect2>
diff --git a/BOOK/final-system/multilib/acl-n32.xml b/BOOK/final-system/multilib/acl-n32.xml
index d51c43c..4eb4b76 100644
--- a/BOOK/final-system/multilib/acl-n32.xml
+++ b/BOOK/final-system/multilib/acl-n32.xml
@@ -26,9 +26,9 @@
href="../common/acl.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure \
- --prefix=/usr --libdir=/lib32 \
- --libexecdir=/usr/lib32</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='b'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/acl.xml"
@@ -42,24 +42,46 @@
href="../common/acl.xml"
xpointer="xpointer(//*[@os='e'])"/>
+<screen os="f"><userinput>CC="gcc ${BUILDN32}" ./configure \
+ --prefix=/usr --libdir=/lib32 \
+ --libexecdir=/usr/lib32</userinput></screen>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/acl.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+ xpointer="xpointer(//*[@os='h'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/acl.xml"
- xpointer="xpointer(//*[@os='g'])"/>
+ xpointer="xpointer(//*[@os='j'])"/>
- <para os="h">Recreate the symlink in <filename class="directory">/usr/lib32</filename> and remove the shared link from <filename class="directory">/lib32</filename>:</para>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='k'])"/>
-<screen os="i"><userinput>ln -sfv ../../lib32/$(readlink /lib32/libacl.so) /usr/lib32/libacl.so
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='l'])"/>
+
+ <para os="m">Recreate the symlink in <filename class="directory">/usr/lib32
+ </filename> and remove the shared link from <filename class="directory">
+ /lib32</filename>:</para>
+
+<screen os="n"><userinput>ln -sfv ../../lib32/$(readlink /lib32/libacl.so) /usr/lib32/libacl.so
rm -v /lib32/libacl.so</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/acl.xml"
- xpointer="xpointer(//*[@os='j'])"/>
+ xpointer="xpointer(//*[@os='o'])"/>
-<screen os="k"><userinput>chmod 755 -v /lib32/libacl.so.1.1.0</userinput></screen>
+<screen os="p"><userinput>chmod 755 -v /lib32/libacl.so.1.1.0</userinput></screen>
</sect2>
diff --git a/BOOK/final-system/multilib/acl.xml b/BOOK/final-system/multilib/acl.xml
index d90430f..b330f63 100644
--- a/BOOK/final-system/multilib/acl.xml
+++ b/BOOK/final-system/multilib/acl.xml
@@ -23,43 +23,68 @@
<title>Installation of Acl</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/acl.xml"
- xpointer="xpointer(//*[@os='a'])"/>
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='b'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='c'])"/>
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure \
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='d'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='e'])"/>
+
+<screen os="f"><userinput>CC="gcc ${BUILD32}" ./configure \
--prefix=/usr --libdir=/lib \
--libexecdir=/usr/lib</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/acl.xml"
- xpointer="xpointer(//*[@os='c'])"/>
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='h'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/acl.xml"
- xpointer="xpointer(//*[@os='d'])"/>
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/acl.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='j'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/acl.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='k'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/acl.xml"
- xpointer="xpointer(//*[@os='g'])"/>
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='l'])"/>
- <para os="h">Recreate the symlink in <filename class="directory">/usr/lib</filename> and remove the shared link from <filename class="directory">/lib</filename>:</para>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='m'])"/>
-<screen os="i"><userinput>ln -sfv ../../lib/$(readlink /lib/libacl.so) /usr/lib/libacl.so
-rm -v /lib/libacl.so</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='n'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/acl.xml"
- xpointer="xpointer(//*[@os='j'])"/>
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='o'])"/>
-<screen os="k"><userinput>chmod 755 -v /lib/libacl.so.1.1.0</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/acl.xml"
+ xpointer="xpointer(//*[@os='p'])"/>
</sect2>
commit bb525acec6d2e30a7d36581671b72c4979ad2f84
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Wed Apr 2 21:25:57 2014 -0500
Add attr and acl test commands entry to master changelog.
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 7d2c51e..800e3b2 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,15 @@
-->
<listitem>
+ <para>02 April 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[William Harrington] - Add test commands to Attr and Acl.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>30 March 2014</para>
<itemizedlist>
<listitem>
commit dd84185c2ae7db71b24143efd574aee2f4b2828f
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Wed Apr 2 19:47:10 2014 -0500
Update date.
diff --git a/BOOK/general.ent b/BOOK/general.ent
index 44103f7..0c0d785 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "04"> <!-- Use two digits -->
<!ENTITY month_name "April">
-<!ENTITY day "01"> <!-- Use two digits -->
+<!ENTITY day "02"> <!-- Use two digits -->
<!ENTITY year "2014"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/common/acl.xml | 35 +++++++++++-----
BOOK/final-system/common/attr.xml | 33 ++++++++++-----
BOOK/final-system/multilib/acl-64bit.xml | 62 +++++++++++++++++++---------
BOOK/final-system/multilib/acl-n32.xml | 40 ++++++++++++++----
BOOK/final-system/multilib/acl.xml | 63 ++++++++++++++++++++---------
BOOK/final-system/multilib/attr-64bit.xml | 50 +++++++++++++++--------
BOOK/final-system/multilib/attr-n32.xml | 50 +++++++++++++++--------
BOOK/final-system/multilib/attr.xml | 56 ++++++++++++++++----------
BOOK/general.ent | 2 +-
BOOK/introduction/common/changelog.xml | 9 ++++
10 files changed, 271 insertions(+), 129 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list