Changeset 8c4f60c

Timestamp:

Dec 21, 2008, 5:29:14 PM (15 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

7e089d59

Parents:

4e02ed8

Message:

Fixed Formatting - Moved LZMA in temp-system to following build order

Location:

BOOK

Files:

• final-system/common/lzma.xml (modified) (2 diffs)
• temp-system/64/lzma.xml (modified) (1 diff)
• temp-system/alpha-chapter.xml (modified) (2 diffs)
• temp-system/common/lzma.xml (modified) (1 diff)
• temp-system/mips-chapter.xml (modified) (2 diffs)
• temp-system/mips64-64-chapter.xml (modified) (2 diffs)
• temp-system/mips64-chapter.xml (modified) (2 diffs)
• temp-system/multilib/lzma.xml (modified) (1 diff)
• temp-system/ppc-chapter.xml (modified) (2 diffs)
• temp-system/ppc64-chapter.xml (modified) (2 diffs)
• temp-system/sparc-chapter.xml (modified) (2 diffs)
• temp-system/sparc64-64-chapter.xml (modified) (2 diffs)
• temp-system/sparc64-chapter.xml (modified) (2 diffs)
• temp-system/x86-chapter.xml (modified) (2 diffs)
• temp-system/x86_64-64-chapter.xml (modified) (2 diffs)
• temp-system/x86_64-chapter.xml (modified) (2 diffs)

BOOK/final-system/common/lzma.xml

@@ -46 +46 @@
     <para os="i">Create a symlink for shared library:</para>
 
-<screen os="j"><userinput>ln -sf ../../lib/liblzmadec.so.0 /usr/lib/liblzmadec.so</userinput></screen>
+<screen os="j"><userinput>ln -svf ../../lib/liblzmadec.so.0 /usr/lib/liblzmadec.so</userinput></screen>
 
     <para os="k">Move the LZMA-Utils binaries to /bin to be available like other compressing utilities:</para>
@@ -52 +52 @@
 <screen os="l"><userinput>mv -v /usr/bin/lzma /bin
 ln -sf lzma /bin/unlzma
-ln -sf lzma /bin/lzmacat
-</userinput></screen>
+ln -sf lzma /bin/lzmacat</userinput></screen>
 
   </sect2>

BOOK/temp-system/64/lzma.xml

@@ -28 +28 @@
 
 <screen os="cb"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-            --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/temp-system/alpha-chapter.xml

@@ -21 +21 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/lzma.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
@@ -31 +30 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/lzma.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>

BOOK/temp-system/common/lzma.xml

@@ -28 +28 @@
 
 <screen os="cb"><userinput>CC="${CC}" ./configure --prefix=/tools \
-            --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="cc">Install the package:</para>

BOOK/temp-system/mips-chapter.xml

@@ -21 +21 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/lzma.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
@@ -31 +30 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/lzma.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>

BOOK/temp-system/mips64-64-chapter.xml

@@ -21 +21 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/lzma.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
@@ -31 +30 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/lzma.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>

BOOK/temp-system/mips64-chapter.xml

@@ -21 +21 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/lzma.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
@@ -31 +30 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/lzma.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>

BOOK/temp-system/multilib/lzma.xml

@@ -28 +28 @@
 
 <screen os="cb"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-            --build=${CLFS_HOST} --host=${CLFS_TARGET}\
-            --libdir=/tools/lib64</userinput></screen>
+     --build=${CLFS_HOST} --host=${CLFS_TARGET}\
+     --libdir=/tools/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/temp-system/ppc-chapter.xml

@@ -20 +20 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/lzma.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
@@ -30 +29 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/lzma.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>

BOOK/temp-system/ppc64-chapter.xml

@@ -20 +20 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/lzma.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
@@ -30 +29 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/lzma.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>

BOOK/temp-system/sparc-chapter.xml

@@ -21 +21 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/lzma.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
@@ -29 +28 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/lzma.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>

BOOK/temp-system/sparc64-64-chapter.xml

@@ -21 +21 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/lzma.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
@@ -31 +30 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/lzma.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>

BOOK/temp-system/sparc64-chapter.xml

@@ -21 +21 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/lzma.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
@@ -31 +30 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/lzma.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>

BOOK/temp-system/x86-chapter.xml

@@ -21 +21 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/lzma.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
@@ -31 +30 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/lzma.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>

BOOK/temp-system/x86_64-64-chapter.xml

@@ -21 +21 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/lzma.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
@@ -31 +30 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/lzma.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>

BOOK/temp-system/x86_64-chapter.xml

@@ -21 +21 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/lzma.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
@@ -31 +30 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/lzma.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>