[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. e5ca6b9d265a0bd0a0afdce42625a59043b4ebf6
git
git at cross-lfs.org
Wed Mar 14 15:26:01 PDT 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, master has been updated
via e5ca6b9d265a0bd0a0afdce42625a59043b4ebf6 (commit)
from 14b90c2846a39d796e2358dbd2b0689618639a71 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e5ca6b9d265a0bd0a0afdce42625a59043b4ebf6
Author: Jonathan Norman <jon at cosmo1847.co.uk>
Date: Wed Mar 14 22:25:50 2012 +0000
Replaced Module-Init-Tools with Kmod
diff --git a/BOOK/boot/alpha-chapter.xml b/BOOK/boot/alpha-chapter.xml
index f6d4af2..d5eb71e 100644
--- a/BOOK/boot/alpha-chapter.xml
+++ b/BOOK/boot/alpha-chapter.xml
@@ -17,7 +17,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/module-init-tools.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/kernel.xml"/>
diff --git a/BOOK/boot/common/kmod.xml b/BOOK/boot/common/kmod.xml
new file mode 100644
index 0000000..268c615
--- /dev/null
+++ b/BOOK/boot/common/kmod.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
+ %general-entities;
+]>
+
+<sect1 id="ch-boot-kmod" role="wrap">
+ <?dbhtml filename="kmod.html"?>
+
+ <title>Kmod-&kmod-version;</title>
+
+ <indexterm zone="ch-boot-kmod">
+ <primary sortas="a-Kmod">Kmod</primary>
+ <secondary>boot</secondary>
+ </indexterm>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../final-system/common/kmod.xml"
+ xpointer="xpointer(//*[@role='package'])"/>
+
+ <sect2 role="installation">
+ <title>Installation of Kmod</title>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../final-system/common/kmod.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>./configure --prefix=/tools \
+ --bindir=/bin --with-rootlibdir=/lib \
+ --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../final-system/common/kmod.xml"
+ xpointer="xpointer(//*[@os='d'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../final-system/common/kmod.xml"
+ xpointer="xpointer(//*[@os='e'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../final-system/common/kmod.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
+
+<screen os="k"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+
+ </sect2>
+
+ <sect2 role="content">
+ <title/>
+
+ <para>Details on this package are located in <xref
+ linkend="contents-kmod" role="."/></para>
+
+ </sect2>
+
+</sect1>
diff --git a/BOOK/boot/common/module-init-tools.xml b/BOOK/boot/common/module-init-tools.xml
deleted file mode 100644
index a62b206..0000000
--- a/BOOK/boot/common/module-init-tools.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-]>
-
-<sect1 id="ch-boot-module-init-tools" role="wrap">
- <?dbhtml filename="module-init-tools.html"?>
-
- <title>Module-Init-Tools-&module-init-tools-version;</title>
-
- <indexterm zone="ch-boot-module-init-tools">
- <primary sortas="a-Module-Init-Tools">Module-Init-Tools</primary>
- <secondary>boot</secondary>
- </indexterm>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../final-system/common/module-init-tools.xml"
- xpointer="xpointer(//*[@role='package'])"/>
-
- <sect2 role="installation">
- <title>Installation of Module-Init-Tools</title>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../final-system/common/module-init-tools.xml"
- xpointer="xpointer(//*[@os='p1'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../final-system/common/module-init-tools.xml"
- xpointer="xpointer(//*[@os='p2'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../final-system/common/module-init-tools.xml"
- xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f"><userinput>./configure --prefix=/usr \
- --bindir=/bin --sbindir=/sbin \
- --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../final-system/common/module-init-tools.xml"
- xpointer="xpointer(//*[@os='h'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../final-system/common/module-init-tools.xml"
- xpointer="xpointer(//*[@os='i'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../final-system/common/module-init-tools.xml"
- xpointer="xpointer(//*[@os='j'])"/>
-
-<screen os="k"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
-
- </sect2>
-
- <sect2 role="content">
- <title/>
-
- <para>Details on this package are located in <xref
- linkend="contents-module-init-tools" role="."/></para>
-
- </sect2>
-
-</sect1>
diff --git a/BOOK/boot/mips-chapter.xml b/BOOK/boot/mips-chapter.xml
index 1afe455..36f4d16 100644
--- a/BOOK/boot/mips-chapter.xml
+++ b/BOOK/boot/mips-chapter.xml
@@ -18,7 +18,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/module-init-tools.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/kernel.xml"/>
diff --git a/BOOK/boot/mips64-64-chapter.xml b/BOOK/boot/mips64-64-chapter.xml
index c4bac6c..83fb4d0 100644
--- a/BOOK/boot/mips64-64-chapter.xml
+++ b/BOOK/boot/mips64-64-chapter.xml
@@ -18,7 +18,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/module-init-tools.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/udev.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/kernel.xml"/>
diff --git a/BOOK/boot/mips64-chapter.xml b/BOOK/boot/mips64-chapter.xml
index d6f1127..cf6f9dd 100644
--- a/BOOK/boot/mips64-chapter.xml
+++ b/BOOK/boot/mips64-chapter.xml
@@ -18,7 +18,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/module-init-tools.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/udev.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/kernel.xml"/>
diff --git a/BOOK/boot/multilib/kmod.xml b/BOOK/boot/multilib/kmod.xml
new file mode 100644
index 0000000..fdcb160
--- /dev/null
+++ b/BOOK/boot/multilib/kmod.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
+ %general-entities;
+]>
+
+<sect1 id="ch-boot-kmod" role="wrap">
+ <?dbhtml filename="kmod.html"?>
+
+ <title>Kmod-&kmod-version;</title>
+
+ <indexterm zone="ch-boot-kmod">
+ <primary sortas="a-Kmod">Kmod</primary>
+ <secondary>boot</secondary>
+ </indexterm>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../final-system/common/kmod.xml"
+ xpointer="xpointer(//*[@role='package'])"/>
+
+ <sect2 role="installation">
+ <title>Installation of Kmod</title>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../final-system/common/kmod.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+ --bindir=/bin --with-rootlibdir=/lib64 \
+ --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../final-system/common/kmod.xml"
+ xpointer="xpointer(//*[@os='d'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../final-system/common/kmod.xml"
+ xpointer="xpointer(//*[@os='e'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../final-system/common/kmod.xml"
+ 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="../../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>
+
+ </sect2>
+
+ <sect2 role="content">
+ <title/>
+
+ <para>Details on this package are located in <xref
+ linkend="contents-kmod" role="."/></para>
+
+ </sect2>
+
+</sect1>
diff --git a/BOOK/boot/multilib/module-init-tools.xml b/BOOK/boot/multilib/module-init-tools.xml
deleted file mode 100644
index 2cacbf0..0000000
--- a/BOOK/boot/multilib/module-init-tools.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-]>
-
-<sect1 id="ch-boot-module-init-tools" role="wrap">
- <?dbhtml filename="module-init-tools.html"?>
-
- <title>Module-Init-Tools-&module-init-tools-version;</title>
-
- <indexterm zone="ch-boot-module-init-tools">
- <primary sortas="a-Module-Init-Tools">Module-Init-Tools</primary>
- <secondary>boot</secondary>
- </indexterm>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../final-system/common/module-init-tools.xml"
- xpointer="xpointer(//*[@role='package'])"/>
-
- <sect2 role="installation">
- <title>Installation of Module-Init-Tools</title>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../final-system/common/module-init-tools.xml"
- xpointer="xpointer(//*[@os='p1'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../final-system/common/module-init-tools.xml"
- xpointer="xpointer(//*[@os='p2'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/module-init-tools.xml"
- xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/ \
- --bindir=/bin --sbindir=/sbin \
- --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/module-init-tools.xml"
- xpointer="xpointer(//*[@os='h'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/module-init-tools.xml"
- xpointer="xpointer(//*[@os='i'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/module-init-tools.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>
-
- <sect2 role="content">
- <title/>
-
- <para>Details on this package are located in <xref
- linkend="contents-module-init-tools" role="."/></para>
-
- </sect2>
-
-</sect1>
diff --git a/BOOK/boot/ppc-chapter.xml b/BOOK/boot/ppc-chapter.xml
index c3796e1..0f22651 100644
--- a/BOOK/boot/ppc-chapter.xml
+++ b/BOOK/boot/ppc-chapter.xml
@@ -17,7 +17,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/module-init-tools.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/kernel.xml"/>
diff --git a/BOOK/boot/ppc64-chapter.xml b/BOOK/boot/ppc64-chapter.xml
index 21e5bc4..c17ca99 100644
--- a/BOOK/boot/ppc64-chapter.xml
+++ b/BOOK/boot/ppc64-chapter.xml
@@ -19,7 +19,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/e2fsprogs-libs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/module-init-tools.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/udev.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/kernel.xml"/>
diff --git a/BOOK/boot/sparc-chapter.xml b/BOOK/boot/sparc-chapter.xml
index a32876b..0dcb928 100644
--- a/BOOK/boot/sparc-chapter.xml
+++ b/BOOK/boot/sparc-chapter.xml
@@ -17,7 +17,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/module-init-tools.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
diff --git a/BOOK/boot/sparc64-64-chapter.xml b/BOOK/boot/sparc64-64-chapter.xml
index e573093..ffb0107 100644
--- a/BOOK/boot/sparc64-64-chapter.xml
+++ b/BOOK/boot/sparc64-64-chapter.xml
@@ -17,7 +17,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/module-init-tools.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/udev.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
diff --git a/BOOK/boot/sparc64-chapter.xml b/BOOK/boot/sparc64-chapter.xml
index 8b220f3..a1c3707 100644
--- a/BOOK/boot/sparc64-chapter.xml
+++ b/BOOK/boot/sparc64-chapter.xml
@@ -17,7 +17,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/module-init-tools.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/udev.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
diff --git a/BOOK/boot/x86-chapter.xml b/BOOK/boot/x86-chapter.xml
index 791206e..feaff93 100644
--- a/BOOK/boot/x86-chapter.xml
+++ b/BOOK/boot/x86-chapter.xml
@@ -17,7 +17,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/module-init-tools.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/kernel.xml"/>
diff --git a/BOOK/boot/x86_64-64-chapter.xml b/BOOK/boot/x86_64-64-chapter.xml
index 5232c7a..0dc02fe 100644
--- a/BOOK/boot/x86_64-64-chapter.xml
+++ b/BOOK/boot/x86_64-64-chapter.xml
@@ -17,7 +17,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/module-init-tools.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/udev.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
diff --git a/BOOK/boot/x86_64-chapter.xml b/BOOK/boot/x86_64-chapter.xml
index 7789061..ce2f62e 100644
--- a/BOOK/boot/x86_64-chapter.xml
+++ b/BOOK/boot/x86_64-chapter.xml
@@ -17,7 +17,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/module-init-tools.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/udev.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
diff --git a/BOOK/final-system/alpha-chapter.xml b/BOOK/final-system/alpha-chapter.xml
index 6e90630..371b684 100644
--- a/BOOK/final-system/alpha-chapter.xml
+++ b/BOOK/final-system/alpha-chapter.xml
@@ -61,7 +61,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/module-init-tools.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
diff --git a/BOOK/final-system/common/module-init-tools.xml b/BOOK/final-system/common/kmod.xml
similarity index 55%
rename from BOOK/final-system/common/module-init-tools.xml
rename to BOOK/final-system/common/kmod.xml
index 9cf5d88..ffd9d66 100644
--- a/BOOK/final-system/common/module-init-tools.xml
+++ b/BOOK/final-system/common/kmod.xml
@@ -5,72 +5,83 @@
%general-entities;
]>
-<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.html"?>
- <title>Module-Init-Tools-&module-init-tools-version;</title>
+ <title>Kmod-&kmod-version;</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>
<sect2 role="package">
<title/>
- <para>The Module-Init-Tools package contains programs for handling kernel
- modules in Linux kernels greater than or equal to version 2.5.47.</para>
+ <para>The Kmod package contains programs for loading, inserting
+ and removing kernel modules for Linux. Kmod replaces the
+ Module-Init-tools package.</para>
</sect2>
<sect2 role="installation">
- <title>Installation of Module-Init-Tools</title>
+ <title>Installation of Kmod</title>
- <para os="p1">The following patch removes warnings caused by Zlib 1.2.6:</para>
+ <para os="a">Prepare Kmod for compilation:</para>
-<screen os="p2"><userinput>patch -Np1 -i ../&module-init-tools-zlib_fix-patch;</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr \
+ --bindir=/bin --sysconfdir=/etc \
+ --with-rootlibdir=/lib \
+ --with-zlib --with-xz</userinput></screen>
- <para os="c">Issue the following commands to perform the tests</para>
-
-<screen os="d"><userinput>sed -i "s/\(make\)\( all\)/\1 DOCBOOKTOMAN=true\2/" tests/runtests &&
-./tests/runtests</userinput></screen>
-
- <para os="e">Prepare Module-Init-Tools for compilation:</para>
-
-<screen os="f"><userinput>./configure --prefix=/usr \
- --bindir=/bin --sbindir=/sbin \
- --enable-zlib-dynamic</userinput></screen>
-
- <variablelist os="g">
+ <variablelist os="c">
<title>The meaning of the configure option:</title>
<varlistentry>
- <term><parameter>--enable-zlib-dynamic</parameter></term>
+ <term><parameter>--with-rootlibdir=/lib</parameter></term>
+ <listitem>
+ <para>Install location for shared libraries.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><parameter>--with-zlib --with-xz</parameter></term>
<listitem>
- <para>This allows the Module-Init-Tools package to handle compressed
- kernel modules.</para>
+ <para>This allows the Kmod package to handle zlib and XZ
+ compressed kernel modules.</para>
</listitem>
</varlistentry>
</variablelist>
- <para os="h">Compile the package:</para>
+ <para os="d">Compile the package:</para>
+
+<screen os="e"><userinput>make</userinput></screen>
-<screen os="i"><userinput>make DOCBOOKTOMAN=true</userinput></screen>
+ <para os="f">To test the results, issue: <userinput>make check</userinput></para>
- <para os="j">Install the package:</para>
+ <para os="g">Install the package:</para>
-<screen os="k"><userinput>make install</userinput></screen>
+<screen os="h"><userinput>make install</userinput></screen>
+ <para os="i">Create symbolic links for programs that expect Module-Init-Tools.</para>
+
+<screen os="j"><userinput>ln -sv kmod /bin/lsmod
+ln -sv ../bin/kmod /sbin/depmod
+ln -sv ../bin/kmod /sbin/insmod
+ln -sv ../bin/kmod /sbin/modprobe
+ln -sv ../bin/kmod /sbin/modinfo
+ln -sv ../bin/kmod /sbin/rmmod</userinput></screen>
+
</sect2>
- <sect2 id="contents-module-init-tools" role="content">
- <title>Contents of Module-Init-Tools</title>
+ <sect2 id="contents-kmod" role="content">
+ <title>Contents of Kmod</title>
<segmentedlist>
<segtitle>Installed programs</segtitle>
<seglistitem>
- <seg>depmod, insmod, insmod.static, lsmod, modinfo, modprobe, and
+ <seg>depmod, insmod, lsmod, modinfo, modprobe, and
rmmod</seg>
</seglistitem>
</segmentedlist>
@@ -87,7 +98,7 @@
the existing set of modules; this dependency file is used by
<command>modprobe</command> to automatically load the required
modules</para>
- <indexterm zone="ch-system-module-init-tools depmod">
+ <indexterm zone="ch-system-kmod depmod">
<primary sortas="b-depmod">depmod</primary>
</indexterm>
</listitem>
@@ -97,27 +108,17 @@
<term><command>insmod</command></term>
<listitem>
<para>Installs a loadable module in the running kernel</para>
- <indexterm zone="ch-system-module-init-tools insmod">
+ <indexterm zone="ch-system-kmod insmod">
<primary sortas="b-insmod">insmod</primary>
</indexterm>
</listitem>
</varlistentry>
- <varlistentry id="insmod.static">
- <term><command>insmod.static</command></term>
- <listitem>
- <para>A statically compiled version of <command>insmod</command></para>
- <indexterm zone="ch-system-module-init-tools insmod.static">
- <primary sortas="b-insmod.static">insmod.static</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
<varlistentry id="lsmod">
<term><command>lsmod</command></term>
<listitem>
<para>Lists currently loaded modules</para>
- <indexterm zone="ch-system-module-init-tools lsmod">
+ <indexterm zone="ch-system-kmod lsmod">
<primary sortas="b-lsmod">lsmod</primary>
</indexterm>
</listitem>
@@ -128,7 +129,7 @@
<listitem>
<para>Examines an object file associated with a kernel module and
displays any information that it can glean</para>
- <indexterm zone="ch-system-module-init-tools modinfo">
+ <indexterm zone="ch-system-kmod modinfo">
<primary sortas="b-modinfo">modinfo</primary>
</indexterm>
</listitem>
@@ -139,7 +140,7 @@
<listitem>
<para>Uses a dependency file, created by <command>depmod</command>,
to automatically load relevant modules</para>
- <indexterm zone="ch-system-module-init-tools modprobe">
+ <indexterm zone="ch-system-kmod modprobe">
<primary sortas="b-modprobe">modprobe</primary>
</indexterm>
</listitem>
@@ -149,7 +150,7 @@
<term><command>rmmod</command></term>
<listitem>
<para>Unloads modules from the running kernel</para>
- <indexterm zone="ch-system-module-init-tools rmmod">
+ <indexterm zone="ch-system-kmod rmmod">
<primary sortas="b-rmmod">rmmod</primary>
</indexterm>
</listitem>
diff --git a/BOOK/final-system/mips-chapter.xml b/BOOK/final-system/mips-chapter.xml
index 44f61f6..8febc9f 100644
--- a/BOOK/final-system/mips-chapter.xml
+++ b/BOOK/final-system/mips-chapter.xml
@@ -61,7 +61,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/module-init-tools.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
diff --git a/BOOK/final-system/mips64-64-chapter.xml b/BOOK/final-system/mips64-64-chapter.xml
index a0d0210..50e7cb8 100644
--- a/BOOK/final-system/mips64-64-chapter.xml
+++ b/BOOK/final-system/mips64-64-chapter.xml
@@ -61,7 +61,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/module-init-tools.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
diff --git a/BOOK/final-system/mips64-chapter.xml b/BOOK/final-system/mips64-chapter.xml
index 1e0f58a..13aa921 100644
--- a/BOOK/final-system/mips64-chapter.xml
+++ b/BOOK/final-system/mips64-chapter.xml
@@ -104,7 +104,9 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-n32.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/module-init-tools.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-n32.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
diff --git a/BOOK/final-system/multilib/module-init-tools.xml b/BOOK/final-system/multilib/kmod-64bit.xml
similarity index 51%
rename from BOOK/final-system/multilib/module-init-tools.xml
rename to BOOK/final-system/multilib/kmod-64bit.xml
index 613a98e..d767742 100644
--- a/BOOK/final-system/multilib/module-init-tools.xml
+++ b/BOOK/final-system/multilib/kmod-64bit.xml
@@ -5,70 +5,68 @@
%general-entities;
]>
-<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"
- xpointer="xpointer(//*[@os='p1'])"/>
+ href="../common/kmod.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/module-init-tools.xml"
- xpointer="xpointer(//*[@os='p2'])"/>
+<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/module-init-tools.xml"
+ 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>
diff --git a/BOOK/final-system/multilib/kmod-n32.xml b/BOOK/final-system/multilib/kmod-n32.xml
new file mode 100644
index 0000000..cc59870
--- /dev/null
+++ b/BOOK/final-system/multilib/kmod-n32.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
+ %general-entities;
+]>
+
+<sect1 id="ch-system-kmod-n32" role="wrap">
+ <?dbhtml filename="kmod-n32.html"?>
+
+ <title>Kmod-&kmod-version; N32 Libraries</title>
+
+ <indexterm zone="ch-system-kmod-n32">
+ <primary sortas="a-Kmod">Kmod</primary>
+ <secondary>N32</secondary>
+ </indexterm>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/kmod.xml"
+ xpointer="xpointer(//*[@role='package'])"/>
+
+ <sect2 role="installation">
+ <title>Installation of Kmod N32 Libraries</title>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/kmod.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+ <screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} CC="gcc ${BUILD32}" \
+ ./configure --prefix=/usr \
+ --bindir=/bin --sysconfdir=/etc \
+ --with-rootlibdir=/lib \
+ --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/kmod.xml"
+ xpointer="xpointer(//*[@os='d'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/kmod.xml"
+ xpointer="xpointer(//*[@os='e'])"/>
+
+ <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/kmod.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
+
+ <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="../common/kmod.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/kmod.xml"
+ xpointer="xpointer(//*[@os='j'])"/>
+
+ </sect2>
+
+ <sect2 role="content">
+ <title/>
+
+ <para>Details on this package are located in <xref
+ linkend="contents-kmod" role="."/></para>
+
+ </sect2>
+
+</sect1>
diff --git a/BOOK/final-system/multilib/kmod.xml b/BOOK/final-system/multilib/kmod.xml
new file mode 100644
index 0000000..787d4b9
--- /dev/null
+++ b/BOOK/final-system/multilib/kmod.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
+ %general-entities;
+]>
+
+<sect1 id="ch-system-kmod-32" role="wrap">
+ <?dbhtml filename="kmod.html"?>
+
+ <title>Kmod-&kmod-version; 32 Bit Libraries</title>
+
+ <indexterm zone="ch-system-kmod-32">
+ <primary sortas="a-Kmod">Kmod</primary>
+ <secondary>32 Bit</secondary>
+ </indexterm>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/kmod.xml"
+ xpointer="xpointer(//*[@role='package'])"/>
+
+ <sect2 role="installation">
+ <title>Installation of Kmod</title>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ 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/kmod.xml"
+ xpointer="xpointer(//*[@os='d'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/kmod.xml"
+ xpointer="xpointer(//*[@os='e'])"/>
+
+ <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/kmod.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
+
+ <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="../common/kmod.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/kmod.xml"
+ xpointer="xpointer(//*[@os='j'])"/>
+
+ </sect2>
+
+ <sect2 role="content">
+ <title/>
+
+ <para>Details on this package are located in <xref
+ linkend="contents-kmod" role="."/></para>
+
+ </sect2>
+
+</sect1>
diff --git a/BOOK/final-system/ppc-chapter.xml b/BOOK/final-system/ppc-chapter.xml
index 566f643..e6b0504 100644
--- a/BOOK/final-system/ppc-chapter.xml
+++ b/BOOK/final-system/ppc-chapter.xml
@@ -61,7 +61,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/module-init-tools.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
diff --git a/BOOK/final-system/ppc64-chapter.xml b/BOOK/final-system/ppc64-chapter.xml
index d8c3484..3cd288a 100644
--- a/BOOK/final-system/ppc64-chapter.xml
+++ b/BOOK/final-system/ppc64-chapter.xml
@@ -83,7 +83,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/module-init-tools.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
diff --git a/BOOK/final-system/sparc-chapter.xml b/BOOK/final-system/sparc-chapter.xml
index 3960736..48ba031 100644
--- a/BOOK/final-system/sparc-chapter.xml
+++ b/BOOK/final-system/sparc-chapter.xml
@@ -61,7 +61,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/module-init-tools.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
diff --git a/BOOK/final-system/sparc64-64-chapter.xml b/BOOK/final-system/sparc64-64-chapter.xml
index 7b32a59..7ae39c8 100644
--- a/BOOK/final-system/sparc64-64-chapter.xml
+++ b/BOOK/final-system/sparc64-64-chapter.xml
@@ -61,7 +61,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/module-init-tools.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
diff --git a/BOOK/final-system/sparc64-chapter.xml b/BOOK/final-system/sparc64-chapter.xml
index 4e1982d..0bb0a3f 100644
--- a/BOOK/final-system/sparc64-chapter.xml
+++ b/BOOK/final-system/sparc64-chapter.xml
@@ -83,7 +83,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/module-init-tools.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
diff --git a/BOOK/final-system/x86-chapter.xml b/BOOK/final-system/x86-chapter.xml
index 541320d..ff26bf4 100644
--- a/BOOK/final-system/x86-chapter.xml
+++ b/BOOK/final-system/x86-chapter.xml
@@ -61,7 +61,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/module-init-tools.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
diff --git a/BOOK/final-system/x86_64-64-chapter.xml b/BOOK/final-system/x86_64-64-chapter.xml
index 729a648..4f62888 100644
--- a/BOOK/final-system/x86_64-64-chapter.xml
+++ b/BOOK/final-system/x86_64-64-chapter.xml
@@ -61,7 +61,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/module-init-tools.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
diff --git a/BOOK/final-system/x86_64-chapter.xml b/BOOK/final-system/x86_64-chapter.xml
index a909ae1..79f4104 100644
--- a/BOOK/final-system/x86_64-chapter.xml
+++ b/BOOK/final-system/x86_64-chapter.xml
@@ -83,7 +83,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/module-init-tools.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 1a40441..3b6b526 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,15 @@
-->
<listitem>
+ <para>14 March 2012</para>
+ <itemizedlist>
+ <listitem>
+ <para>[Jonathan] - Replaces Module-Init-tools with Kmod.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>3 March 2012</para>
<itemizedlist>
<listitem>
diff --git a/BOOK/materials/common/packages.xml b/BOOK/materials/common/packages.xml
index 4f2f9a2..ae02cde 100644
--- a/BOOK/materials/common/packages.xml
+++ b/BOOK/materials/common/packages.xml
@@ -294,6 +294,15 @@
</varlistentry>
<varlistentry>
+ <term>Kmod (&kmod-version;) - <token>&kmod-size;</token>:</term>
+ <listitem>
+ <para>Home page: <ulink url="&kmod-home;"/></para>
+ <para>Download: <ulink url="&kmod-url;"/></para>
+ <para>MD5 sum: <literal>&kmod-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>Less (&less-version;) - <token>&less-size;</token>:</term>
<listitem>
<para>Home page: <ulink url="&less-home;"/></para>
@@ -375,15 +384,6 @@
</varlistentry>
<varlistentry>
- <term>Module-Init-Tools (&module-init-tools-version;) - <token>&module-init-tools-size;</token>:</term>
- <listitem>
- <para>Home page: <ulink url="&module-init-tools-home;"/></para>
- <para>Download: <ulink url="&module-init-tools-url;"/></para>
- <para>MD5 sum: <literal>&module-init-tools-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term>MPC (&mpc-version;) - <token>&mpc-size;</token>:</term>
<listitem>
<para>Home page: <ulink url="&mpc-home;"/></para>
diff --git a/BOOK/materials/common/patches.xml b/BOOK/materials/common/patches.xml
index c80399a..2b29a59 100644
--- a/BOOK/materials/common/patches.xml
+++ b/BOOK/materials/common/patches.xml
@@ -118,15 +118,6 @@
</varlistentry>
<varlistentry>
- <term>Module-init-tools Zlib Patch - <token>&module-init-tools-zlib_fix-patch-size;</token>:</term>
- <listitem>
- <para>Download: <ulink
- url="&patches-root;&module-init-tools-zlib_fix-patch;"/></para>
- <para>MD5 sum: <literal>&module-init-tools-zlib_fix-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term>Ncurses Bash Patch - <token>&ncurses-bashfix-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 256b727..d86bd50 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -243,6 +243,12 @@
<!ENTITY kbd-md5 "8143e179a0f3c25646ce5085e8777200">
<!ENTITY kbd-home " ">
+<!ENTITY kmod-version "6">
+<!ENTITY kmod-size "1.1 MB">
+<!ENTITY kmod-url "&kernel;/linux/utils/kernel/kmod/kmod-&kmod-version;.tar.bz">
+<!ENTITY kmod-md5 "9bd1ad9e725eee79e55589d405b1f0a0">
+<!ENTITY kmod-home "http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary">
+
<!ENTITY less-version "444">
<!ENTITY less-size "304 KB">
<!ENTITY less-url "http://www.greenwoodsoftware.com/less/less-&less-version;.tar.gz">
@@ -299,12 +305,6 @@
<!ENTITY man-pages-md5 "6e3b0cee3c4332e7d64b2ddb4bc10831">
<!ENTITY man-pages-home "http://www.win.tue.nl/~aeb/linux/man">
-<!ENTITY module-init-tools-version "3.15">
-<!ENTITY module-init-tools-size "188 KB">
-<!ENTITY module-init-tools-url "&kernel;/linux/utils/kernel/module-init-tools/module-init-tools-&module-init-tools-version;.tar.xz">
-<!ENTITY module-init-tools-md5 "e371d2bcd3db194114c8b048f32bf9e4">
-<!ENTITY module-init-tools-home "http://www.kerneltools.org/KernelTools.org">
-
<!ENTITY mpc-version "0.9">
<!ENTITY mpc-size "556 KB">
<!ENTITY mpc-url "http://www.multiprecision.org/mpc/download/mpc-&mpc-version;.tar.gz">
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 7f266f5..6a808d7 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -52,10 +52,6 @@
<!ENTITY man-i18n-patch-md5 "a5aba0cb5a95a7945db8c882334b7dab">
<!ENTITY man-i18n-patch-size "12 KB">
-<!ENTITY module-init-tools-zlib_fix-patch "module-init-tools-&module-init-tools-version;-zlib_fix-1.patch">
-<!ENTITY module-init-tools-zlib_fix-patch-md5 "8aa6600f5cf9835fa391bd685abcf603">
-<!ENTITY module-init-tools-zlib_fix-patch-size "4 KB">
-
<!ENTITY ncurses-bashfix-patch "ncurses-&ncurses-version;-bash_fix-1.patch">
<!ENTITY ncurses-bashfix-patch-md5 "c6f7f2ab0ebaf7721ebeb266641352db">
<!ENTITY ncurses-bashfix-patch-size "4 KB">
-----------------------------------------------------------------------
Summary of changes:
BOOK/boot/alpha-chapter.xml | 2 +-
.../common/gzip.xml => boot/common/kmod.xml} | 35 ++++----
BOOK/boot/common/module-init-tools.xml | 65 -------------
BOOK/boot/mips-chapter.xml | 2 +-
BOOK/boot/mips64-64-chapter.xml | 2 +-
BOOK/boot/mips64-chapter.xml | 2 +-
BOOK/boot/multilib/kmod.xml | 68 ++++++++++++++
BOOK/boot/multilib/module-init-tools.xml | 67 --------------
BOOK/boot/ppc-chapter.xml | 2 +-
BOOK/boot/ppc64-chapter.xml | 2 +-
BOOK/boot/sparc-chapter.xml | 2 +-
BOOK/boot/sparc64-64-chapter.xml | 2 +-
BOOK/boot/sparc64-chapter.xml | 2 +-
BOOK/boot/x86-chapter.xml | 2 +-
BOOK/boot/x86_64-64-chapter.xml | 2 +-
BOOK/boot/x86_64-chapter.xml | 2 +-
BOOK/final-system/alpha-chapter.xml | 2 +-
.../common/{module-init-tools.xml => kmod.xml} | 97 ++++++++++----------
BOOK/final-system/mips-chapter.xml | 2 +-
BOOK/final-system/mips64-64-chapter.xml | 2 +-
BOOK/final-system/mips64-chapter.xml | 4 +-
.../multilib/{less.xml => kmod-64bit.xml} | 47 +++++-----
.../multilib/{xz-n32.xml => kmod-n32.xml} | 46 +++++-----
.../multilib/{util-linux.xml => kmod.xml} | 45 +++++----
BOOK/final-system/multilib/module-init-tools.xml | 74 ---------------
BOOK/final-system/ppc-chapter.xml | 2 +-
BOOK/final-system/ppc64-chapter.xml | 3 +-
BOOK/final-system/sparc-chapter.xml | 2 +-
BOOK/final-system/sparc64-64-chapter.xml | 2 +-
BOOK/final-system/sparc64-chapter.xml | 3 +-
BOOK/final-system/x86-chapter.xml | 2 +-
BOOK/final-system/x86_64-64-chapter.xml | 2 +-
BOOK/final-system/x86_64-chapter.xml | 3 +-
BOOK/introduction/common/changelog.xml | 9 ++
BOOK/materials/common/packages.xml | 18 ++--
BOOK/materials/common/patches.xml | 9 --
BOOK/packages.ent | 12 +-
BOOK/patches.ent | 4 -
38 files changed, 260 insertions(+), 389 deletions(-)
copy BOOK/{temp-system/common/gzip.xml => boot/common/kmod.xml} (57%)
delete mode 100644 BOOK/boot/common/module-init-tools.xml
create mode 100644 BOOK/boot/multilib/kmod.xml
delete mode 100644 BOOK/boot/multilib/module-init-tools.xml
rename BOOK/final-system/common/{module-init-tools.xml => kmod.xml} (55%)
copy BOOK/final-system/multilib/{less.xml => kmod-64bit.xml} (60%)
copy BOOK/final-system/multilib/{xz-n32.xml => kmod-n32.xml} (62%)
copy BOOK/final-system/multilib/{util-linux.xml => kmod.xml} (62%)
delete mode 100644 BOOK/final-system/multilib/module-init-tools.xml
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list