gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-03-06 06:14:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to man-db-2.7.4.

Browse Source 
Update to linux-4.2.3.
Update to tzdata2015g.
Many updates to installed files and directories.  Huge thanks to Fernando. 



git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10964 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Bruce Dubbs 2015-10-12 21:20:03 +00:00
parent a0afc1b210
commit 040ecb6de9
38 changed files with 310 additions and 375 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
chapter01/changelog.xml
View File

@ -36,6 +36,29 @@
</listitem>
-->
<listitem>
<para>2015-10-12</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Update to man-db-2.7.4. Fixes
<ulink url="&lfs-ticket-root;3850">#3850</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to linux-4.2.3. Fixes
<ulink url="&lfs-ticket-root;3844">#3844</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to tzdata2015g. Fixes
<ulink url="&lfs-ticket-root;3845">#3845</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Many updates to installed files and
directories. Huge thanks to Fernando. Fixes
<ulink url="&lfs-ticket-root;3849">#3849</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2015-10-11</para>
<itemizedlist>

4
chapter01/whatsnew.xml
View File

@ -211,9 +211,9 @@
<!--<listitem>
<para>Texinfo &texinfo-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>Tzdata &tzdata-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>Util-Linux &util-linux-version;</para>
</listitem>-->

2
chapter06/acl.xml
View File

@ -99,7 +99,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libacl.so) /usr/lib/libacl.so</userinput><
<seglistitem>
<seg>chacl, getfacl, and setacl</seg>
<seg>libacl.{a,so}</seg>
<seg>libacl.so</seg>
<seg>/usr/include/acl and /usr/share/doc/acl-&acl-version;</seg>
</seglistitem>
</segmentedlist>

2
chapter06/attr.xml
View File

@ -93,7 +93,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libattr.so) /usr/lib/libattr.so</userinput
<seglistitem>
<seg>attr, getfattr, and setattr</seg>
<seg>libattr.{a,so}</seg>
<seg>libattr.so</seg>
<seg>/usr/include/attr and /usr/share/doc/attr-&attr-version;</seg>
</seglistitem>
</segmentedlist>

111
chapter06/automake.xml
View File

@ -77,10 +77,8 @@ make -j4 check</userinput></screen>
<segtitle>Installed directories</segtitle>
<seglistitem>
<seg>aclocal, aclocal-&am-minor-version;, automake,
automake-&am-minor-version;, compile, config.guess, config.sub,
depcomp, install-sh, mdate-sh, missing, mkinstalldirs,
py-compile, and ylwrap</seg>
<seg>aclocal, aclocal-&am-minor-version; (hard linked with aclocal), automake, and
automake-&am-minor-version; (hard linked with automake) </seg>
<seg>/usr/share/aclocal-&am-minor-version;, /usr/share/automake-&am-minor-version;, and
/usr/share/doc/automake-&automake-version;</seg>
</seglistitem>
@ -139,111 +137,6 @@ make -j4 check</userinput></screen>
</listitem>
</varlistentry>
<varlistentry id="compile">
<term><command>compile</command></term>
<listitem>
<para>A wrapper for compilers</para>
<indexterm zone="ch-system-automake compile">
<primary sortas="b-compile">compile</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="config.guess">
<term><command>config.guess</command></term>
<listitem>
<para>A script that attempts to guess the canonical triplet for
the given build, host, or target architecture</para>
<indexterm zone="ch-system-automake config.guess">
<primary sortas="b-config.guess">config.guess</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="config.sub">
<term><command>config.sub</command></term>
<listitem>
<para>A configuration validation subroutine script</para>
<indexterm zone="ch-system-automake config.sub">
<primary sortas="b-config.sub">config.sub</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="depcomp">
<term><command>depcomp</command></term>
<listitem>
<para>A script for compiling a program so that dependency information
is generated in addition to the desired output</para>
<indexterm zone="ch-system-automake depcomp">
<primary sortas="b-depcomp">depcomp</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="install-sh">
<term><command>install-sh</command></term>
<listitem>
<para>A script that installs a program, script, or data file</para>
<indexterm zone="ch-system-automake install-sh">
<primary sortas="b-install-sh">install-sh</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="mdate-sh">
<term><command>mdate-sh</command></term>
<listitem>
<para>A script that prints the modification time of a file or
directory</para>
<indexterm zone="ch-system-automake mdate-sh">
<primary sortas="b-mdate-sh">mdate-sh</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="missing">
<term><command>missing</command></term>
<listitem>
<para>A script acting as a common stub for missing GNU programs during
an installation</para>
<indexterm zone="ch-system-automake missing">
<primary sortas="b-missing">missing</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="mkinstalldirs">
<term><command>mkinstalldirs</command></term>
<listitem>
<para>A script that creates a directory tree</para>
<indexterm zone="ch-system-automake mkinstalldirs">
<primary sortas="b-mkinstalldirs">mkinstalldirs</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="py-compile">
<term><command>py-compile</command></term>
<listitem>
<para>Compiles a Python program</para>
<indexterm zone="ch-system-automake py-compile">
<primary sortas="b-py-compile">py-compile</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="ylwrap">
<term><command>ylwrap</command></term>
<listitem>
<para>A wrapper for <command>lex</command> and
<command>yacc</command></para>
<indexterm zone="ch-system-automake ylwrap">
<primary sortas="b-ylwrap">ylwrap</primary>
</indexterm>
</listitem>
</varlistentry>
</variablelist>
</sect2>

2
chapter06/bison.xml
View File

@ -52,7 +52,7 @@
<screen><userinput remap="make">make</userinput></screen>
<para>To test the results (about 0.5 SBU), issue:</para>
<para>To test the results (about 2.2 SBU), issue:</para>
<screen><userinput remap="test">make check</userinput></screen>

