Changeset e87c833

Timestamp:

Nov 12, 2012, 1:49:56 PM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

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

Children:

db127375

Parents:

3d8b4f6

Message:

Simplified 64-bit boot shadow with xincludes

Location:

BOOK/boot

Files:

• 64/shadow.xml (modified) (2 diffs)
• multilib/shadow.xml (deleted)

BOOK/boot/64/shadow.xml

@@ -23 +23 @@
     <title>Installation of Shadow</title>
 
-    <para os="b">Disable the installation of the <command>groups</command>
-    program, as Coreutils provides a better version:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="c"><userinput>cp -v src/Makefile.in{,.orig}
-sed -e 's/groups$(EXEEXT) //' src/Makefile.in.orig > src/Makefile.in</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-    <para os="t1">The following cache entries set the values for tests that do
-    not run while cross-compiling:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='t1'])"/>
 
-<screen os="t2"><userinput>echo "ac_cv_func_setpgrp_void=yes" &gt; config.cache</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='t2'])"/>
 
-    <para os="d">Prepare Shadow for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
 <screen os="e"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
@@ -40 +47 @@
     --cache-file=config.cache</userinput></screen>
 
-<para os="f">The meaning of the configure options:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+ 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-  <variablelist os="g">
-    <varlistentry>
-      <term><parameter>--sysconfdir=/etc</parameter></term>
-      <listitem><para>Tells Shadow to install its configuration files into
-      <filename class="directory">/etc</filename>, rather than
-      <filename class="directory">/tools/etc</filename>.</para></listitem>
-    </varlistentry>
-    
-  </variablelist>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-    <para os="h">Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-<screen os="i"><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
-    <para os="j">This package does not come with a test suite.</para>
-
-    <para os="k">Install the package:</para>
-
-<screen os="l"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
 
   </sect2>