Changeset a9cb92d in clfs-embedded

Timestamp:

Jan 29, 2011, 10:56:30 AM (14 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

master

Children:

e67fb9b

Parents:

e0c6774 (diff), 21f1019 (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 remote branch 'abradford/master'

Files:

• BOOK/final-system/common/iana-etc.xml (modified) (2 diffs)
• patches/iana-etc-2.30-update.patch (added)

BOOK/final-system/common/iana-etc.xml

@@ -26 +26 @@
     <title>Installation of Iana-Etc</title>
 
-    <para os="a">The <filename>protocol-numbers.dist</filename> and
-    <filename>port-numbers.dist</filename> files that come with Iana-Etc 
-    are outdated.  Also, IANA has moved their copy of protocol-numbers.
-    In order to ensure we use correct and up to date data, first modify the 
-    Makefile and then download the updates:</para>
+    <para os="a">The following command converts the raw data provided by IANA into
+    the correct formats for the <filename>/etc/protocols</filename> and
+    <filename>/etc/services</filename> data files:</para>
 
-<screen os="b"><userinput>sed -i '/file=/s@protocol-numbers@&amp;/&amp;.txt@' Makefile
-make get</userinput></screen>
+<screen os="b"><userinput>make</userinput></screen>
 
-    <para os="c">The following command then converts the raw data provided by 
-    IANA into the correct formats for the <filename>/etc/protocols</filename> 
-    and <filename>/etc/services</filename> data files:</para>
+    <para os="c">This package does not come with a test suite.</para>
 
-<screen os="d"><userinput>make</userinput></screen>
+    <para os="d">Install the package:</para>
 
-    <para os="e">This package does not come with a test suite.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+<screen os="e"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
@@ -93 +84 @@
 
 </sect1>
-