[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.1.0-718-g37a6db2
git
git at cross-lfs.org
Sun Apr 13 00:22:42 PDT 2014
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, systemd has been updated
via 37a6db23b3c86ebde373f807f29617f0a84615f0 (commit)
via ee7300b321005ee26db8409b3bc794039b6e7766 (commit)
from 45c30d17f01fca1b09f390c4aa00b2028860c53b (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 37a6db23b3c86ebde373f807f29617f0a84615f0
Author: Chris Staub <chris at beaker67.com>
Date: Sun Apr 13 03:22:38 2014 -0400
Simplified kmod pages in boot section with xincludes
diff --git a/BOOK/boot/common/kmod.xml b/BOOK/boot/common/kmod.xml
index 54ccd18..b5cfee7 100644
--- a/BOOK/boot/common/kmod.xml
+++ b/BOOK/boot/common/kmod.xml
@@ -58,9 +58,9 @@ zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib -lz" \
<screen os="h"><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 -sv kmod ${CLFS}/bin/lsmod
ln -sv ../bin/kmod ${CLFS}/sbin/depmod
diff --git a/BOOK/boot/multilib/kmod.xml b/BOOK/boot/multilib/kmod.xml
index 7f62316..d84451d 100644
--- a/BOOK/boot/multilib/kmod.xml
+++ b/BOOK/boot/multilib/kmod.xml
@@ -48,18 +48,17 @@ CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
href="../../final-system/common/kmod.xml"
xpointer="xpointer(//*[@os='g'])"/>
-<screen os="h"><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>
+ <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='j'])"/>
</sect2>
diff --git a/BOOK/boot/x86_64-64/kmod.xml b/BOOK/boot/x86_64-64/kmod.xml
index cda15a9..f0aad1d 100644
--- a/BOOK/boot/x86_64-64/kmod.xml
+++ b/BOOK/boot/x86_64-64/kmod.xml
@@ -47,18 +47,17 @@ CC="${CC} ${BUILD64}" ./configure --prefix=/tools --bindir=/bin \
href="../../final-system/common/kmod.xml"
xpointer="xpointer(//*[@os='g'])"/>
-<screen os="h"><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>
+ <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='j'])"/>
</sect2>
commit ee7300b321005ee26db8409b3bc794039b6e7766
Author: Chris Staub <chris at beaker67.com>
Date: Sun Apr 13 03:11:12 2014 -0400
Added command explanation to kmod instructions
diff --git a/BOOK/boot/common/kmod.xml b/BOOK/boot/common/kmod.xml
index 4765a73..54ccd18 100644
--- a/BOOK/boot/common/kmod.xml
+++ b/BOOK/boot/common/kmod.xml
@@ -31,6 +31,19 @@ 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</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"
href="../../final-system/common/kmod.xml"
xpointer="xpointer(//*[@os='d'])"/>
@@ -43,7 +56,7 @@ zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib -lz" \
href="../../final-system/common/kmod.xml"
xpointer="xpointer(//*[@os='g'])"/>
-<screen os="k"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+<screen os="h"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/kmod.xml"
diff --git a/BOOK/boot/multilib/kmod.xml b/BOOK/boot/multilib/kmod.xml
index d401d64..7f62316 100644
--- a/BOOK/boot/multilib/kmod.xml
+++ b/BOOK/boot/multilib/kmod.xml
@@ -33,6 +33,10 @@ CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
--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"
href="../../final-system/common/kmod.xml"
xpointer="xpointer(//*[@os='d'])"/>
@@ -44,7 +48,7 @@ CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
href="../../final-system/common/kmod.xml"
xpointer="xpointer(//*[@os='g'])"/>
-<screen os="k"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+<screen os="h"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/kmod.xml"
diff --git a/BOOK/boot/x86_64-64/kmod.xml b/BOOK/boot/x86_64-64/kmod.xml
index 4c8935f..cda15a9 100644
--- a/BOOK/boot/x86_64-64/kmod.xml
+++ b/BOOK/boot/x86_64-64/kmod.xml
@@ -32,6 +32,10 @@ CC="${CC} ${BUILD64}" ./configure --prefix=/tools --bindir=/bin \
--build=${CLFS_HOST} --host=${CLFS_TARGET} --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"
href="../../final-system/common/kmod.xml"
xpointer="xpointer(//*[@os='d'])"/>
@@ -43,7 +47,7 @@ CC="${CC} ${BUILD64}" ./configure --prefix=/tools --bindir=/bin \
href="../../final-system/common/kmod.xml"
xpointer="xpointer(//*[@os='g'])"/>
-<screen os="k"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+<screen os="h"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/kmod.xml"
-----------------------------------------------------------------------
Summary of changes:
BOOK/boot/common/kmod.xml | 21 +++++++++++++++++----
BOOK/boot/multilib/kmod.xml | 23 +++++++++++++----------
BOOK/boot/x86_64-64/kmod.xml | 23 +++++++++++++----------
3 files changed, 43 insertions(+), 24 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list