[Clfs-commits] commit: r4572 - in /branches/clfs-embedded: BOOK/ BOOK/beyond-clfs/common/ BOOK/bootable/arm/ BOOK/bootable/mips/ BOOK/bootable/wrt/ BOOK/bootable/x86/ patches/
svn at cross-lfs.org
svn at cross-lfs.org
Mon Jan 26 15:14:42 PST 2009
Author: jim
Date: Mon Jan 26 23:14:41 2009
New Revision: 4572
Log:
Updates to IPTables and Dropbear
Added:
branches/clfs-embedded/patches/iptables-1.4.2-fixes-1.patch
Removed:
branches/clfs-embedded/patches/iptables-1.3.7-do_multi-1.patch
Modified:
branches/clfs-embedded/BOOK/beyond-clfs/common/dropbear.xml
branches/clfs-embedded/BOOK/beyond-clfs/common/iptables.xml
branches/clfs-embedded/BOOK/beyond-clfs/common/patches.xml
branches/clfs-embedded/BOOK/bootable/arm/kernel.xml
branches/clfs-embedded/BOOK/bootable/mips/kernel.xml
branches/clfs-embedded/BOOK/bootable/wrt/kernel.xml
branches/clfs-embedded/BOOK/bootable/x86/kernel.xml
branches/clfs-embedded/BOOK/patches.ent
Modified: branches/clfs-embedded/BOOK/beyond-clfs/common/dropbear.xml
==============================================================================
--- branches/clfs-embedded/BOOK/beyond-clfs/common/dropbear.xml (original)
+++ branches/clfs-embedded/BOOK/beyond-clfs/common/dropbear.xml Mon Jan 26 23:14:41 2009
@@ -35,7 +35,7 @@
<para os="a">Configure dropbear:</para>
-<screen os="b"><userinput>CC="${CC} ${BUILD}" ./configure --prefix=/usr --host=${CLFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>CC="${CC} ${BUILD} -Os" ./configure --prefix=/usr --host=${CLFS_TARGET}</userinput></screen>
<para os="c">Now we will utilize /dev/urandom instead of /dev/random. To allow
this to be utilized we use the following sed:</para>
Modified: branches/clfs-embedded/BOOK/beyond-clfs/common/iptables.xml
==============================================================================
--- branches/clfs-embedded/BOOK/beyond-clfs/common/iptables.xml (original)
+++ branches/clfs-embedded/BOOK/beyond-clfs/common/iptables.xml Mon Jan 26 23:14:41 2009
@@ -27,18 +27,20 @@
<para os="p1">Fixes Compile Issue with DO_MULTI=1:</para>
- <screen os="p2"><userinput>patch -Np1 -i ../&iptables-domulti-patch;</userinput></screen>
+ <screen os="p2"><userinput>patch -Np1 -i ../&iptables-fixes-patch;</userinput></screen>
- <para os="a">Compile the package:</para>
+ <para os="a">Configure IPTables:</para>
-<screen os="b"><userinput>make CC="${CC} ${BUILD}" COPT_FLAGS="-Os" LD=${LD} DO_MULTI=1 PREFIX=/usr \
- KERNEL_DIR=${CLFS}/lib/modules/&linux-version;/build LIBDIR=/lib BINDIR=/sbin</userinput></screen>
+<screen os="b"><userinput>CC="${CC} ${BUILD} -Os" ./configure --prefix=/usr --host=${CLFS_TARGET} \
+ --libexecdir=/lib/iptables --without-kernel -enable-libipq --enable-shared</userinput></screen>
- <para os="c">Install the package:</para>
+ <para os="c">Compile the package:</para>
-<screen os="d"><userinput>make CC="${CC} ${BUILD}" COPT_FLAGS="-Os" LD=${LD} DO_MULTI=1 PREFIX=/usr \
- KERNEL_DIR=${CLFS}/lib/modules/&linux-version;/build LIBDIR=/lib BINDIR=/sbin \
- DESTDIR=${CLFS} install</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
+
+ <para os="e">Install the package:</para>
+
+<screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
</sect2>
Modified: branches/clfs-embedded/BOOK/beyond-clfs/common/patches.xml
==============================================================================
--- branches/clfs-embedded/BOOK/beyond-clfs/common/patches.xml (original)
+++ branches/clfs-embedded/BOOK/beyond-clfs/common/patches.xml Mon Jan 26 23:14:41 2009
@@ -19,18 +19,10 @@
<variablelist role="beyond-clfs3">
<varlistentry>
- <term>Dropbear Autotool Patch - <token>&dropbear-autotool-patch-size;</token>:</term> <listitem>
+ <term>IPTables Fixes Patch - <token>&iptables-fixes-patch-size;</token>:</term> <listitem>
<para>Download: <ulink
- url="&patches-root;&dropbear-autotool-patch;"/></para>
- <para>MD5 sum: <literal>&dropbear-autotool-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>IPTables DO_MULTI Patch - <token>&iptables-domulti-patch-size;</token>:</term> <listitem>
- <para>Download: <ulink
- url="&patches-root;&iptables-domulti-patch;"/></para>
- <para>MD5 sum: <literal>&iptables-domulti-patch-md5;</literal></para>
+ url="&patches-root;&iptables-fixes-patch;"/></para>
+ <para>MD5 sum: <literal>&iptables-fixes-patch-md5;</literal></para>
</listitem>
</varlistentry>
Modified: branches/clfs-embedded/BOOK/bootable/arm/kernel.xml
==============================================================================
--- branches/clfs-embedded/BOOK/bootable/arm/kernel.xml (original)
+++ branches/clfs-embedded/BOOK/bootable/arm/kernel.xml Mon Jan 26 23:14:41 2009
@@ -45,7 +45,7 @@
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='f'])"/>
-<screen os="g"><userinput>make ARCH=arm CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
+<screen os="g"><userinput>make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../x86/kernel.xml"
@@ -59,7 +59,7 @@
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='j'])"/>
-<screen os="k"><userinput>make ARCH=arm CROSS_COMPILE=${CLFS_TARGET}- zImage modules</userinput></screen>
+<screen os="k"><userinput>make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}- zImage modules</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../x86/kernel.xml"
@@ -81,7 +81,7 @@
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='p'])"/>
-<screen os="q"><userinput>make ARCH=arm CROSS_COMPILE=${CLFS_TARGET}- \
+<screen os="q"><userinput>make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}- \
INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -92,7 +92,7 @@
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='s'])"/>
-<screen os="t"><userinput>cp arch/arm/boot/zImage ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
+<screen os="t"><userinput>cp arch/${CLFS_ARCH}/boot/zImage ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../x86/kernel.xml"
Modified: branches/clfs-embedded/BOOK/bootable/mips/kernel.xml
==============================================================================
--- branches/clfs-embedded/BOOK/bootable/mips/kernel.xml (original)
+++ branches/clfs-embedded/BOOK/bootable/mips/kernel.xml Mon Jan 26 23:14:41 2009
@@ -37,14 +37,6 @@
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='d'])"/>
-<para os="d1">The following patch merges changes from Linux-MIPS into the kernel:</para>
-
-<screen os="d2"><userinput>patch -Np1 -i ../linux-&linux-version;-mips-1.patch</userinput></screen>
-
-<para os="d3">The following patch merges updates for Linux-MIPS kernel:</para>
-
-<screen os="d4"><userinput>patch -Np1 -i ../linux-&linux-version;-mips_fixes-1.patch</userinput></screen>
-
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='e'])"/>
@@ -53,7 +45,7 @@
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='f'])"/>
-<screen os="g"><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
+<screen os="g"><userinput>make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../x86/kernel.xml"
@@ -67,7 +59,7 @@
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='j'])"/>
-<screen os="k"><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- vmlinux.bin modules</userinput></screen>
+<screen os="k"><userinput>make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}- </userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../x86/kernel.xml"
@@ -89,7 +81,7 @@
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='p'])"/>
-<screen os="q"><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
+<screen os="q"><userinput>make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}- \
INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -100,7 +92,7 @@
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='s'])"/>
-<screen os="t"><userinput>cp arch/mips/boot/vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
+<screen os="t"><userinput>cp arch/${CLFS_ARCH}/boot/vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../x86/kernel.xml"
Modified: branches/clfs-embedded/BOOK/bootable/wrt/kernel.xml
==============================================================================
--- branches/clfs-embedded/BOOK/bootable/wrt/kernel.xml (original)
+++ branches/clfs-embedded/BOOK/bootable/wrt/kernel.xml Mon Jan 26 23:14:41 2009
@@ -37,30 +37,6 @@
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='d'])"/>
-<para os="d1">The following patch merges changes from Linux-MIPS into the kernel:</para>
-
-<screen os="d2"><userinput>patch -Np1 -i ../linux-&linux-version;-mips-1.patch</userinput></screen>
-
-<para os="d3">The following patch merges updates for Linux-MIPS kernel:</para>
-
-<screen os="d4"><userinput>patch -Np1 -i ../linux-&linux-version;-mips_fixes-1.patch</userinput></screen>
-
-<para os="d5">The following patch adds support for squashed filesystens to the kernel:</para>
-
-<screen os="d6"><userinput>patch -Np1 -i ../linux-&linux-version;-squashfs-1.patch</userinput></screen>
-
-<para os="d7">The following patch backports the d80211 wireless stack to the kernel:</para>
-
-<screen os="d8"><userinput>zcat ../linux-2.6.19-d80211-import-1.patch.gz | patch -Np1</userinput></screen>
-
-<para os="d9">The following patch updates the bcm43xx-d80211 wireless module:</para>
-
-<screen os="da"><userinput>zcat ../linux-2.6.19-bcm43xx-update-1.patch.gz | patch -Np1</userinput></screen>
-
-<para os="db">The following patch adds support for wireless routers to the kernel:</para>
-
-<screen os="dc"><userinput>patch -Np1 -i ../linux-&linux-version;-bcm947xx-2.patch</userinput></screen>
-
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='e'])"/>
@@ -69,7 +45,7 @@
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='f'])"/>
-<screen os="g"><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
+<screen os="g"><userinput>make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../x86/kernel.xml"
@@ -83,7 +59,7 @@
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='j'])"/>
-<screen os="k"><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- vmlinux.bin modules</userinput></screen>
+<screen os="k"><userinput>make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}- vmlinux.bin modules</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../x86/kernel.xml"
@@ -105,7 +81,7 @@
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='p'])"/>
-<screen os="q"><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
+<screen os="q"><userinput>make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}- \
INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -116,7 +92,7 @@
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='s'])"/>
-<screen os="t"><userinput>cp arch/mips/boot/vmlinux.bin ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
+<screen os="t"><userinput>cp arch/${CLFS_ARCH}/boot/vmlinux.bin ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../x86/kernel.xml"
Modified: branches/clfs-embedded/BOOK/bootable/x86/kernel.xml
==============================================================================
--- branches/clfs-embedded/BOOK/bootable/x86/kernel.xml (original)
+++ branches/clfs-embedded/BOOK/bootable/x86/kernel.xml Mon Jan 26 23:14:41 2009
@@ -49,7 +49,7 @@
system will not function properly. If your concerned about disk space, your kernel
should be without modules.</para></note>
-<screen os="g"><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
+<screen os="g"><userinput>make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
<para os="h">Alternatively, <command>make oldconfig</command> may be more
appropriate in some situations. See the <filename>README</filename>
@@ -64,7 +64,7 @@
<para os="j">Compile the kernel image and modules:</para>
-<screen os="k"><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
+<screen os="k"><userinput>make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
<para os="l">If using kernel modules, an
<filename>/etc/modprobe.conf</filename> file may be needed.
@@ -92,7 +92,7 @@
<para os="p">Install the modules, if the kernel configuration uses
them:</para>
-<screen os="q"><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \
+<screen os="q"><userinput>make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}- \
INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
<para os="r">After kernel compilation is complete, additional steps are
@@ -132,11 +132,6 @@
system as it can cause problems for packages you may wish to build
once your base CLFS system is complete.</para>
- <para>Also, the headers in the system's <filename
- class="directory">include</filename> directory should
- <emphasis>always</emphasis> be the ones against which Glibc was
- compiled (from the Linux-Headers package) and should
- <emphasis>never</emphasis> be replaced by the kernel headers.</para>
</warning>
<para os="ab">The bootloaders section contains more information on
Modified: branches/clfs-embedded/BOOK/patches.ent
==============================================================================
--- branches/clfs-embedded/BOOK/patches.ent (original)
+++ branches/clfs-embedded/BOOK/patches.ent Mon Jan 26 23:14:41 2009
@@ -44,13 +44,9 @@
<!-- Beyond patches -->
-<!ENTITY dropbear-autotool-patch "dropbear-&dropbear-version;-autotool-1.patch">
-<!ENTITY dropbear-autotool-patch-md5 "eb5c1803aec03ea0d62cf57b4ef9bcb5">
-<!ENTITY dropbear-autotool-patch-size "56 KB">
-
-<!ENTITY iptables-domulti-patch "iptables-&iptables-version;-do_multi-1.patch">
-<!ENTITY iptables-domulti-patch-md5 "badcc9ea0dc1097d3a0a4f299eaa9219">
-<!ENTITY iptables-domulti-patch-size "4 KB">
+<!ENTITY iptables-fixes-patch "iptables-&iptables-version;-fixes-1.patch">
+<!ENTITY iptables-fixes-patch-md5 "5a8bc894706019ea4f42e506633a49bf">
+<!ENTITY iptables-fixes-patch-size "8 KB">
<!-- MIPS Patches -->
More information about the Clfs-commits
mailing list