Changeset 72d6a1b for BOOK/final-system/multilib/acl-n32.xml

Timestamp:

Apr 2, 2014, 7:26:57 PM (10 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

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

Children:

4c1c923

Parents:

bb525ace

Message:

Tidy up Acl xml, add sed for doc directory install with version, add sed for test suite fix, and add test suite commands.

File:

• BOOK/final-system/multilib/acl-n32.xml (modified) (3 diffs)

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

@@ -27 +27 @@
     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"
@@ -43 +43 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+<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='f'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/acl.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <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>ln -sfv ../../lib32/$(readlink /lib32/libacl.so) /usr/lib32/libacl.so
-rm -v /lib32/libacl.so</userinput></screen>
+    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"
@@ -60 +63 @@
     xpointer="xpointer(//*[@os='j'])"/>
 
-<screen os="k"><userinput>chmod 755 -v /lib32/libacl.so.1.1.0</userinput></screen>
+ <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='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='o'])"/>
+
+<screen os="p"><userinput>chmod 755 -v /lib32/libacl.so.1.1.0</userinput></screen>
 
   </sect2>