11
chapter06/e2fsprogs.xml
View File

@ -171,12 +171,11 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
<seg>badblocks, chattr, compile_et, debugfs, dumpe2fs,e2freefrag,
e2fsck, e2image, e2label, e2undo, e4defrag, filefrag, fsck.ext2,
fsck.ext3, fsck.ext4, fsck.ext4dev, logsave, lsattr, mk_cmds, mke2fs,
mkfs.ext2, mkfs.ext3, mkfs.ext4, mkfs.ext4dev,
mkfs.ext2, mkfs.ext3, mkfs.ext4, mkfs.ext4dev, mklost+found,
resize2fs, and tune2fs</seg>
<seg>libcom_err.{a,so}, libe2p.{a,so}, libext2fs.{a,so},
libquota.a, and libss.{a,so}</seg>
<seg>libcom_err.so, libe2p.so, libext2fs.so, and libss.so</seg>
<seg>/usr/include/e2p, /usr/include/et, /usr/include/ext2fs,
/usr/include/quota, /usr/include/ss, /usr/share/et, and /usr/share/ss</seg>
/usr/include/ss, /usr/share/et, and /usr/share/ss</seg>
</seglistitem>
</segmentedlist>
@ -522,7 +521,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
</indexterm>
</listitem>
</varlistentry>
<!--
<varlistentry id="libquota">
<term><filename class="libraryfile">libquota</filename></term>
<listitem>
@ -533,7 +532,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
</indexterm>
</listitem>
</varlistentry>
-->
<varlistentry id="libss">
<term><filename class="libraryfile">libss</filename></term>
<listitem>

49
chapter06/eudev.xml
View File

@ -139,7 +139,7 @@ make -f &udev-lfs-version;/Makefile.lfs install</userinput></screen>
<seg>libudev.so</seg>
<seg>/etc/udev, /lib/udev, and /lib/firmware</seg>
<seg>/etc/udev, /lib/udev, and /usr/share/doc/udev-20140408</seg>
</seglistitem>
</segmentedlist>
@ -147,53 +147,6 @@ make -f &udev-lfs-version;/Makefile.lfs install</userinput></screen>
<bridgehead renderas="sect3">Short Descriptions</bridgehead>
<?dbfo list-presentation="list"?>
<?dbhtml list-presentation="table"?>
<!--
<varlistentry id="ata_id">
<term><command>ata_id</command></term>
<listitem>
<para>Provides Udev with a unique string and
additional information (uuid, label) for an ATA drive</para>
<indexterm zone="ch-system-eudev ata_id">
<primary sortas="b-ata_id">ata_id</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="cdrom_id">
<term><command>cdrom_id</command></term>
<listitem>
<para>Provides Udev with the capabilities of a
CD-ROM or DVD-ROM drive</para>
<indexterm zone="ch-system-eudev cdrom_id">
<primary sortas="b-cdrom_id">cdrom_id</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="collect">
<term><command>collect</command></term>
<listitem>
<para>Given an ID for the current uevent and a list of
IDs (for all target uevents), registers the current ID
and indicates whether all target IDs have been registered</para>
<indexterm zone="ch-system-eudev collect">
<primary sortas="b-collect">collect</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="scsi_id">
<term><command>scsi_id</command></term>
<listitem>
<para>Provides Udev with a unique SCSI identifier
based on the data returned from sending a SCSI INQUIRY command to
the specified device</para>
<indexterm zone="ch-system-eudev scsi_id">
<primary sortas="b-scsi_id">scsi_id</primary>
</indexterm>
</listitem>
</varlistentry>
-->
<varlistentry id="udevadm">
<term><command>udevadm</command></term>
<listitem>

2
chapter06/expat.xml
View File

@ -74,7 +74,7 @@ install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-&expat-version;</user
<seglistitem>
<seg>xmlwf</seg>
<seg>libexpat.{a,so}</seg>
<seg>libexpat.so</seg>
<seg>/usr/share/doc/expat-&expat-version;</seg>
</seglistitem>
</segmentedlist>

25
chapter06/findutils.xml
View File

@ -91,7 +91,7 @@ sed -i 's|find:=${BINDIR}|find:=/bin|' /usr/bin/updatedb</userinput></screen>
<segtitle>Installed programs</segtitle>
<seglistitem>
<seg>bigram, code, find, frcode, locate, oldfind, updatedb, and xargs</seg>
<seg>code, find, locate, oldfind, updatedb, and xargs</seg>
</seglistitem>
</segmentedlist>
@ -100,17 +100,6 @@ sed -i 's|find:=${BINDIR}|find:=/bin|' /usr/bin/updatedb</userinput></screen>
<?dbfo list-presentation="list"?>
<?dbhtml list-presentation="table"?>
<varlistentry id="bigram">
<term><command>bigram</command></term>
<listitem>
<para>Was formerly used to produce <command>locate</command>
databases</para>
<indexterm zone="ch-system-findutils bigram">
<primary sortas="b-bigram">bigram</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="code">
<term><command>code</command></term>
<listitem>
@ -133,18 +122,6 @@ sed -i 's|find:=${BINDIR}|find:=/bin|' /usr/bin/updatedb</userinput></screen>
</listitem>
</varlistentry>
<varlistentry id="frcode">
<term><command>frcode</command></term>
<listitem>
<para>Is called by <command>updatedb</command> to compress the list
of file names; it uses front-compression, reducing the database size
by a factor of four to five</para>
<indexterm zone="ch-system-findutils frcode">
<primary sortas="b-frcode">frcode</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="locate">
<term><command>locate</command></term>
<listitem>

