Changeset 3c65c99 in clfs-embedded

Timestamp:

Feb 4, 2007, 9:20:27 PM (17 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

master

Children:

82b88f2

Parents:

5956516

Message:

Updates to Iptables, Typos, and Validation error fixes

Files:

• BOOK/beyond-clfs3/common/dropbear.xml (modified) (1 diff)
• BOOK/beyond-clfs3/common/iptables.xml (modified) (1 diff)
• BOOK/beyond-clfs3/common/patches.xml (modified) (1 diff)
• BOOK/final-system/x86/busybox.xml (modified) (1 diff)
• BOOK/patches.ent (modified) (1 diff)
• patches/iptables-1.3.7-do_multi-1.patch (added)

BOOK/beyond-clfs3/common/dropbear.xml

@@ -31 +31 @@
     <para os="p1">Dropbear doesn't accept our ${CLFS_TARGET} by default, so a patch is needed to make it recognise it:</para>
 
-    <screen os="p2"><userinput>patch -Np1 -i ../dropbear-&dropbear-version;-autotools-1.patch</userinput></screen>
+    <screen os="p2"><userinput>patch -Np1 -i ../&dropbear-autotool-patch;</userinput></screen>
 
     <para os="p3">Dropbear incorrectly calls ld instead of gcc for linking, so fix it:</para>
 
-    <screen os="p4"><userinput>cp Makefile.in Makefile.in.orig
+    <screen os="p4"><userinput>cp Makefile.in{,.orig}
 sed -e s/@LD@/@CC@/ Makefile.in.orig > Makefile.in</userinput></screen>
 

BOOK/beyond-clfs3/common/iptables.xml

@@ -26 +26 @@
     <title>Installation of iptables</title>
 
+   <para os="p1">Fixes Compile Issue with DO_MULTI=1:</para>
+
+    <screen os="p2"><userinput>patch -Np1 -i ../&iptables-domulti-patch;</userinput></screen>
+
     <para os="a">Compile the package:</para>
 
-<screen os="b"><userinput>make CC="${CC} ${BUILD}" COPT_FLAGS="-Os" LD=${LD} DO_MULTI=0 PREFIX=/usr \
+<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>
 
     <para os="c">Install the package:</para>
 
-<screen os="d"><userinput>make DO_MULTI=0 PREFIX=/usr \
+<screen os="d"><userinput>make DO_MULTI=1 PREFIX=/usr \
    LIBDIR=/lib BINDIR=/sbin install DESTDIR=${CLFS}</userinput></screen>
 

BOOK/beyond-clfs3/common/patches.xml

@@ -27 +27 @@
     </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>
+      </listitem>
+    </varlistentry>
+
   </variablelist>
 

BOOK/final-system/x86/busybox.xml

@@ -34 +34 @@
     <ulink url="http://busybox.net/downloads/fixes-&busybox-version;"/></para>
 
-    <para os="p2"Here's an example of how to apply the patches from Busybox's website
+    <para os="p2">Here's an example of how to apply the patches from Busybox's website
     replace {patch_name} with the name of the patch:</para>
 

BOOK/patches.ent

@@ -43 +43 @@
 <!ENTITY dropbear-autotool-patch-size "56 KB">
 
+<!ENTITY iptables-domulti-patch "iptables-&iptables-version;-do_multi-1.patch">
+<!ENTITY iptables-domulti-patch-md5 "b0c73cb8ae3a7e767b6ae9eedce09436">
+<!ENTITY iptables-domulti-patch-size "4 KB">
+
 <!-- MIPS Patches -->