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

File:

• BOOK/boot/multilib/kmod.xml (modified) (2 diffs)

BOOK/boot/multilib/kmod.xml

@@ -24 +24 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/kmod.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>liblzma_CFLAGS="-I/tools/include" liblzma_LIBS="-L/tools/lib64 -llzma" \
-zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib64 -lz" \
-CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --bindir=/bin --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --libdir=/tools/lib64 --with-xz --with-zlib --disable-manpages</userinput></screen>
+<screen os="b"><userinput>PKG_CONFIG= liblzma_CFLAGS="-I/tools/include" \
+    liblzma_LIBS="-L/tools/lib64 -llzma" \
+    zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib64 -lz" \
+    CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --libdir=/tools/lib64 --with-xz --with-zlib</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"
@@ -45 +58 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="k"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-<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="../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>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
   </sect2>