[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.0.0-760-gd0123a3

[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  d0123a371c4ba2fee27df9669462c713505e6599 (commit)
      from  5bac4956ba844dfc11fdb058ea71662b98bfed54 (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 d0123a371c4ba2fee27df9669462c713505e6599
Author: William Harrington <kb0iic at berzerkula.org>
Date:   Mon Jan 20 13:16:58 2014 -0600

    Tidy up attr multilib library install and use readlink for attr in all section dynmic library linking.

diff --git a/BOOK/final-system/common/attr.xml b/BOOK/final-system/common/attr.xml
index 0c0bd42..c56e890 100644
--- a/BOOK/final-system/common/attr.xml
+++ b/BOOK/final-system/common/attr.xml
@@ -43,7 +43,7 @@
     and recreate the symlink in <filename class="directory">/usr/lib</filename>:</para>
 
 <screen os="i"><userinput>mv -v /usr/lib/libattr.so.* /lib
-ln -sfv ../../lib/libattr.so.1 /usr/lib/libattr.so</userinput></screen>
+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>
 
diff --git a/BOOK/final-system/multilib/attr-64bit.xml b/BOOK/final-system/multilib/attr-64bit.xml
index f5ed4ad..74a48d6 100644
--- a/BOOK/final-system/multilib/attr-64bit.xml
+++ b/BOOK/final-system/multilib/attr-64bit.xml
@@ -49,11 +49,11 @@
     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='h'])"/>
+    <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>
 
-<screen os="i"><userinput>rm -v /lib64/libattr.{,l}a</userinput></screen>
+<screen os="i"><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"
diff --git a/BOOK/final-system/multilib/attr-n32.xml b/BOOK/final-system/multilib/attr-n32.xml
index d10b6ce..1cf4301 100644
--- a/BOOK/final-system/multilib/attr-n32.xml
+++ b/BOOK/final-system/multilib/attr-n32.xml
@@ -50,11 +50,11 @@
     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='h'])"/>
+    <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>
 
-<screen os="i"><userinput>rm -v /lib32/libattr.{,l}a</userinput></screen>
+<screen os="i"><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"
diff --git a/BOOK/final-system/multilib/attr.xml b/BOOK/final-system/multilib/attr.xml
index c27ca58..21139eb 100644
--- a/BOOK/final-system/multilib/attr.xml
+++ b/BOOK/final-system/multilib/attr.xml
@@ -50,13 +50,11 @@
     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='h'])"/>
+    <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='i'])"/>
+<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"

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

Summary of changes:
 BOOK/final-system/common/attr.xml         |    2 +-
 BOOK/final-system/multilib/attr-64bit.xml |    8 ++++----
 BOOK/final-system/multilib/attr-n32.xml   |    8 ++++----
 BOOK/final-system/multilib/attr.xml       |   10 ++++------
 4 files changed, 13 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book