6
chapter06/flex.xml
View File

@ -47,7 +47,9 @@
<para>Prepare Flex for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
<screen><userinput remap="configure">./configure --prefix=/usr \
--disable-static \
--docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
<para>Compile the package:</para>
@ -88,7 +90,7 @@
<seglistitem>
<seg>flex, flex++ (link to flex), and lex (link to flex)</seg>
<seg>libfl.{a,so} and libfl_pic.{a,so}</seg>
<seg>libfl.so and libfl_pic.so</seg>
<seg>/usr/share/doc/flex-&flex-version;</seg>
</seglistitem>
</segmentedlist>

3
chapter06/gcc.xml
View File

@ -139,7 +139,8 @@ cd ../gcc-build</userinput></screen>
Link Time Optimization (LTO):</para>
<screen><userinput remap="install">install -v -dm755 /usr/lib/bfd-plugins
ln -sfv ../../libexec/gcc/$(gcc -dumpmachine)/&gcc-version;/liblto_plugin.so /usr/lib/bfd-plugins/</userinput></screen>
ln -sfv ../../libexec/gcc/$(gcc -dumpmachine)/&gcc-version;/liblto_plugin.so \
/usr/lib/bfd-plugins/</userinput></screen>
<para>Now that our final toolchain is in place, it is important to again ensure
that compiling and linking will work as expected. We do this by performing

2
chapter06/gdbm.xml
View File

@ -86,7 +86,7 @@
<seglistitem>
<seg>gdbm_dump, gdbm_load, and gdbmtool</seg>
<seg>libgdbm.{a,so} and libgdbm_compat.{a,so}</seg>
<seg>libgdbm.so and libgdbm_compat.so</seg>
</seglistitem>
</segmentedlist>

30
chapter06/gettext.xml
View File

@ -60,7 +60,8 @@
<para>Install the package:</para>
<screen><userinput remap="install">make install</userinput></screen>
<screen><userinput remap="install">make install
chmod -v 0755 /usr/lib/preloadable_libintl.so</userinput></screen>
</sect2>
@ -73,11 +74,11 @@
<segtitle>Installed directories</segtitle>
<seglistitem>
<seg>autopoint, config.charset, config.rpath, envsubst, gettext, gettext.sh,
<seg>autopoint, envsubst, gettext, gettext.sh,
gettextize, hostname, msgattrib, msgcat, msgcmp, msgcomm, msgconv, msgen,
msgexec, msgfilter, msgfmt, msggrep, msginit, msgmerge, msgunfmt, msguniq,
ngettext, recode-sr-latin, and xgettext</seg>
<seg>libasprintf.{a,so}, libgettextlib.so, libgettextpo.{a,so},
<seg>libasprintf.so, libgettextlib.so, libgettextpo.so,
libgettextsrc.so, and preloadable_libintl.so</seg>
<seg>/usr/lib/gettext, /usr/share/doc/gettext-&gettext-version;, and
/usr/share/gettext</seg>
@ -100,29 +101,6 @@
</listitem>
</varlistentry>
<varlistentry id="config.charset">
<term><command>config.charset</command></term>
<listitem>
<para>Outputs a system-dependent table of character encoding
aliases</para>
<indexterm zone="ch-system-gettext config.charset">
<primary sortas="b-config.charset">config.charset</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="config.rpath">
<term><command>config.rpath</command></term>
<listitem>
<para>Outputs a system-dependent set of variables, describing how
to set the runtime search path of shared libraries in an
executable</para>
<indexterm zone="ch-system-gettext config.rpath">
<primary sortas="b-config.rpath">config.rpath</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="envsubst">
<term><command>envsubst</command></term>
<listitem>

2
chapter06/gmp.xml
View File

@ -111,7 +111,7 @@ make install-html</userinput></screen>
<segtitle>Installed directory</segtitle>
<seglistitem>
<seg>libgmp.{a,so} and libgmpxx.{a,so}</seg>
<seg>libgmp.so and libgmpxx.so</seg>
<seg>/usr/share/doc/gmp-&gmp-version;</seg>
</seglistitem>
</segmentedlist>

2
chapter06/gperf.xml
View File

@ -65,9 +65,11 @@
<segmentedlist>
<segtitle>Installed program</segtitle>
<segtitle>Installed directory</segtitle>
<seglistitem>
<seg>gperf</seg>
<seg>/usr/share/doc/gperf-&gperf-version;</seg>
</seglistitem>
</segmentedlist>

79
chapter06/groff.xml
View File

