Changeset 229ed25 for BOOK/final-system/common/xz.xml

Timestamp:

Jan 4, 2014, 12:03:38 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f90d077

Parents:

ec008670 (diff), e57ce38 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:

• BOOK/final-system/common/xz.xml (modified) (6 diffs)

BOOK/final-system/common/xz.xml

@@ -36 +36 @@
 <screen os="d"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
-
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
 
     <para os="f">Install the programs:</para>
@@ -48 +48 @@
 
 <screen os="i"><userinput>mv -v /usr/bin/{xz,lzma,lzcat,unlzma,unxz,xzcat} /bin</userinput></screen>
+
+    <para os="j">Finally, move the shared library to a more appropriate
+    location, and recreate the symlink pointing to it:</para>
+
+<screen os="k"><userinput>mv -v /usr/lib/liblzma.so.* /lib
+ln -svf ../../lib/liblzma.so.&xz-version; /usr/lib/liblzma.so</userinput></screen>
 
   </sect2>
@@ -60 +66 @@
 
       <seglistitem>
-        <seg>lzcat (link to xz), lzcmp (link to lzdiff), lzdiff, lzegrep (link to lzgrep),
-        lzfgrep (link to lzgrep), lzgrep, lzless (link to lzmore), lzma (link to xz),
-        lzmadec, lzmore, unlzma (link to xz), unxz (link to xz), xz, xzcat
-        (link to xz), and xzdec</seg>
+        <seg>lzcat (link to xz), lzcmp (link to xzdiff), lzdiff (link to
+        xzdiff), lzegrep (link to xzgrep), lzfgrep (link to xzgrep), lzgrep
+        (link to xzgrep), lzless (link to xzless), lzma (link to xz), lzmadec,
+        lzmainfo, lzmore (link to xzmore), unlzma (link to xz), unxz (link to
+        xz), xz, xzcat (link to xz), xzcmp (link to xzdiff), xzdec, xzdiff,
+        xzegrep (link to xzgrep), xzfgrep (link to xzgrep), xzgrep, xzless,
+        and xzmore</seg>
         <seg>liblzma.[a,so]</seg>
         <seg>/usr/include/lzma, /usr/share/doc/xz</seg>
@@ -164 +173 @@
       </varlistentry>
 
+      <varlistentry id="lzmainfo">
+        <term><command>lzmainfo</command></term>
+        <listitem>
+          <para>Displays information stored in an .lzma file header</para>
+          <indexterm zone="ch-system-xz lzmainfo">
+            <primary sortas="b-lzmainfo">lzmainfo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="lzmore">
         <term><command>lzmore</command></term>
@@ -214 +233 @@
       </varlistentry>
 
+      <varlistentry id="xzcmp">
+        <term><command>xzcmp</command></term>
+        <listitem>
+          <para>Compares xz compressed files</para>
+          <indexterm zone="ch-system-xz xzcmp">
+            <primary sortas="b-xzcmp">xzcmp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="xzdec">
         <term><command>xzdec</command></term>
@@ -224 +253 @@
       </varlistentry>
 
+      <varlistentry id="xzdiff">
+        <term><command>xzdiff</command></term>
+        <listitem>
+          <para>Compares xz compressed files</para>
+          <indexterm zone="ch-system-xz xzdiff">
+            <primary sortas="b-xzdiff">xzdiff</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xzegrep">
+        <term><command>xzegrep</command></term>
+        <listitem>
+          <para>Runs <command>egrep</command> on xz compressed files</para>
+          <indexterm zone="ch-system-xz xzegrep">
+            <primary sortas="b-xzegrep">xzegrep</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xzfgrep">
+        <term><command>xzfgrep</command></term>
+        <listitem>
+          <para>Runs <command>fgrep</command> on xz compressed files</para>
+          <indexterm zone="ch-system-xz xzfgrep">
+            <primary sortas="b-xzfgrep">xzfgrep</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xzgrep">
+        <term><command>xzgrep</command></term>
+        <listitem>
+          <para>Runs <command>grep</command> on xz compressed files</para>
+          <indexterm zone="ch-system-xz xzgrep">
+            <primary sortas="b-xzgrep">xzgrep</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xzless">
+        <term><command>xzless</command></term>
+        <listitem>
+          <para>Runs <command>less</command> on xz files</para>
+          <indexterm zone="ch-system-xz xzless">
+            <primary sortas="b-xzless">xzless</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xzmore">
+        <term><command>xzmore</command></term>
+        <listitem>
+          <para>Runs <command>more</command> on xz files</para>
+          <indexterm zone="ch-system-xz xzmore">
+            <primary sortas="b-xzmore">xzmore</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="liblzma">
         <term><filename class="libraryfile">liblzma</filename></term>