Changeset 43100c0 for BOOK/final-system/common

Timestamp:

Feb 3, 2014, 3:21:44 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

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

Children:

4340580

Parents:

849369d (diff), 961afdcd (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 'systemd' of git.cross-lfs.org:cross-lfs into systemd

Location:

BOOK/final-system/common

Files:

• diffutils.xml (modified) (1 diff)
• expat.xml (modified) (1 diff)
• iana-etc.xml (modified) (2 diffs)

BOOK/final-system/common/diffutils.xml

@@ -25 +25 @@
   <sect2 role="installation">
     <title>Installation of Diffutils</title>
+
+    <para os="s1">"Fix a file so locale files are installed:"</para>
+
+<screen os="s2"><userinput>sed -i 's:= @mkdir_p@:= /bin/mkdir -p:' po/Makefile.in.in</userinput></screen>
 
     <para os="a">Prepare Diffutils for compilation:</para>

BOOK/final-system/common/expat.xml

@@ -33 +33 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
 
     <para os="f">Install the package:</para>

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

@@ -26 +26 @@
     <title>Installation of Iana-Etc</title>
 
-    <note os="p1">
-      <para>This package has the option of downloading updated data when internet access is available. If /etc/resolv.conf has a nameserver entry and internet access is available at this step, then apply the IANA get patch and get the updated data:
-<screen><command>patch -Np1 -i ../&iana-etc-get_fix-patch;</command>
-<command>make get</command></screen>
-Do not apply the following patch.</para>
-    </note>
+    <para os="p2">The following patch updates the services and protocol xml files:</para>
 
-    <para os="p2">The following patch updates the services and protocol files:</para>
-
-<screen os="p3"><userinput>patch -Np1 -i ../&iana-etc-numbers_update-patch;</userinput></screen>
+<screen os="p3"><userinput>xzcat ../&iana-etc-numbers_update-patch; | patch -Np1 -i -</userinput></screen>
 
     <para os="a">The following command converts the raw data provided by IANA into
@@ -41 +34 @@
     <filename>/etc/services</filename> data files:</para>
 
-<screen os="b"><userinput>make</userinput></screen>
+<screen os="b"><userinput>make get &amp;&amp;
+make</userinput></screen>
 
     <para os="c">This package does not come with a test suite.</para>