@ -73,13 +73,13 @@
<segtitle>Installed directories</segtitle>
<seglistitem>
<seg>addftinfo, afmtodit, chem, eqn, eqn2graph, gdiffmk,
geqn (link to eqn), grap2graph, grn, grodvi, groff, groffer, grog,
grolbp, grolj4, grops, grotty, gtbl (link to tbl), hpftodit,
indxbib, lkbib, lookbib, mmroff, neqn, nroff, pdfroff, pfbtops, pic,
pic2graph, post-grohtml, preconv, pre-grohtml, refer, roff2dvi,
roff2html, roff2pdf, roff2ps, roff2text, roff2x, soelim, tbl, tfmtodit,
and troff</seg>
<seg>addftinfo, afmtodit, chem, eqn, eqn2graph, gdiffmk, glilypond,
gperl, gpinyin, grap2graph, grn, grodvi, groff, groffer, grog, grolbp,
grolj4, gropdf, grops, grotty, hpftodit, indxbib, lkbib, lookbib,
mmroff, neqn, nroff, pdfmom, pdfroff, pfbtops, pic, pic2graph,
post-grohtml, preconv, pre-grohtml, refer, roff2dvi, roff2html,
roff2pdf, roff2ps, roff2text, roff2x, soelim, tbl, tfmtodit, and
troff</seg>
<seg>/usr/lib/groff and /usr/share/doc/groff-&groff-version;,
/usr/share/groff</seg>
</seglistitem>
@ -154,12 +154,35 @@
</listitem>
</varlistentry>
<varlistentry id="geqn">
<term><command>geqn</command></term>
<varlistentry id="glilypond">
<term><command>glilypond</command></term>
<listitem>
<para>A link to <command>eqn</command></para>
<indexterm zone="ch-system-groff geqn">
<primary sortas="b-geqn">geqn</primary>
<para>Transforms sheet music written in the lilypond language into
the groff language</para>
<indexterm zone="ch-system-groff glilypond">
<primary sortas="b-glilypond">glilypond</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="gperl">
<term><command>gperl</command></term>
<listitem>
<para>Preprocesor for groff, allowing addition of perl code
into groff files</para>
<indexterm zone="ch-system-groff gperl">
<primary sortas="b-gperl">gperl</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="gpinyin">
<term><command>gpinyin</command></term>
<listitem>
<para>Preprocesor for groff, allowing addition of Chinese
European-like language Pinyin into groff files.</para>
<indexterm zone="ch-system-groff gpinyin">
<primary sortas="b-gpinyin">gpinyin</primary>
</indexterm>
</listitem>
</varlistentry>
@ -254,6 +277,17 @@
</listitem>
</varlistentry>
<varlistentry id="gropdf">
<term><command>gropdf</command></term>
<listitem>
<para>Translates the output of GNU <command>troff</command> to
PDF</para>
<indexterm zone="ch-system-groff gropdf">
<primary sortas="b-gropdf">gropdf</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="grops">
<term><command>grops</command></term>
<listitem>
@ -276,16 +310,6 @@
</listitem>
</varlistentry>
<varlistentry id="gtbl">
<term><command>gtbl</command></term>
<listitem>
<para>A link to <command>tbl</command></para>
<indexterm zone="ch-system-groff gtbl">
<primary sortas="b-gtbl">gtbl</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="hpftodit">
<term><command>hpftodit</command></term>
<listitem>
@ -367,6 +391,17 @@
</listitem>
</varlistentry>
<varlistentry id="pdfmom">
<term><command>pdfmom</command></term>
<listitem>
<para>Is a wrapper around groff that facilitates the production of PDF
documents from files formatted with the mom macros.</para>
<indexterm zone="ch-system-groff pdfmom">
<primary sortas="b-pdfmom">pdfmom</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="pdfroff">
<term><command>pdfroff</command></term>
<listitem>

64
chapter06/grub.xml
View File

@ -94,14 +94,17 @@
<seglistitem>
<seg> grub-bios-setup, grub-editenv, grub-fstest,
grub-install, grub-kbdcomp, grub-menulst2cfg, grub-mkconfig,
<seg>grub-bios-setup, grub-editenv, grub-file, grub-fstest,
grub-glue-efi, grub-install, grub-kbdcomp, grub-macbless,
grub-menulst2cfg, grub-mkconfig,
grub-mkimage, grub-mklayout, grub-mknetdir,
grub-mkpasswd-pbkdf2, grub-mkrelpath, grub-mkrescue, grub-mkstandalone,
grub-ofpathname, grub-probe, grub-reboot, grub-script-check,
grub-set-default, grub-sparc64-setup </seg>
grub-ofpathname, grub-probe, grub-reboot, grub-render-label,
grub-script-check,
grub-set-default, grub-sparc64-setup, and grub-syslinux2cfg</seg>
<seg>/usr/lib/grub, /etc/grub.d, /usr/share/grub, /boot/grub</seg>
<seg>/usr/lib/grub, /etc/grub.d, /usr/share/grub, and boot/grub (when grub-install
is first run)</seg>
</seglistitem>
</segmentedlist>
@ -130,6 +133,16 @@
</listitem>
</varlistentry>
<varlistentry id="grub-file">
<term><command>grub-file</command></term>
<listitem>
<para>Checks if FILE is of the specified type.</para>
<indexterm zone="ch-system-grub grub-file">
<primary sortas="b-grub-file">grub-file</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="grub-fstest">
<term><command>grub-fstest</command></term>
<listitem>
@ -140,6 +153,17 @@
</listitem>
</varlistentry>
<varlistentry id="grub-glue-efi">
<term><command>grub-glue-efi</command></term>
<listitem>
<para>Processes ia32 and amd64 EFI images and glues them
according to Apple format.</para>
<indexterm zone="ch-system-grub grub-glue-efi">
<primary sortas="b-grub-glue-efi">grub-glue-efi</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="grub-install">
<term><command>grub-install</command></term>
<listitem>
@ -161,6 +185,16 @@
</listitem>
</varlistentry>
<varlistentry id="grub-macbless">
<term><command>grub-macbless</command></term>
<listitem>
<para>Mac-style bless on HFS or HFS+ files</para>
<indexterm zone="ch-system-grub grub-macbless">
<primary sortas="b-grub-macbless">grub-macbless</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="grub-menulst2cfg">
<term><command>grub-menulst2cfg</command></term>
<listitem>
@ -283,6 +317,16 @@
</listitem>
</varlistentry>
<varlistentry id="grub-render-label">
<term><command>grub-render-label</command></term>
<listitem>
<para>Render Apple .disk_label for Apple Macs</para>
<indexterm zone="ch-system-grub grub-render-label">
<primary sortas="b-grub-render-label">grub-render-label</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="grub-script-check">
<term><command>grub-script-check</command></term>
<listitem>
@ -313,6 +357,16 @@
</listitem>
</varlistentry>
<varlistentry id="grub-syslinux2cfg">
<term><command>grub-syslinux2cfg</command></term>
<listitem>
<para>Transform a syslinux config file into grub.cfg format</para>
<indexterm zone="ch-system-grub grub-syslinux2cfg">
<primary sortas="b-grub-syslinux2cfg">grub-syslinux2cfg</primary>
</indexterm>
</listitem>
</varlistentry>
</variablelist>
</sect2>

