Changeset 73ace20 for BOOK/final-system/multilib/kmod-64bit.xml

Timestamp:

Oct 10, 2012, 6:42:21 PM (12 years ago)

Author:

Chris Staub <chris@…>

Branches:

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

Children:

f7b2c72

Parents:

0cce40d (diff), 80cbd64 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of git.cross-lfs.org:cross-lfs

File:

• BOOK/final-system/multilib/kmod-64bit.xml (moved) (moved from BOOK/final-system/multilib/module-init-tools.xml) (1 diff)

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

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-system-module-init-tools" role="wrap">
-  <?dbhtml filename="module-init-tools.html"?>
+<sect1 id="ch-system-kmod" role="wrap">
+  <?dbhtml filename="kmod-64bit.html"?>
 
-  <title>Module-Init-Tools-&module-init-tools-version;</title>
+  <title>Kmod-&kmod-version; 64 Bit</title>
 
-  <indexterm zone="ch-system-module-init-tools">
-    <primary sortas="a-Module-Init-Tools">Module-Init-Tools</primary>
+  <indexterm zone="ch-system-kmod">
+    <primary sortas="a-Kmod">Kmod</primary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/module-init-tools.xml"
+  href="../common/kmod.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation of Module-Init-Tools</title>
+    <title>Installation of Kmod</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/module-init-tools.xml"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH64} CC="gcc ${BUILD64}" \
+        ./configure --prefix=/usr \
+        --bindir=/bin --sysconfdir=/etc \
+        --with-rootlibdir=/lib64 --libdir=/usr/lib64 \
+        --with-zlib --with-xz</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/module-init-tools.xml"
+    href="../common/kmod.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/module-init-tools.xml"
+    href="../common/kmod.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="f"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-    --bindir=/bin --sbindir=/sbin \
-    --enable-zlib-dynamic</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/module-init-tools.xml"
+    href="../common/kmod.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/module-init-tools.xml"
+    href="../common/kmod.xml"
     xpointer="xpointer(//*[@os='h'])"/>
-
+    
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/module-init-tools.xml"
+    href="../common/kmod.xml"
     xpointer="xpointer(//*[@os='i'])"/>
-
+    
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/module-init-tools.xml"
+    href="../common/kmod.xml"
     xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
 
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/module-init-tools.xml"
-  xpointer="xpointer(id('contents-module-init-tools'))"/>
+  href="../common/kmod.xml"
+  xpointer="xpointer(id('contents-kmod'))"/>
 
 </sect1>