r878 - in trunk/BOOK: final-system/common final-system/multilib introduction/common introduction/mips64 introduction/sparc64 introduction/x86_64

ken at linuxfromscratch.org ken at linuxfromscratch.org
Fri Dec 9 17:54:08 PST 2005


Author: ken
Date: 2005-12-09 18:54:03 -0700 (Fri, 09 Dec 2005)
New Revision: 878

Modified:
   trunk/BOOK/final-system/common/bzip2.xml
   trunk/BOOK/final-system/multilib/bzip2-64bit.xml
   trunk/BOOK/final-system/multilib/bzip2-n32.xml
   trunk/BOOK/final-system/multilib/bzip2.xml
   trunk/BOOK/introduction/common/changelog.xml
   trunk/BOOK/introduction/mips64/changelog.xml
   trunk/BOOK/introduction/sparc64/changelog.xml
   trunk/BOOK/introduction/x86_64/changelog.xml
Log:
Simplify bzip2 installation on multilib, based on a suggestion by Go Moko, and reword what gets tested

Modified: trunk/BOOK/final-system/common/bzip2.xml
===================================================================
--- trunk/BOOK/final-system/common/bzip2.xml	2005-12-09 16:45:20 UTC (rev 877)
+++ trunk/BOOK/final-system/common/bzip2.xml	2005-12-10 01:54:03 UTC (rev 878)
@@ -59,7 +59,7 @@
     <filename class="libraryfile">libbz2.so</filename> library and links the
     Bzip2 utilities against it.</para>
 
-    <para os="d">Compile and test the package:</para>
+    <para os="d">Recompile the package using a non-shared library and test it.</para>
 
 <screen os="e"><userinput>make</userinput></screen>
 

Modified: trunk/BOOK/final-system/multilib/bzip2-64bit.xml
===================================================================
--- trunk/BOOK/final-system/multilib/bzip2-64bit.xml	2005-12-09 16:45:20 UTC (rev 877)
+++ trunk/BOOK/final-system/multilib/bzip2-64bit.xml	2005-12-10 01:54:03 UTC (rev 878)
@@ -30,11 +30,11 @@
     xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
+    href="../common/bzip2.xml"
     xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
+    href="../common/bzip2.xml"
     xpointer="xpointer(//*[@os='p4'])"/>
 
     <para os="m1">We need to remove the tests since they won't work on
@@ -55,29 +55,33 @@
     href="bzip2.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="bzip2-n32.xml"
+    xpointer="xpointer(//*[@os='c1'])"/>
+
 <screen os="e"><userinput>make CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}"</userinput></screen>
 
-    <para os="m3">Now we remove the 32 bit versions of the programs so we
-    can install the 64 bit versions.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen os="m4"><userinput>rm -f /usr/bin/bz* /bin/bz*</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
+    href="../common/bzip2.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
+    href="../common/bzip2.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
+    href="../common/bzip2.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
 <screen os="j"><userinput>cp bzip2-shared /bin/bzip2
 cp -a libbz2.so* /lib64
 ln -s ../../lib64/libbz2.so.1.0 /usr/lib64/libbz2.so
 rm /usr/bin/{bunzip2,bzcat,bzip2}
+ln -s bzip2 /bin/bunzip2
 ln -s bzip2 /bin/bzcat</userinput></screen>
 
   </sect2>

Modified: trunk/BOOK/final-system/multilib/bzip2-n32.xml
===================================================================
--- trunk/BOOK/final-system/multilib/bzip2-n32.xml	2005-12-09 16:45:20 UTC (rev 877)
+++ trunk/BOOK/final-system/multilib/bzip2-n32.xml	2005-12-10 01:54:03 UTC (rev 878)
@@ -22,14 +22,6 @@
   <sect2 role="installation">
     <title>Installation of Bzip2</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
     <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">lib32</filename>:</para>
@@ -48,33 +40,17 @@
     href="bzip2.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
+    <para os="c1">Recompile the package using a non-shared library.</para>
+
 <screen os="d"><userinput>make CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}"</userinput></screen>
 
-    <para os="m3">Now we remove the 32 bit versions of the programs so we
-    can install the n32 bit versions.</para>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2-64bit.xml"
-    xpointer="xpointer(//*[@os='m4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="bzip2.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen os="j"><userinput>cp bzip2-shared /bin/bzip2
+<screen os="j"><userinput>cp libbz2.a /usr/lib32
 cp -a libbz2.so* /lib32
-ln -s ../../lib32/libbz2.so.1.0 /usr/lib32/libbz2.so
-rm /usr/bin/{bunzip2,bzcat,bzip2}
-ln -s bzip2 /bin/bunzip2
-ln -s bzip2 /bin/bzcat</userinput></screen>
+ln -s ../../lib32/libbz2.so.1.0 /usr/lib32/libbz2.so</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/multilib/bzip2.xml
===================================================================
--- trunk/BOOK/final-system/multilib/bzip2.xml	2005-12-09 16:45:20 UTC (rev 877)
+++ trunk/BOOK/final-system/multilib/bzip2.xml	2005-12-10 01:54:03 UTC (rev 878)
@@ -24,14 +24,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    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='a'])"/>
 
 <screen os="b"><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}"
@@ -47,26 +39,13 @@
 
 <screen os="e"><userinput>make CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}"</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    <para os="i">Install the libraries, make
+    some necessary symbolic links, and clean up:</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+<screen os="j"><userinput>cp libbz2.a /usr/lib
+cp -a libbz2.so* /lib
+ln -s ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2005-12-09 16:45:20 UTC (rev 877)
+++ trunk/BOOK/introduction/common/changelog.xml	2005-12-10 01:54:03 UTC (rev 878)
@@ -42,6 +42,9 @@
         <listitem>
           <para>[jim] - Upgraded to Module Init Tools 3.2.2.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - Bzip2 - clarify what is being tested.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

Modified: trunk/BOOK/introduction/mips64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/mips64/changelog.xml	2005-12-09 16:45:20 UTC (rev 877)
+++ trunk/BOOK/introduction/mips64/changelog.xml	2005-12-10 01:54:03 UTC (rev 878)
@@ -40,6 +40,10 @@
           <para>[ken] - Set prefix to '/' in multilib module-init-tools, to
 		prevent man pages going into /share.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - Simplify the installation of multilib bzip2.
+		Thanks to Go Moko.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

Modified: trunk/BOOK/introduction/sparc64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/sparc64/changelog.xml	2005-12-09 16:45:20 UTC (rev 877)
+++ trunk/BOOK/introduction/sparc64/changelog.xml	2005-12-10 01:54:03 UTC (rev 878)
@@ -40,6 +40,10 @@
           <para>[ken] - Set prefix to '/' in multilib module-init-tools, to
 		prevent man pages going into /share.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - Simplify the installation of multilib bzip2.
+		Thanks to Go Moko.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

Modified: trunk/BOOK/introduction/x86_64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/x86_64/changelog.xml	2005-12-09 16:45:20 UTC (rev 877)
+++ trunk/BOOK/introduction/x86_64/changelog.xml	2005-12-10 01:54:03 UTC (rev 878)
@@ -40,6 +40,10 @@
           <para>[ken] - Set prefix to '/' in multilib module-init-tools, to
 		prevent man pages going into /share.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - Simplify the installation of multilib bzip2.
+		Thanks to Go Moko.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 




More information about the cross-lfs mailing list