4
chapter06/gzip.xml
View File

@ -71,8 +71,8 @@ mv -v /bin/{zfgrep,zforce,zgrep,zless,zmore,znew} /usr/bin</userinput></screen>
<segtitle>Installed programs</segtitle>
<seglistitem>
<seg>gunzip, gzexe, gzip, uncompress, zcat, zcmp, zdiff, zegrep, zfgrep,
zforce, zgrep, zless, zmore, and znew</seg>
<seg>gunzip, gzexe, gzip, uncompress (hard link with gunzip), zcat, zcmp,
zdiff, zegrep, zfgrep, zforce, zgrep, zless, zmore, and znew</seg>
</seglistitem>
</segmentedlist>

34
chapter06/inetutils.xml
View File

@ -133,8 +133,8 @@ mv -v /usr/bin/ifconfig /sbin</userinput></screen>
<segtitle>Installed programs</segtitle>
<seglistitem>
<seg>ftp, ifconfig, hostname, ping, ping6, rcp, rexec, rlogin,
rsh, talk, telnet, tftp, and traceroute</seg>
<seg>dnsdomainname, ftp, ifconfig, hostname, ping, ping6,
talk, telnet, tftp, and traceroute</seg>
</seglistitem>
</segmentedlist>
@ -143,6 +143,16 @@ mv -v /usr/bin/ifconfig /sbin</userinput></screen>
<?dbfo list-presentation="list"?>
<?dbhtml list-presentation="table"?>
<varlistentry id="dnsdomainname">
<term><command>dnsdomainname</command></term>
<listitem>
<para>Show the system's DNS domain name</para>
<indexterm zone="ch-system-inetutils dnsdomainname">
<primary sortas="b-dnsdomainname">dnsdomainname</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="ftp">
<term><command>ftp</command></term>
<listitem>
@ -153,16 +163,6 @@ mv -v /usr/bin/ifconfig /sbin</userinput></screen>
</listitem>
</varlistentry>
<varlistentry id="ifconfig">
<term><command>ifconfig</command></term>
<listitem>
<para>Manages network interfaces</para>
<indexterm zone="ch-system-inetutils ifconfig">
<primary sortas="b-ifconfig">ifconfig</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="hostname">
<term><command>hostname</command></term>
<listitem>
@ -173,6 +173,16 @@ mv -v /usr/bin/ifconfig /sbin</userinput></screen>
</listitem>
</varlistentry>
<varlistentry id="ifconfig">
<term><command>ifconfig</command></term>
<listitem>
<para>Manages network interfaces</para>
<indexterm zone="ch-system-inetutils ifconfig">
<primary sortas="b-ifconfig">ifconfig</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="ping">
<term><command>ping</command></term>
<listitem>

24
chapter06/kbd.xml
View File

@ -133,10 +133,10 @@ cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
kbd_mode, kbdrate, loadkeys, loadunimap,
mapscrn, openvt, psfaddtable (link to psfxtable), psfgettable (link to
psfxtable), psfstriptable (link to psfxtable), psfxtable, <!--resizecons,-->
setfont, setkeycodes, setleds, setmetamode,
setfont, setkeycodes, setleds, setmetamode, setvtrgb,
showconsolefont, showkey, unicode_start, and unicode_stop</seg>
<seg>/usr/share/consolefonts, /usr/share/consoletrans, /usr/share/keymaps,
and /usr/share/unimaps</seg>
/usr/share/doc/kbd-&kbd-version;, and /usr/share/unimaps</seg>
</seglistitem>
</segmentedlist>
@ -309,16 +309,6 @@ cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
</listitem>
</varlistentry>
<!--<varlistentry id="resizecons">
<term><command>resizecons</command></term>
<listitem>
<para>Changes the kernel idea of the console size</para>
<indexterm zone="ch-system-kbd resizecons">
<primary sortas="b-resizecons">resizecons</primary>
</indexterm>
</listitem>
</varlistentry>-->
<varlistentry id="setfont">
<term><command>setfont</command></term>
<listitem>
@ -361,6 +351,16 @@ cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
</listitem>
</varlistentry>
<varlistentry id="setvtrgb">
<term><command>setvtrgb</command></term>
<listitem>
<para>Sets the console color map in all virtual terminals</para>
<indexterm zone="ch-system-kbd setvtrgb">
<primary sortas="b-setvtrgb">setvtrgb</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="showconsolefont">
<term><command>showconsolefont</command></term>
<listitem>

2
chapter06/libcap.xml
View File

@ -91,7 +91,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libcap.so) /usr/lib/libcap.so</userinput><
<seglistitem>
<seg>capsh, getcap, getpcaps, and setcap</seg>
<seg>libcap.{a,so}</seg>
<seg>libcap.so</seg>
</seglistitem>
</segmentedlist>

2
chapter06/libtool.xml
View File

@ -75,7 +75,7 @@
<seglistitem>
<seg>libtool and libtoolize</seg>
<seg>libltdl.{a,so}</seg>
<seg>libltdl.so</seg>
<seg>/usr/include/libltdl and /usr/share/libtool</seg>
</seglistitem>
</segmentedlist>

