[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-3.0.0-systemd-154-g7da6efb

git git at clfs.org
Sun Sep 6 22:40:41 PDT 2015


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, master has been updated
       via  7da6efb41e63d5351f3f1b278a07cc778b8101b8 (commit)
       via  5afe4f372abadb3639dfabe1166c1feba85d107e (commit)
       via  e7c1e7c52820c9bc5f82cb914b2acbc64fe7ad45 (commit)
      from  9163b068a4b2647423cbcb99b8e9a7cf7dd476fd (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 7da6efb41e63d5351f3f1b278a07cc778b8101b8
Author: William Harrington <kb0iic at berzerkula.org>
Date:   Mon Sep 7 00:40:33 2015 -0500

    Update date and get rid of the horrible mispelling of August.

diff --git a/BOOK/general.ent b/BOOK/general.ent
index dec08a8..01d957d 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!ENTITY month "09"> <!-- Use two digits -->
-<!ENTITY month_name "Augut">
-<!ENTITY day "04"> <!-- Use two digits -->
+<!ENTITY month_name "September">
+<!ENTITY day "07"> <!-- Use two digits -->
 <!ENTITY year "2015"> <!-- Use four digits -->
 
 <!ENTITY releasedate "&month_name; &day;, &year;">

commit 5afe4f372abadb3639dfabe1166c1feba85d107e
Author: William Harrington <kb0iic at berzerkula.org>
Date:   Mon Sep 7 00:35:35 2015 -0500

    Update build commands and installed files entries for iputils update.

diff --git a/BOOK/final-system/common/iputils.xml b/BOOK/final-system/common/iputils.xml
index 7749bf7..70d9b23 100644
--- a/BOOK/final-system/common/iputils.xml
+++ b/BOOK/final-system/common/iputils.xml
@@ -24,16 +24,14 @@
   <sect2 role="installation">
     <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>
 
@@ -44,7 +42,9 @@ install -v -m755 clockdiff /usr/bin
 install -v -m755 rdisc /usr/bin
 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>
 
@@ -55,7 +55,7 @@ install -v -m644 doc/*.8 /usr/share/man/man8</userinput></screen>
       <segtitle>Installed programs</segtitle>
 
       <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>
 
@@ -88,24 +88,33 @@ install -v -m644 doc/*.8 /usr/share/man/man8</userinput></screen>
         <term><command>ping</command></term>
         <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>
           </indexterm>
         </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>
           </indexterm>
         </listitem>
       </varlistentry>
--->
+
       <varlistentry id="rdisc">
         <term><command>rdisc</command></term>
         <listitem>
diff --git a/BOOK/final-system/multilib/iputils.xml b/BOOK/final-system/multilib/iputils.xml
index 2136824..3366332 100644
--- a/BOOK/final-system/multilib/iputils.xml
+++ b/BOOK/final-system/multilib/iputils.xml
@@ -34,8 +34,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
 <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"
     href="../common/iputils.xml"

commit e7c1e7c52820c9bc5f82cb914b2acbc64fe7ad45
Author: William Harrington <kb0iic at berzerkula.org>
Date:   Mon Sep 7 00:28:48 2015 -0500

    Rename iputils fixes patch to build patch.

diff --git a/BOOK/materials/common/patches.xml b/BOOK/materials/common/patches.xml
index b5165ae..78867d3 100644
--- a/BOOK/materials/common/patches.xml
+++ b/BOOK/materials/common/patches.xml
@@ -84,11 +84,11 @@
     </varlistentry>
 
     <varlistentry>
-      <term>IPUtils Fixes Patch - <token>&iputils-fixes-patch-size;</token>:</term>
+      <term>IPUtils Fixes Patch - <token>&iputils-build-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
-        url="&patches-root;&iputils-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&iputils-fixes-patch-md5;</literal></para>
+        url="&patches-root;&iputils-build-patch;"/></para>
+        <para>MD5 sum: <literal>&iputils-build-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index ced9438..aff5cda 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -40,9 +40,9 @@
 <!ENTITY iana-etc-numbers_update-patch-md5 "b0e7051fef0b3ba064209a5f3d23bd2a">
 <!ENTITY iana-etc-numbers_update-patch-size "282 KB">
 
-<!ENTITY iputils-fixes-patch "iputils-&iputils-version;-build-1.patch">
-<!ENTITY iputils-fixes-patch-md5 "113c166a13d33a3ec10e1ec65542bdc3">
-<!ENTITY iputils-fixes-patch-size "47 KB">
+<!ENTITY iputils-build-patch "iputils-&iputils-version;-build-1.patch">
+<!ENTITY iputils-build-patch-md5 "113c166a13d33a3ec10e1ec65542bdc3">
+<!ENTITY iputils-build-patch-size "47 KB">
 
 <!ENTITY linux-sublevel-patch "patch-&linux-version2;.xz">
 <!ENTITY linux-sublevel-patch-md5 "25debf3b5652cdd94df176cd4e36a9ed">

-----------------------------------------------------------------------

Summary of changes:
 BOOK/final-system/common/iputils.xml   |   33 ++++++++++++++++++++-----------
 BOOK/final-system/multilib/iputils.xml |    3 +-
 BOOK/general.ent                       |    4 +-
 BOOK/materials/common/patches.xml      |    6 ++--
 BOOK/patches.ent                       |    6 ++--
 5 files changed, 30 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book



More information about the Clfs-commits mailing list