[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.0.0-761-gd93a24a

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

    Use readlink for libcap and tidy library install amongst all installations.

diff --git a/BOOK/final-system/common/libcap.xml b/BOOK/final-system/common/libcap.xml
index 633fb77..5a11aea 100644
--- a/BOOK/final-system/common/libcap.xml
+++ b/BOOK/final-system/common/libcap.xml
@@ -35,8 +35,8 @@
 
 <screen os="e"><userinput>make RAISE_SETFCAP=no install
 chmod -v 755 /lib/libcap.so.&libcap-version;
+ln -sfv ../../lib/$(readlink /lib/libcap.so) /usr/lib/libcap.so
 rm -v /lib/libcap.so
-ln -sfv ../../lib/libcap.so.2 /usr/lib/libcap.so
 mv -v /lib/libcap.a /usr/lib</userinput></screen>
 
   </sect2>
diff --git a/BOOK/final-system/multilib/libcap-64bit.xml b/BOOK/final-system/multilib/libcap-64bit.xml
index 74cc06c..21c3bde 100644
--- a/BOOK/final-system/multilib/libcap-64bit.xml
+++ b/BOOK/final-system/multilib/libcap-64bit.xml
@@ -37,8 +37,8 @@
 
 <screen os="e"><userinput>make lib=lib64 install
 chmod -v 755 /lib64/libcap.so.&libcap-version;
-rm /lib64/libcap.so
-ln -sfv ../../lib64/libcap.so.2 /usr/lib64/libcap.so
+ln -sfv ../../lib64/$(readlink /lib64/libcap.so) /usr/lib64/libcap.so
+rm -v /lib64/libcap.so
 mv -v /lib64/libcap.a /usr/lib64</userinput></screen>
 
   </sect2>
diff --git a/BOOK/final-system/multilib/libcap-n32.xml b/BOOK/final-system/multilib/libcap-n32.xml
index e7da483..0f71d2e 100644
--- a/BOOK/final-system/multilib/libcap-n32.xml
+++ b/BOOK/final-system/multilib/libcap-n32.xml
@@ -38,8 +38,8 @@
 
 <screen os="e"><userinput>make lib=lib32 install
 chmod -v 755 /lib32/libcap.so.&libcap-version;
-rm /lib32/libcap.so
-ln -sfv ../../lib32/libcap.so.2 /usr/lib32/libcap.so
+ln -sfv ../../lib32/$(readlink /lib32/libcap.so) /usr/lib32/libcap.so
+rm -v /lib32/libcap.so
 mv -v /lib32/libcap.a /usr/lib32</userinput></screen>
 
   </sect2>
diff --git a/BOOK/final-system/multilib/libcap.xml b/BOOK/final-system/multilib/libcap.xml
index f59ad83..aec65bb 100644
--- a/BOOK/final-system/multilib/libcap.xml
+++ b/BOOK/final-system/multilib/libcap.xml
@@ -36,9 +36,11 @@
     href="../common/libcap.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libcap.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+<screen os="e"><userinput>make RAISE_SETFCAP=no lib=lib install
+chmod -v 755 /lib/libcap.so.&libcap-version;
+ln -sfv ../../lib/$(readlink /lib/libcap.so) /usr/lib/libcap.so
+rm -v /lib/libcap.so
+mv -v /lib/libcap.a /usr/lib</userinput></screen>
 
   </sect2>
 

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

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


hooks/post-receive
-- 
Cross-LFS Book