16
chapter06/man-db.xml
View File

@ -279,9 +279,9 @@
<seglistitem>
<seg>accessdb, apropos (link to whatis), catman, lexgrog, man, mandb,
manpath, whatis, and zsoelim</seg>
manpath, and whatis</seg>
<seg>libman.so and libmandb.so</seg>
<seg>/usr/lib/man-db, /usr/libexec/man-db,
<seg>/usr/lib/man-db, /usr/lib/tmpfiles.d, /usr/libexec/man-db,
and /usr/share/doc/man-db-&man-db-version;</seg>
</seglistitem>
</segmentedlist>
@ -379,18 +379,6 @@
</listitem>
</varlistentry>
<varlistentry id="zsoelim">
<term><command>zsoelim</command></term>
<listitem>
<para>Reads files and replaces lines of the form <emphasis>.so
file</emphasis> by the contents of the mentioned
<emphasis>file</emphasis></para>
<indexterm zone="ch-system-man-db zsoelim">
<primary sortas="b-zsoelim">zsoelim</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="libman">
<term><filename class="libraryfile">libman</filename></term>
<listitem>

2
chapter06/mpc.xml
View File

@ -73,7 +73,7 @@ make install-html</userinput></screen>
<segtitle>Installed Directory</segtitle>
<seglistitem>
<seg>libmpc.{a,so}</seg>
<seg>libmpc.so</seg>
<seg>/usr/share/doc/mpc-&mpc-version;</seg>
</seglistitem>
</segmentedlist>

2
chapter06/mpfr.xml
View File

@ -83,7 +83,7 @@ make install-html</userinput></screen>
<segtitle>Installed directory</segtitle>
<seglistitem>
<seg>libmpfr.{a,so}</seg>
<seg>libmpfr.so</seg>
<seg>/usr/share/doc/mpfr-&mpfr-version;</seg>
</seglistitem>
</segmentedlist>

1
chapter06/ncurses.xml
View File

@ -188,6 +188,7 @@ cp -av lib/lib*.so.5* /usr/lib</userinput></screen>
libformw.so,
libmenuw.so,
libncursesw.so,
libncurses++w.a,
libpanelw.so, and their non-wide-character counterparts without "w"
in the library names.</seg>
<seg>

35
chapter06/perl.xml
View File

@ -135,14 +135,13 @@ unset BUILD_ZLIB BUILD_BZIP2</userinput></screen>
<segtitle>Installed directory</segtitle>
<seglistitem>
<seg>a2p, c2ph, corelist, cpan, cpan2dist, cpanp,
cpanp-run-perl, enc2xs, find2perl, h2ph, h2xs,
instmodsh, json_pp, libnetcfg, perl, perl&perl-version; (link to perl),
perlbug, perldoc, perlivp, perlthanks (link to perlbug), piconv, pl2pm,
pod2html, pod2latex, pod2man, pod2text, pod2usage, podchecker,
podselect, prove, psed (link to s2p), pstruct (link to c2ph), ptar,
ptardiff, ptargrep, s2p, shasum, splain, xsubpp, and zipdetails</seg>
<seg>Several hundred which cannot all be listed here</seg>
<seg>c2ph, corelist, cpan, enc2xs, encguess, h2ph, h2xs, instmodsh,
json_pp, libnetcfg, perl, perl&perl-version; (hard link to perl),
perlbug, perldoc, perlivp, perlthanks (hard link to perlbug), piconv,
pl2pm, pod2html, pod2man, pod2text, pod2usage, podchecker, podselect,
prove, pstruct (hard link to c2ph), ptar, ptardiff, ptargrep, shasum,
splain, xsubpp, and zipdetails</seg>
<seg>Many which cannot all be listed here</seg>
<seg>/usr/lib/perl5</seg>
</seglistitem>
</segmentedlist>
@ -236,6 +235,16 @@ unset BUILD_ZLIB BUILD_BZIP2</userinput></screen>
</listitem>
</varlistentry>
<varlistentry id="encguess">
<term><command>encguess</command></term>
<listitem>
<para>Guess the encoding type of one or several files</para>
<indexterm zone="ch-system-perl encguess">
<primary sortas="b-encguess">encguess</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="find2perl">
<term><command>find2perl</command></term>
<listitem>
@ -472,16 +481,6 @@ unset BUILD_ZLIB BUILD_BZIP2</userinput></screen>
</listitem>
</varlistentry>
<varlistentry id="psed">
<term><command>psed</command></term>
<listitem>
<para>A Perl version of the stream editor <command>sed</command></para>
<indexterm zone="ch-system-perl psed">
<primary sortas="b-psed">psed</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="pstruct">
<term><command>pstruct</command></term>
<listitem>

4
chapter06/readline.xml
View File

@ -105,8 +105,8 @@ ln -sfv ../../lib/$(readlink /usr/lib/libhistory.so ) /usr/lib/libhistory.so</us
<segtitle>Installed directories</segtitle>
<seglistitem>
<seg>libhistory.{a,so} and libreadline.{a,so}</seg>
<seg>/usr/include/readline, /usr/share/readline, and
<seg>libhistory.so and libreadline.so</seg>
<seg>/usr/include/readline and
/usr/share/doc/readline-&readline-version;</seg>
</seglistitem>
</segmentedlist>

11
chapter06/revisedchroot.xml
View File

