Changeset b57a4d0 for BOOK/final-system

Timestamp:

Jul 6, 2008, 5:40:00 PM (16 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

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

Children:

a641baa

Parents:

af24f92

Message:

Now that shadow doesn't provide any libraries we only need to build it once on multilib.

Location:

BOOK/final-system

Files:

• mips64-chapter.xml (modified) (1 diff)
• multilib/shadow-64bit.xml (deleted)
• multilib/shadow-n32.xml (deleted)
• multilib/shadow.xml (modified) (2 diffs)
• ppc64-chapter.xml (modified) (1 diff)
• sparc64-chapter.xml (modified) (1 diff)
• x86_64-chapter.xml (modified) (1 diff)

BOOK/final-system/mips64-chapter.xml

@@ -85 +85 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/sysvinit.xml"/>

BOOK/final-system/multilib/shadow.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-system-shadow-32" role="wrap">
-  <?dbhtml filename="shadow.html"?>
+<sect1 id="ch-system-shadow" role="wrap">
+  <?dbhtml filename="shadow-64bit.html"?>
 
-  <title>Shadow-&shadow-version; 32 Bit Libraries</title>
+  <title>Shadow-&shadow-version; 64 Bit</title>
 
-  <indexterm zone="ch-system-shadow-32">
+  <indexterm zone="ch-system-shadow">
     <primary sortas="a-Shadow">Shadow</primary>
-    <secondary>32 Bit</secondary>
   </indexterm>
 
@@ -24 +23 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="c"><userinput>CC="gcc ${BUILD32}" ./configure --libdir=/lib --sysconfdir=/etc \
+<screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --libdir=/lib64 --sysconfdir=/etc \
    --enable-shared --without-libpam --without-audit --without-selinux</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='n'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='s'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='t'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='u'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
   </sect2>
 
-  <sect2 role="content">
-    <title/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/shadow.xml"
+  xpointer="xpointer(id('conf-shadow'))"/>
 
-    <para>Details on this package are located in <xref
-    linkend="contents-shadow" role="."/></para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/shadow.xml"
+  xpointer="xpointer(id('root-password'))"/>
 
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/shadow.xml"
+  xpointer="xpointer(id('contents-shadow'))"/>
 
 </sect1>

BOOK/final-system/ppc64-chapter.xml

@@ -72 +72 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>

BOOK/final-system/sparc64-chapter.xml

@@ -72 +72 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/sysvinit.xml"/>

BOOK/final-system/x86_64-chapter.xml

@@ -72 +72 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>