Browse Source

Merge r8508 from trunk to jh branch

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/jh/BOOK@8509 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Jeremy Huntwork 17 years ago
parent
commit
6f14be16b2
3 changed files with 13 additions and 3 deletions
  1. 10 0
      chapter01/changelog.xml
  2. 1 1
      chapter06/coreutils.xml
  3. 2 2
      general.ent

+ 10 - 0
chapter01/changelog.xml

@@ -36,6 +36,16 @@
     </listitem>
 -->
 
+    <listitem>
+      <para>2008-04-03</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jhuntwork] - Suppress installation of uptime in coreutils.
+          Thanks to Randy McMurchy. Fixes #2133.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2008-04-02</para>
       <itemizedlist>

+ 1 - 1
chapter06/coreutils.xml

@@ -69,7 +69,7 @@ esac</userinput></screen>
 
     <para>Now prepare Coreutils for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --enable-install-program=hostname --enable-no-install-program=kill</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --enable-install-program=hostname --enable-no-install-program=kill,uptime</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>

+ 2 - 2
general.ent

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-JH-20080402">
-<!ENTITY releasedate "April 2, 2008">
+<!ENTITY version "SVN-JH-20080403">
+<!ENTITY releasedate "April 3, 2008">
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->