@ -46,12 +46,11 @@
libraries are from binutils, bzip2, e2fsprogs, <!--flex,--> libtool, and zlib. If desired,
remove them now:</para>
<screen><userinput>rm /usr/lib/lib{bfd,opcodes}.a
rm /usr/lib/libbz2.a
rm /usr/lib/lib{com_err,e2p,ext2fs,ss}.a
<!--rm /usr/lib/lib{fl,fl_pic}.a
-->rm /usr/lib/libltdl.a
rm /usr/lib/libz.a</userinput></screen>
<screen><userinput>rm -f /usr/lib/lib{bfd,opcodes}.a
rm -f /usr/lib/libbz2.a
rm -f /usr/lib/lib{com_err,e2p,ext2fs,ss}.a
rm -f /usr/lib/libltdl.a
rm -f /usr/lib/libz.a</userinput></screen>
<!-- Flex shared library is broken. Keep static until next flex release. -->

26
chapter06/shadow.xml
View File

@ -211,9 +211,9 @@ ln -sfv ../../lib/libshadow.so.0 /usr/lib/libshadow.so</userinput></screen> -->
<seglistitem>
<seg>chage, chfn, chgpasswd, chpasswd, chsh, expiry, faillog, gpasswd,
groupadd, groupdel, groupmems, groupmod, grpck, grpconv, grpunconv,
lastlog, login, logoutd, newgrp, newusers, nologin, passwd, pwck,
pwconv, pwunconv, sg (link to newgrp), su, useradd, userdel, usermod,
vigr (link to vipw), and vipw</seg>
lastlog, login, logoutd, newgidmap, newgrp, newuidmap, newusers,
nologin, passwd, pwck, pwconv, pwunconv, sg (link to newgrp), su,
useradd, userdel, usermod, vigr (link to vipw), and vipw</seg>
<seg>/etc/default</seg>
</seglistitem>
</segmentedlist>
@ -414,6 +414,16 @@ ln -sfv ../../lib/libshadow.so.0 /usr/lib/libshadow.so</userinput></screen> -->
</listitem>
</varlistentry>
<varlistentry id="newgidmap">
<term><command>newgidmap</command></term>
<listitem>
<para>Is used to set the gid mapping of a user namespace</para>
<indexterm zone="ch-system-shadow newgidmap">
<primary sortas="b-newgidmap">newgidmap</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="newgrp">
<term><command>newgrp</command></term>
<listitem>
@ -424,6 +434,16 @@ ln -sfv ../../lib/libshadow.so.0 /usr/lib/libshadow.so</userinput></screen> -->
</listitem>
</varlistentry>
<varlistentry id="newuidmap">
<term><command>newuidmap</command></term>
<listitem>
<para>Is used to set the uid mapping of a user namespace</para>
<indexterm zone="ch-system-shadow newuidmap">
<primary sortas="b-newuidmap">newuidmap</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="newusers">
<term><command>newusers</command></term>
<listitem>

17
chapter06/tar.xml
View File

@ -76,11 +76,7 @@
<screen><userinput remap="install">make install
make -C doc install-html docdir=/usr/share/doc/tar-&tar-version;</userinput></screen>
<!--
<para>Finally, generate the man page and place it in the proper location:</para>
<screen><userinput remap="install">perl tarman &gt; /usr/share/man/man1/tar.1</userinput></screen>
-->
</sect2>
@ -92,7 +88,7 @@ make -C doc install-html docdir=/usr/share/doc/tar-&tar-version;</userinput></sc
<segtitle>Installed directory</segtitle>
<seglistitem>
<seg>rmt and tar</seg>
<seg>tar</seg>
<seg>/usr/share/doc/tar-&tar-version;</seg>
</seglistitem>
</segmentedlist>
@ -102,17 +98,6 @@ make -C doc install-html docdir=/usr/share/doc/tar-&tar-version;</userinput></sc
<?dbfo list-presentation="list"?>
<?dbhtml list-presentation="table"?>
<varlistentry id="rmt">
<term><command>rmt</command></term>
<listitem>
<para>Remotely manipulates a magnetic
tape drive through an interprocess communication connection</para>
<indexterm zone="ch-system-tar rmt">
<primary sortas="b-rmt">rmt</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="tar">
<term><command>tar</command></term>
<listitem>

13
chapter06/texinfo.xml
View File

@ -101,7 +101,7 @@ popd</userinput></screen>
<segtitle>Installed directory</segtitle>
<seglistitem>
<seg>info, infokey, install-info, makeinfo (link to texi2any),
<seg>info, install-info, makeinfo (link to texi2any),
pdftexi2dvi, pod2texi, texi2any, texi2dvi, texi2pdf, and texindex</seg>
<seg>/usr/share/texinfo</seg>
</seglistitem>
@ -125,17 +125,6 @@ popd</userinput></screen>
</listitem>
</varlistentry>
<varlistentry id="infokey">
<term><command>infokey</command></term>
<listitem>
<para>Compiles a source file containing Info customizations into a
binary format</para>
<indexterm zone="ch-system-texinfo infokey">
<primary sortas="b-infokey">infokey</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="install-info">
<term><command>install-info</command></term>
<listitem>

39
chapter06/util-linux.xml
View File

