Changes in BOOK/boot/common/kmod.xml [e90b5e5:e2e6aae]

File:

• BOOK/boot/common/kmod.xml (modified) (2 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"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>PKG_CONFIG= 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 \
-    --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>
+<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>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -64 +45 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="h"><userinput>make install</userinput></screen>
+<screen os="k"><userinput>make DESTDIR=${CLFS} 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 -sfv kmod /tools/bin/lsmod
-for tool in depmod insmod modprobe modinfo rmmod; do
-    ln -sv ../bin/kmod /tools/sbin/${tool}
-done</userinput></screen>
+<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>
 
   </sect2>