Changeset d93a24a for BOOK/final-system/multilib

Timestamp:

Jan 20, 2014, 11:41:29 AM (11 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

e848082

Parents:

d0123a37

Message:

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

Location:

BOOK/final-system/multilib

Files:

• libcap-64bit.xml (modified) (1 diff)
• libcap-n32.xml (modified) (1 diff)
• libcap.xml (modified) (1 diff)

BOOK/final-system/multilib/libcap-64bit.xml

@@ -38 +38 @@
 <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>
 

BOOK/final-system/multilib/libcap-n32.xml

@@ -39 +39 @@
 <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>
 

BOOK/final-system/multilib/libcap.xml

@@ -37 +37 @@
     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>