[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.1.0-696-g336233e

[git]

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  336233eb8b58df038f146dd0d6d913d571f176e2 (commit)
       via  76da2c21cf185f846a5ba31927a782d3b5d054da (commit)
      from  3d3f3a012f9b180a1a9e0ce3f30403b9a37f731f (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 336233eb8b58df038f146dd0d6d913d571f176e2
Author: William Harrington <kb0iic at cross-lfs.org>
Date:   Thu Apr 10 19:41:30 2014 -0500

    Do not use the symlink recreation commands from common attr.xml. It is different for 32 bit attr because of --libdir=/lib during configure.

diff --git a/BOOK/final-system/multilib/attr.xml b/BOOK/final-system/multilib/attr.xml
index 4f2cb82..8eee60c 100644
--- a/BOOK/final-system/multilib/attr.xml
+++ b/BOOK/final-system/multilib/attr.xml
@@ -66,9 +66,8 @@
   href="../common/attr.xml"
   xpointer="xpointer(//*[@os='k'])"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='l'])"/>
+<screen os="l"><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"

commit 76da2c21cf185f846a5ba31927a782d3b5d054da
Author: William Harrington <kb0iic at cross-lfs.org>
Date:   Thu Apr 10 19:40:41 2014 -0500

    Remove an unneeded section, add the proper installation commands, and fix the symlink recreation commands for 64bit attr.

diff --git a/BOOK/final-system/multilib/attr-64bit.xml b/BOOK/final-system/multilib/attr-64bit.xml
index 670d66b..dc4066a 100644
--- a/BOOK/final-system/multilib/attr-64bit.xml
+++ b/BOOK/final-system/multilib/attr-64bit.xml
@@ -57,13 +57,13 @@
   href="../common/attr.xml"
   xpointer="xpointer(//*[@os='i'])"/>
 
-    <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>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../common/attr.xml"
-  xpointer="xpointer(//*[@os='k'])"/>
+  xpointer="xpointer(//*[@os='j'])"/>
+
+    <para os="k">Recreate the symlink in <filename class="directory">/usr/lib64
+    </filename> and remove the shared link from <filename class="directory">
+    /lib64</filename>:</para>
 
 <screen os="l"><userinput>
 ln -sfv ../../lib64/$(readlink /lib64/libattr.so) /usr/lib64/libattr.so

-----------------------------------------------------------------------

Summary of changes:
 BOOK/final-system/multilib/attr-64bit.xml |   10 +++++-----
 BOOK/final-system/multilib/attr.xml       |    5 ++---
 2 files changed, 7 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book