Changeset 03e6a40 for BOOK/boot/common/kmod.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

0be79ea

Parents:

88ef769 (diff), 578ca586 (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 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:

• BOOK/boot/common/kmod.xml (modified) (3 diffs)

BOOK/boot/common/kmod.xml

@@ -23 +23 @@
     <title>Installation of Kmod</title>
 
+    <para os="s1">Tell Kmod to use <filename class="directory">/tools/lib/modules</filename>:</para>
+
+<screen os="s2"><userinput>cp -v libkmod/libkmod.c{,.orig}
+sed '/dirname_default_prefix /s@/lib/modules@/tools&amp;@' \
+    libkmod/libkmod.c.orig &gt; libkmod/libkmod.c</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/kmod.xml"
@@ -29 +35 @@
 <screen os="b"><userinput>liblzma_CFLAGS="-I/tools/include" liblzma_LIBS="-L/tools/lib -llzma" \
 zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib -lz" \
-./configure --prefix=/tools --bindir=/bin \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-xz --with-zlib \
-    --disable-manpages</userinput></screen>
+./configure --prefix=/tools \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-xz --with-zlib</userinput></screen>
+
+    <variablelist os="c">
+      <title>The meaning of the new configure options:</title>
+
+      <varlistentry>
+        <term><parameter>--with-zlib --with-xz</parameter></term>
+        <listitem>
+          <para>These allow the Kmod package to handle zlib and XZ
+            compressed kernel modules.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -45 +63 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="k"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+<screen os="h"><userinput>make install</userinput></screen>
 
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-href="../../final-system/common/kmod.xml"
-xpointer="xpointer(//*[@os='i'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/kmod.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-<screen os="j"><userinput>ln -sv kmod ${CLFS}/bin/lsmod
-ln -sv ../bin/kmod ${CLFS}/sbin/depmod
-ln -sv ../bin/kmod ${CLFS}/sbin/insmod
-ln -sv ../bin/kmod ${CLFS}/sbin/modprobe
-ln -sv ../bin/kmod ${CLFS}/sbin/modinfo
-ln -sv ../bin/kmod ${CLFS}/sbin/rmmod</userinput></screen>
+<screen os="j"><userinput>ln -sfv kmod /tools/bin/lsmod
+for tool in depmod insmod modprobe modinfo rmmod; do
+    ln -sv ../bin/kmod /tools/sbin/${tool}
+done</userinput></screen>
 
   </sect2>