r1188 - / trunk/BOOK trunk/BOOK/final-system/common trunk/BOOK/final-system/multilib trunk/BOOK/introduction/common trunk/BOOK/materials/common

jim at linuxfromscratch.org jim at linuxfromscratch.org
Tue Feb 21 09:39:05 PST 2006


Author: jim
Date: 2006-02-21 10:39:03 -0700 (Tue, 21 Feb 2006)
New Revision: 1188

Modified:
   /
   trunk/BOOK/final-system/common/bzip2.xml
   trunk/BOOK/final-system/multilib/bzip2-64bit.xml
   trunk/BOOK/introduction/common/changelog.xml
   trunk/BOOK/materials/common/patches.xml
   trunk/BOOK/patches.ent
Log:
 r2377 at server (orig r1188):  jim | 2006-02-21 09:22:17 -0800
 Removed Tempfile Dependency from Bzip2



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:1183
   + b6734a72-470d-0410-b049-f317dca95413:/:1188

Modified: trunk/BOOK/final-system/common/bzip2.xml
===================================================================
--- trunk/BOOK/final-system/common/bzip2.xml	2006-02-21 16:30:00 UTC (rev 1187)
+++ trunk/BOOK/final-system/common/bzip2.xml	2006-02-21 17:39:03 UTC (rev 1188)
@@ -48,6 +48,11 @@
 
 <screen os="p4"><userinput>patch -Np1 -i ../&bzip2-bzgrep-patch;</userinput></screen>
 
+    <para os="p5">The <command>bzdiff</command> depends on tempfile. We remove
+    that dependecy with this patch:</para>
+
+<screen os="p6"><userinput>patch -Np1 -i ../&bzip2-remove_tempfile-patch;</userinput></screen>
+
     <para os="a">The Bzip2 package does not contain a <command>configure</command>
     script. Compile it with:</para>
 

Modified: trunk/BOOK/final-system/multilib/bzip2-64bit.xml
===================================================================
--- trunk/BOOK/final-system/multilib/bzip2-64bit.xml	2006-02-21 16:30:00 UTC (rev 1187)
+++ trunk/BOOK/final-system/multilib/bzip2-64bit.xml	2006-02-21 17:39:03 UTC (rev 1188)
@@ -37,6 +37,14 @@
     href="../common/bzip2.xml"
     xpointer="xpointer(//*[@os='p4'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='p5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='p6'])"/>
+
     <para os="m1">We need to remove the tests since they won't work on
     a multi-architecture build, and change the default lib path
     to <filename class="directory">lib64</filename>:</para>

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2006-02-21 16:30:00 UTC (rev 1187)
+++ trunk/BOOK/introduction/common/changelog.xml	2006-02-21 17:39:03 UTC (rev 1188)
@@ -37,6 +37,15 @@
 -->
 
     <listitem>
+      <para>February 21, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Removed Dependency of Tempfile from Bzip2.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>February 14, 2006</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/materials/common/patches.xml
===================================================================
--- trunk/BOOK/materials/common/patches.xml	2006-02-21 16:30:00 UTC (rev 1187)
+++ trunk/BOOK/materials/common/patches.xml	2006-02-21 17:39:03 UTC (rev 1188)
@@ -42,6 +42,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Bzip2 Bzdiff Remove Tempfile - 1.8 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;bzip2/&bzip2-remove_tempfile-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry os="p4">
       <term>Bzip2 Documentation Patch - 1.7 KB:</term>
       <listitem>

Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent	2006-02-21 16:30:00 UTC (rev 1187)
+++ trunk/BOOK/patches.ent	2006-02-21 17:39:03 UTC (rev 1188)
@@ -5,6 +5,7 @@
 
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
 <!ENTITY bzip2-bzgrep-patch "bzip2-&bzip2-version;-bzgrep_security-1.patch">
+<!ENTITY bzip2-remove_tempfile-patch "bzip2-&bzip2-version;-remove_tempfile-1.patch">
 
 <!ENTITY binutils-posix-patch "binutils-&binutils-version;-posix-1.patch">
 




More information about the cross-lfs mailing list