[lfs-book] r9961 - in trunk/BOOK: . chapter01 chapter06

bdubbs at linuxfromscratch.org bdubbs at linuxfromscratch.org
Sun Aug 26 10:43:47 PDT 2012


Author: bdubbs
Date: 2012-08-26 11:43:43 -0600 (Sun, 26 Aug 2012)
New Revision: 9961

Modified:
   trunk/BOOK/chapter01/changelog.xml
   trunk/BOOK/chapter01/whatsnew.xml
   trunk/BOOK/chapter06/make.xml
   trunk/BOOK/general.ent
   trunk/BOOK/patches.ent
Log:
Apply upstream patches to make

Modified: trunk/BOOK/chapter01/changelog.xml
===================================================================
--- trunk/BOOK/chapter01/changelog.xml	2012-08-24 03:23:34 UTC (rev 9960)
+++ trunk/BOOK/chapter01/changelog.xml	2012-08-26 17:43:43 UTC (rev 9961)
@@ -37,10 +37,19 @@
 
 -->
     <listitem>
+      <para>2012-08-26</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Apply upstream patches to make.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2012-08-24</para>
       <itemizedlist>
         <listitem>
-          <para>[ken] - remove redundant sed from automake.</para>
+          <para>[ken] - Remove redundant sed from automake.</para>
         </listitem>
       </itemizedlist>
     </listitem>

Modified: trunk/BOOK/chapter01/whatsnew.xml
===================================================================
--- trunk/BOOK/chapter01/whatsnew.xml	2012-08-24 03:23:34 UTC (rev 9960)
+++ trunk/BOOK/chapter01/whatsnew.xml	2012-08-26 17:43:43 UTC (rev 9961)
@@ -240,6 +240,10 @@
     </listitem>
 
     <listitem>
+      <para>&make-fixes-patch;</para>
+    </listitem>
+
+    <listitem>
       <para>&perl-libc-patch;</para>
     </listitem>
 
@@ -250,6 +254,11 @@
     <listitem>
       <para>&sed-testsuite-patch;</para>
     </listitem>
+
+    <listitem>
+      <para>tzdata &tzdata-version;</para>
+    </listitem>
+
 <!--  Added and removed in this cycle
     <listitem>
       <para>popt&popt-version;</para>

Modified: trunk/BOOK/chapter06/make.xml
===================================================================
--- trunk/BOOK/chapter06/make.xml	2012-08-24 03:23:34 UTC (rev 9960)
+++ trunk/BOOK/chapter06/make.xml	2012-08-26 17:43:43 UTC (rev 9961)
@@ -40,6 +40,10 @@
   <sect2 role="installation">
     <title>Installation of Make</title>
 
+    <para>First apply some upstream patches:</para>
+
+<screen><userinput remap="configure">patch -Np1 -i ../&make-fixes-patch;</userinput></screen>
+
     <para>Prepare Make for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2012-08-24 03:23:34 UTC (rev 9960)
+++ trunk/BOOK/general.ent	2012-08-26 17:43:43 UTC (rev 9961)
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120824">
-<!ENTITY releasedate "August 24, 2012">
+<!ENTITY version "SVN-20120826">
+<!ENTITY releasedate "August 26, 2012">
 <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not – -->
 <!ENTITY milestone "7.2">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent	2012-08-24 03:23:34 UTC (rev 9960)
+++ trunk/BOOK/patches.ent	2012-08-26 17:43:43 UTC (rev 9961)
@@ -59,6 +59,11 @@
 <!ENTITY kmod-testsuite-patch-size "2.2 KB">
 
 
+<!ENTITY make-fixes-patch "make-&make-version;-upstream_fixes-2.patch">
+<!ENTITY make-fixes-md5 "02c0f3989185a7345233872b1ae5f46d">
+<!ENTITY make-fixes-patch-size "9.7 KB">
+
+
 <!ENTITY patch-test-patch "patch-&patch-version;-test_fix-1.patch">
 <!ENTITY patch-test-patch-md5 "c51e1a95bfc5310635d05081472c3534">
 <!ENTITY patch-test-patch-size "1 KB">




More information about the lfs-book mailing list