Changeset 229ed25 for BOOK/final-system/common/iproute2.xml

Timestamp:

Jan 4, 2014, 12:03:38 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f90d077

Parents:

ec008670 (diff), e57ce38 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:

• BOOK/final-system/common/iproute2.xml (modified) (3 diffs)

BOOK/final-system/common/iproute2.xml

@@ -29 +29 @@
     program, which is dependent on Berkeley DB.  Because <command>arpd</command>
     is not a very common requirement on a base Linux system, remove the
-    dependency on Berkeley DB by applying the <command>sed</command> command
+    dependency on Berkeley DB by using the commands
     below. If the <command>arpd</command> binary is needed, instructions for
     compiling Berkeley DB can be found in CBLFS at <ulink
     url="&cblfs-root;index.php/Berkeley_DB"/>.</para>
 
-<screen os="s2"><userinput>sed -i '/^TARGETS/s@arpd@@g' misc/Makefile</userinput></screen>
+<screen os="s2"><userinput>sed -i '/^TARGETS/s@arpd@@g' misc/Makefile
+sed -i '/ARPD/d' Makefile
+rm -v man/man8/arpd.8</userinput></screen>
+
+    <para os="f1">Remove unused libnl headers:</para>
+    
+    <screen os="f2"><userinput>sed -i '/netlink\//d' ip/ipl2tp.c</userinput></screen>
 
     <para os="a">Compile the package:</para>
@@ -83 +89 @@
 
       <seglistitem>
-        <seg>ctstat (link to lnstat), genl, ifcfg, ifstat, ip, lnstat, nstat,
-        routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
+        <seg>bridge, ctstat (link to lnstat), genl, ifcfg, ifstat, ip, lnstat,
+        nstat, routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
         and tc</seg>
         <seg>/etc/iproute2, /lib/tc, /usr/lib/tc, /usr/share/doc/iproute2</seg>
@@ -94 +100 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="bridge">
+        <term><command>bridge</command></term>
+        <listitem>
+          <para>Configures network bridges</para>
+          <indexterm zone="ch-system-iproute2 bridge">
+            <primary sortas="b-bridge">bridge</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
       <varlistentry id="ctstat">