diff options
| -rw-r--r-- | appendices/dependencies.xml | 35 | ||||
| -rw-r--r-- | chapter01/changelog.xml | 12 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 4 | ||||
| -rw-r--r-- | chapter03/packages.xml | 9 | ||||
| -rw-r--r-- | chapter05/chapter05.xml | 1 | ||||
| -rw-r--r-- | chapter05/xz-utils.xml | 74 | ||||
| -rw-r--r-- | chapter06/chapter06.xml | 1 | ||||
| -rw-r--r-- | chapter06/xz-utils.xml | 335 | ||||
| -rw-r--r-- | general.ent | 4 | ||||
| -rw-r--r-- | packages.ent | 10 |
10 files changed, 483 insertions, 2 deletions
diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index e07c40645..1cf1930bb 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -2013,6 +2013,41 @@ </seglistitem> </segmentedlist> +<!-- Begin Xz-utils dependency info --> + <bridgehead renderas="sect2" id="xz-dep">Xz</bridgehead> + + <segmentedlist> + <segtitle>&dependencies;</segtitle> + + <seglistitem> + <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, and Make.</seg> + </seglistitem> + </segmentedlist> + + <segmentedlist> + <segtitle>&testsuites;</segtitle> + + <seglistitem> + <seg>None</seg> + </seglistitem> + </segmentedlist> + + <segmentedlist> + <segtitle>&before;</segtitle> + + <seglistitem> + <seg>None</seg> + </seglistitem> + </segmentedlist> + + <segmentedlist> + <segtitle>&external;</segtitle> + + <seglistitem> + <seg>None</seg> + </seglistitem> + </segmentedlist> + <!-- Begin Zlib dependency info --> <bridgehead renderas="sect2" id="zlib-dep">Zlib</bridgehead> diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index c8dc8fcf6..3aff6f1c7 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -37,6 +37,18 @@ --> <listitem> + <para>2011-01-02</para> + <itemizedlist> + <listitem> + <para>[bdubbs] Added XZ-Utils as a new compression + utility package for independent use or with tar. Fixes + <ulink url="&lfs-ticket-root;2619">#2619</ulink>. + </para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2010-12-29</para> <itemizedlist> <listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index ebc75f0c2..243a76445 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -255,6 +255,10 @@ <para>procps-3.2.8-fix_HZ_errors-1.patch</para> </listitem> + <listitem> + <para>xz-&xz-version;</para> + </listitem> + </itemizedlist> <itemizedlist> diff --git a/chapter03/packages.xml b/chapter03/packages.xml index e4a752f04..6146424f4 100644 --- a/chapter03/packages.xml +++ b/chapter03/packages.xml @@ -593,6 +593,15 @@ </varlistentry> <varlistentry> + <term>Xz Utils (&xz-version;) - <token>&xz-size;</token>:</term> + <listitem> + <para>Home page: <ulink url="&xz-home;"/></para> + <para>Download: <ulink url="&xz-url;"/></para> + <para>MD5 sum: <literal>&xz-md5;</literal></para> + </listitem> + </varlistentry> + + <varlistentry> <term>Zlib (&zlib-version;) - <token>&zlib-size;</token>:</term> <listitem> <para>Home page: <ulink url="&zlib-home;"/></para> diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml index 7c9bf3744..0afdae8e0 100644 --- a/chapter05/chapter05.xml +++ b/chapter05/chapter05.xml @@ -42,6 +42,7 @@ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz-utils.xml"/> <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux-ng.xml"/>--> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stripping.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="changingowner.xml"/> diff --git a/chapter05/xz-utils.xml b/chapter05/xz-utils.xml new file mode 100644 index 000000000..5b5a7b05f --- /dev/null +++ b/chapter05/xz-utils.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ + <!ENTITY % general-entities SYSTEM "../general.ent"> + %general-entities; +]> + +<sect1 id="ch-tools-xz" role="wrap"> + <?dbhtml filename="xz-utils.html"?> + + <sect1info condition="script"> + <productname>xz-utils</productname> + <productnumber>&xz-version;</productnumber> + <address>&xz-url;</address> + </sect1info> + + <title>Xz-&xz-version;</title> + + <indexterm zone="ch-tools-xz"> + <primary sortas="a-xz">xz</primary> + <secondary>tools</secondary> + </indexterm> + + <sect2 role="package"> + <title/> + + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" + href="../chapter06/xz-utils.xml" + xpointer="xpointer(/sect1/sect2[1]/para[1])"/> + + <segmentedlist> + <segtitle>&buildtime;</segtitle> + <segtitle>&diskspace;</segtitle> + + <seglistitem> + <seg>&xz-ch5-sbu;</seg> + <seg>&xz-ch5-du;</seg> + </seglistitem> + </segmentedlist> + + </sect2> + + <sect2 role="installation"> + <title>Installation of Xz-Utils</title> + + <para>Prepare Xz for compilation:</para> + +<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> + + <para>Compile the package:</para> + +<screen><userinput remap="make">make</userinput></screen> + + <para>Compilation is now complete. As discussed earlier, running the test + suite is not mandatory for the temporary tools here in this chapter. To run + the Xz test suite anyway, issue the following command:</para> + +<screen><userinput remap="test">make check</userinput></screen> + + <para>Install the package:</para> + +<screen><userinput remap="install">make PREFIX=/tools install</userinput></screen> + + </sect2> + + <sect2 role="content"> + <title/> + + <para>Details on this package are located in + <xref linkend="contents-xz" role="."/></para> + + </sect2> + +</sect1> diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index 9350e3feb..96eba60a9 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -71,6 +71,7 @@ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udev.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz-utils.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutdebug.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="strippingagain.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="revisedchroot.xml"/> diff --git a/chapter06/xz-utils.xml b/chapter06/xz-utils.xml new file mode 100644 index 000000000..6b354d345 --- /dev/null +++ b/chapter06/xz-utils.xml @@ -0,0 +1,335 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ + <!ENTITY % general-entities SYSTEM "../general.ent"> + %general-entities; +]> + +<sect1 id="ch-system-xz" role="wrap"> + <?dbhtml filename="xz-utils.html"?> + + <sect1info condition="script"> + <productname>xz-utils</productname> + <productnumber>&xz-version;</productnumber> + <address>&xz-url;</address> + </sect1info> + + <title>Xz-&xz-version;</title> + + <indexterm zone="ch-system-xz"> + <primary sortas="a-xz">Xz</primary> + </indexterm> + + <sect2 role="package"> + <title/> + + <para>The Xz package contains programs for compressing and decompressing + files. It provides capabilities for the lzma and the newer xz compression + formats. Compressing text files with <command>xz</command> yields a better + compression percentage than with the traditional <command>gzip</command> or + <command>bzip2</command> commands.</para> + + <segmentedlist> + <segtitle>&buildtime;</segtitle> + <segtitle>&diskspace;</segtitle> + + <seglistitem> + <seg>&xz-ch6-sbu;</seg> + <seg>&xz-ch6-du;</seg> + </seglistitem> + </segmentedlist> + + </sect2> + + <sect2 role="installation"> + <title>Installation of Xz</title> + + <para>Prepare Xz for compilation with:</para> + +<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen> + + <para>Compile the package:</para> + +<screen><userinput remap="make">make</userinput></screen> + + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> + + <para>Install the package:</para> + +<screen><userinput remap="install">make install</userinput></screen> + + </sect2> + + <sect2 id="contents-xz" role="content"> + <title>Contents of Xz</title> + + <segmentedlist> + <segtitle>Installed programs</segtitle> + <segtitle>Installed libraries</segtitle> + <segtitle>Installed directories</segtitle> + + <seglistitem> + <seg>lzcat (link to xz), lzcmp (link to xzdiff), lzdiff (link to + xzdiff), bzdiff, lzegrep (link to xzgrep), lzfgrep (link to xzgrep), + lz (link to xz), lzmadec, lzmainfo, lzmore (link to xzmore), + unlzma (link to xz), xzcat (link to xz), xzcmp (link to xzdiff), + xzdec, xzdiff, xzegrep (link to xzgrep), xzfgrep (link to xzgrep), + xzgrep, xzless, xzmore</seg> + <seg>liblzma.{a,so}</seg> + <seg>/usr/include/lzma and /usr/share/doc/xz</seg> + </seglistitem> + </segmentedlist> + + <variablelist> + <bridgehead renderas="sect3">Short Descriptions</bridgehead> + <?dbfo list-presentation="list"?> + <?dbhtml list-presentation="table"?> + + <varlistentry id="lzcat"> + <term><command>lzcat</command></term> + <listitem> + <para>Decompresses to standard output</para> + <indexterm zone="ch-system-xz lzcat"> + <primary sortas="b-lzcat">lzcat</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="lzcmp"> + <term><command>lzcmp</command></term> + <listitem> + <para>Runs <command>cmp</command> on LZMA compressed files</para> + <indexterm zone="ch-system-xz lzcmp"> + <primary sortas="b-lzcmp">lzcmp</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="lzdiff"> + <term><command>lzdiff</command></term> + <listitem> + <para>Runs <command>diff</command> on LZMA compressed files</para> + <indexterm zone="ch-system-xz lzdiff"> + <primary sortas="b-lzdiff">lzdiff</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="lzegrep"> + <term><command>lzegrep</command></term> + <listitem> + <para>Runs <command>egrep</command> on LZMA compressed files files</para> + <indexterm zone="ch-system-xz lzegrep"> + <primary sortas="b-lzegrep">lzegrep</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="lzfgrep"> + <term><command>lzfgrep</command></term> + <listitem> + <para>Runs <command>fgrep</command> on LZMA compressed files</para> + <indexterm zone="ch-system-xz lzfgrep"> + <primary sortas="b-lzfgrep">lzfgrep</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="lzgrep"> + <term><command>lzgrep</command></term> + <listitem> + <para>Runs <command>grep</command> on LZMA compressed files</para> + <indexterm zone="ch-system-xz lzgrep"> + <primary sortas="b-lzgrep">lzgrep</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="lzless"> + <term><command>lzless</command></term> + <listitem> + <para>Runs <command>less</command> on LZMA compressed files</para> + <indexterm zone="ch-system-xz lzless"> + <primary sortas="b-lzless">lzless</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="lzma"> + <term><command>lzma</command></term> + <listitem> + <para>Compresses or decompresses files using the LZMA format</para> + <indexterm zone="ch-system-xz lzma"> + <primary sortas="b-lzma">lzma</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="lzmadec"> + <term><command>lzmadec</command></term> + <listitem> + <para>A small and fast decoder for LZMA compressed files</para> + <indexterm zone="ch-system-xz lzmadec"> + <primary sortas="b-lzmadec">lzmadec</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="lzmainfo"> + <term><command>lzmainfo</command></term> + <listitem> + <para>Shows information stored in the LZMA compressed 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> + <listitem> + <para>Runs <command>more</command> on LZMA compressed files</para> + <indexterm zone="ch-system-xz lzmore"> + <primary sortas="b-lzmamore">lzmore</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="unlzma"> + <term><command>unlzma</command></term> + <listitem> + <para>Decompresses files using the LZMA format</para> + <indexterm zone="ch-system-xz unlzma"> + <primary sortas="b-unlzma">unlzma</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="unxz"> + <term><command>unxz</command></term> + <listitem> + <para>Decompresses files using the XZ format</para> + <indexterm zone="ch-system-xz unxz"> + <primary sortas="b-unxz">unxz</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="xz"> + <term><command>xz</command></term> + <listitem> + <para>Compresses or decompresses files using the XZ format</para> + <indexterm zone="ch-system-xz xz"> + <primary sortas="b-xz">xz</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="xzcat"> + <term><command>xzcat</command></term> + <listitem> + <para>Decompresses to standard output</para> + <indexterm zone="ch-system-xz xzcat"> + <primary sortas="b-xzcat">xzcat</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="xzcmp"> + <term><command>xzcmp</command></term> + <listitem> + <para>Runs <command>cmp</command> on 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> + <listitem> + <para>A small and fast decoder for XZ compressed files</para> + <indexterm zone="ch-system-xz xzdec"> + <primary sortas="b-xzdec">xzdec</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="xzdiff"> + <term><command>xzdiff</command></term> + <listitem> + <para>Runs <command>diff</command> on 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 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 compressed 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 compressed 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> + <listitem> + <para>The library implementing lossless, block-sorting data + compression, using the Lempel-Ziv-Markov chain algorithm</para> + <indexterm zone="ch-system-xz liblzma"> + <primary sortas="c-liblzma*">liblzma*</primary> + </indexterm> + </listitem> + </varlistentry> + + </variablelist> + + </sect2> + +</sect1> diff --git a/general.ent b/general.ent index fe72e55fe..e80f90464 100644 --- a/general.ent +++ b/general.ent @@ -1,6 +1,6 @@ <!ENTITY version "SVN-20101229"> -<!ENTITY releasedate "December 29, 2010"> -<!ENTITY copyrightdate "1999-2010"><!-- jhalfs needs a literal dash, not – --> +<!ENTITY releasedate "January 2, 2011"> +<!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "6.8"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> diff --git a/packages.ent b/packages.ent index 294d571c1..144f6e848 100644 --- a/packages.ent +++ b/packages.ent @@ -552,6 +552,16 @@ <!ENTITY vim-ch6-du "87 MB"> <!ENTITY vim-ch6-sbu "1.0 SBU"> +<!ENTITY xz-version "5.0.0"> +<!ENTITY xz-size "988 KB"> +<!ENTITY xz-url "http://tukaani.org/xz/xz-&xz-version;.tar.bz2"> +<!ENTITY xz-md5 "0652c09fdbb93ae2ce78c1368ffda612"> +<!ENTITY xz-home "http://tukaani.org/xz"> +<!ENTITY xz-ch5-du "14 MB"> +<!ENTITY xz-ch5-sbu "0.3 SBU"> +<!ENTITY xz-ch6-du "13 MB"> +<!ENTITY xz-ch6-sbu "0.4 SBU"> + <!ENTITY zlib-version "1.2.5"> <!ENTITY zlib-size "532 KB"> <!ENTITY zlib-url "http://www.zlib.net/zlib-&zlib-version;.tar.bz2"> |