Changeset 5afe4f3

Timestamp:

Sep 6, 2015, 10:35:35 PM (9 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

master, systemd

Children:

7da6efb

Parents:

e7c1e7c

Message:

Update build commands and installed files entries for iputils update.

Location:

BOOK/final-system

Files:

• common/iputils.xml (modified) (6 diffs)
• multilib/iputils.xml (modified) (1 diff)

BOOK/final-system/common/iputils.xml

@@ -25 +25 @@
     <title>Installation of IPutils</title>
 
-    <para os="p1">IPutils has various issues addressed by the following
-    patch:</para>
+    <para os="p1">Apply the following patch for man-pages and build edits:</para>
 
-<screen os="p2"><userinput>patch -Np1 -i ../&iputils-fixes-patch;</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../&iputils-build-patch;</userinput></screen>
 
     <para os="a">Compile the package:</para>
 
 <screen os="b"><userinput>make \
-    IPV4_TARGETS="tracepath ping clockdiff rdisc" \
-    IPV6_TARGETS="tracepath6 traceroute6"</userinput></screen>
+    TARGETS="clockdiff ping rdisc tracepath tracepath6 traceroute6</userinput></screen>
 
     <para os="c">This package does not come with a test suite.</para>
@@ -45 +43 @@
 install -v -m755 tracepath /usr/bin
 install -v -m755 trace{path,route}6 /usr/bin
-install -v -m644 doc/*.8 /usr/share/man/man8</userinput></screen>
+install -v -m644 doc/*.8 /usr/share/man/man8
+ln -sv ping /bin/ping4
+ln -sv ping /bin/ping6</userinput></screen>
 
   </sect2>
@@ -56 +56 @@
 
       <seglistitem>
-        <seg>clockdiff, ping, rdisc, tracepath, tracepath6, traceroute6</seg>
+        <seg>clockdiff, ping, rdisc, tracepath, tracepath6, traceroute6, ping4 (link to ping), ping6 (link to ping)</seg>
       </seglistitem>
     </segmentedlist>
@@ -89 +89 @@
         <listitem>
           <para>Sends echo-request packets and reports how long the replies
-          take. This is the IPV4 version</para>
+          take.</para>
           <indexterm zone="ch-system-iputils ping">
             <primary sortas="b-ping">ping</primary>
@@ -95 +95 @@
         </listitem>
       </varlistentry>
-<!--
+
+      <varlistentry id="ping4">
+        <term><command>ping</command></term>
+        <listitem>
+          <para>Executes ping for IPV4 support</para>
+          <indexterm zone="ch-system-iputils ping4">
+            <primary sortas="b-ping4">ping</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="ping6">
         <term><command>ping6</command></term>
         <listitem>
-          <para>Sends echo-request packets and reports how long the replies
-          take. This is the IPV6 version</para>
+          <para>Executes ping for  IPV6 support</para>
           <indexterm zone="ch-system-iputils ping6">
             <primary sortas="b-ping6">ping6</primary>
@@ -106 +115 @@
         </listitem>
       </varlistentry>
--->
+
       <varlistentry id="rdisc">
         <term><command>rdisc</command></term>

BOOK/final-system/multilib/iputils.xml

@@ -35 +35 @@
 
 <screen os="b"><userinput>make CC="gcc ${BUILD64}" \
-    IPV4_TARGETS="tracepath ping clockdiff rdisc" \
-    IPV6_TARGETS="tracepath6 traceroute6"</userinput></screen>
+    TARGETS="clockdiff ping rdisc tracepath tracepath6 traceroute6</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"