@ -123,17 +123,21 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
fsck.cramfs, fsck.minix, fsfreeze, fstrim, getopt, hexdump, hwclock,
i386, ionice, ipcmk, ipcrm, ipcs, isosize, kill, last, lastb (link to
last), ldattach, linux32, linux64, logger, look, losetup, lsblk, lscpu,
lslocks, lslogins, mcookie, mkfs, mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap,
more, mount, mountpoint, namei, partx, pg, pivot_root, prlimit, raw,
lsipc, lslocks, lslogins, mcookie, mesg, mkfs, mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap,
more, mount, mountpoint, namei, nsenter, partx, pg, pivot_root, prlimit, raw,
readprofile, rename, renice, resizepart, rev, rtcwake, script,
scriptreplay, setarch, setsid, setterm, sfdisk, sulogin, swaplabel,
swapoff (link to swapon), swapon, switch_root, tailf, taskset, ul,
umount, unshare, utmpdump, uuidd, uuidgen, wall, wdctl, whereis,
umount, uname26, unshare, utmpdump, uuidd, uuidgen, wall, wdctl, whereis,
wipefs, x86_64, and zramctl</seg>
<seg>libblkid.{a,so}, libfdisk.{a,so}, libmount.{a,so},
libsmartcols.{a,so}, and libuuid.{a,so}</seg>
<seg>/etc/terminal-colors.d, /usr/include/blkid, /usr/include/libmount,
/usr/include/uuid, /usr/share/doc/util-linux-&util-linux-version;/getopt,
<seg>libblkid.so, libfdisk.so, libmount.so,
libsmartcols.so, and libuuid.so</seg>
<seg>/usr/include/blkid,
/usr/include/libfdisk,
/usr/include/libmount,
/usr/include/libsmartcols,
/usr/include/uuid,
/usr/share/doc/util-linux-&util-linux-version;,
and /var/lib/hwclock</seg>
</seglistitem>
</segmentedlist>
@ -641,6 +645,17 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
</listitem>
</varlistentry>
<varlistentry id="lsipc">
<term><command>lsipc</command></term>
<listitem>
<para>Prints information on IPC facilities currently employed
in the system</para>
<indexterm zone="ch-system-util-linux lsipc">
<primary sortas="b-lsipc">lsipc</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="lslocks">
<term><command>lslocks</command></term>
<listitem>
@ -1057,6 +1072,16 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
</listitem>
</varlistentry>
<varlistentry id="uname26">
<term><command>uname26</command></term>
<listitem>
<para>A symbolic link to setarch</para>
<indexterm zone="ch-system-util-linux uname26">
<primary sortas="b-uname26">uname26</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="unshare">
<term><command>unshare</command></term>
<listitem>

4
general.ent
View File

@ -1,7 +1,7 @@
<!ENTITY version "SVN-20151011">
<!ENTITY version "SVN-20151012">
<!ENTITY short-version "svn"> <!-- Used below in &blfs-book;. Change to x.y for release
but not -rc releases -->
<!ENTITY releasedate "October 11, 2015">
<!ENTITY releasedate "October 12, 2015">
<!ENTITY copyrightdate "1999-2015"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.9">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

20
packages.ent
View File

@ -28,7 +28,7 @@
<!ENTITY autoconf-md5 "50f97f4159805e374639a73e2636f22e">
<!ENTITY autoconf-home "&gnu-software;autoconf/">
<!ENTITY autoconf-ch6-du "17.3 MB">
<!ENTITY autoconf-ch6-sbu "4.0 SBU">
<!ENTITY autoconf-ch6-sbu "less than 0.1 SBU (about 4.7 SBU with tests)">
<!ENTITY automake-version "1.15">
<!ENTITY am-minor-version "1.15">
@ -382,12 +382,12 @@
<!ENTITY linux-major-version "4">
<!ENTITY linux-minor-version "2">
<!ENTITY linux-patch-version "1">
<!ENTITY linux-patch-version "3">
<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
<!ENTITY linux-size "83,514 KB">
<!ENTITY linux-size "83,520 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
<!ENTITY linux-md5 "2a538d1dac3f5426c7a8ab8ef20e95c2">
<!ENTITY linux-md5 "936530a3b28f38ec9dbfa1fcabe9acd4">
<!ENTITY linux-home "http://www.kernel.org/">
<!-- measured for 3.9.0 / gcc-4.8.0 on x86_64 : minimum is
allnoconfig extended for a hopefully-bootable build on desktop machine,
@ -420,10 +420,10 @@
<!ENTITY make-ch6-du "12.2 MB">
<!ENTITY make-ch6-sbu "0.6 SBU">
<!ENTITY man-db-version "2.7.3">
<!ENTITY man-db-size "1,468 KB">
<!ENTITY man-db-version "2.7.4">
<!ENTITY man-db-size "1,469 KB">
<!ENTITY man-db-url "&savannah;/releases/man-db/man-db-&man-db-version;.tar.xz">
<!ENTITY man-db-md5 "df898c82d766dad6492a5a96d5a26647">
<!ENTITY man-db-md5 "1b400af5b03c7ac44769dbfdd28a86fc">
<!ENTITY man-db-home "http://www.nongnu.org/man-db/">
<!ENTITY man-db-ch6-du "30 MB">
<!ENTITY man-db-ch6-sbu "0.4 SBU">
@ -577,10 +577,10 @@
<!ENTITY texinfo-ch6-du "105 MB">
<!ENTITY texinfo-ch6-sbu "0.6 SBU">
<!ENTITY tzdata-version "2015f">
<!ENTITY tzdata-size "292 KB">
<!ENTITY tzdata-version "2015g">
<!ENTITY tzdata-size "294 KB">
<!ENTITY tzdata-url "http://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
<!ENTITY tzdata-md5 "e3b82732d20e973e48af1c6f13df9a1d">
<!ENTITY tzdata-md5 "8d46e8b225b9a04c75f5c39636435ad6">
<!ENTITY tzdata-home "http://www.iana.org/time-zones">
<!ENTITY udev-lfs-version "udev-lfs-20140408">

2
pdf-fixups.sh
View File

@ -14,3 +14,5 @@ LINE=$(( LINE - 1 ))
# Not needed
#sed -i -e "$LINE s/monospace/&\" font-size=\"9pt/" $FILE
# Break a block of code at the right place
sed -i -e 's@gcc --version@<fo:block page-break-before="always"></fo:block>&@' $FILE