From ce5ebe1429b10c536f09c3f4d8e1c6e8e0cb6e46 Mon Sep 17 00:00:00 2001 From: Matthew Burgess Date: Mon, 11 Feb 2013 20:15:37 +0000 Subject: Remove trailing whitespace from all files. git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10122 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter06/coreutils.xml | 2 +- chapter06/e2fsprogs.xml | 10 +++++----- chapter06/flex.xml | 2 +- chapter06/gcc.xml | 10 +++++----- chapter06/glibc.xml | 24 ++++++++++++------------ chapter06/grub.xml | 4 ++-- chapter06/iproute2.xml | 6 +++--- chapter06/kbd.xml | 2 +- chapter06/kernfs.xml | 2 +- chapter06/kmod.xml | 4 ++-- chapter06/linux-headers.xml | 22 +++++++++++----------- chapter06/ncurses.xml | 6 +++--- chapter06/perl.xml | 2 +- chapter06/pkgconfig.xml | 2 +- chapter06/pkgmgt.xml | 6 +++--- chapter06/popt.xml | 2 +- chapter06/procps.xml | 16 ++++++++-------- chapter06/psmisc.xml | 2 +- chapter06/systemd.xml | 10 +++++----- chapter06/util-linux.xml | 8 ++++---- 20 files changed, 71 insertions(+), 71 deletions(-) (limited to 'chapter06') diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index 5f6f8c131..374df8171 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -151,7 +151,7 @@ sed -i s/\"1\"/\"8\"/1 /usr/share/man/man8/chroot.8 id, install, join, link, ln, logname, ls, md5sum, mkdir, mkfifo, mknod, mktemp, mv, nice, nl, nohup, nproc, od, paste, pathchk, pinky, pr, printenv, printf, ptx, pwd, readlink, realpath, rm, rmdir, runcon, seq, - sha1sum, sha224sum, sha256sum, sha384sum, sha512sum, shred, shuf, sleep, + sha1sum, sha224sum, sha256sum, sha384sum, sha512sum, shred, shuf, sleep, sort, split, stat, stdbuf, stty, sum, sync, tac, tail, tee, test, timeout, touch, tr, true, truncate, tsort, tty, uname, unexpand, uniq, unlink, users, vdir, wc, who, whoami, and yes diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml index 59a98e83b..b9c4ec8b1 100644 --- a/chapter06/e2fsprogs.xml +++ b/chapter06/e2fsprogs.xml @@ -25,7 +25,7 @@ The E2fsprogs package contains the utilities for handling the ext2 file system. It also - supports the ext3 and + supports the ext3 and ext4 journaling file systems. @@ -129,7 +129,7 @@ cd build make install-libs - Make the installed static libraries writable so debugging symbols can + Make the installed static libraries writable so debugging symbols can be removed later: chmod -v u+w /usr/lib/{libcom_err,libe2p,libext2fs,libss}.a @@ -296,8 +296,8 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info e2undo - Replays the undo log undo_log for an ext2/ext3/ext4 filesystem - found on a device. This can be used to undo a failed operation by an + Replays the undo log undo_log for an ext2/ext3/ext4 filesystem + found on a device. This can be used to undo a failed operation by an e2fsprogs program. e2undo @@ -362,7 +362,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.infofsck.ext4dev By default checks ext4 - development file systems. This is a hard link to + development file systems. This is a hard link to e2fsck. fsck.ext4dev diff --git a/chapter06/flex.xml b/chapter06/flex.xml index 8f97a7c9d..a331d669c 100644 --- a/chapter06/flex.xml +++ b/chapter06/flex.xml @@ -122,7 +122,7 @@ chmod -v 755 /usr/bin/lex flex++ - An extension of flex, is used for generating C++ code + An extension of flex, is used for generating C++ code and classes. It is a symbolic link to flex flex++ diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index e6909b7df..f15144dae 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -51,7 +51,7 @@ As in , apply the following sed to force the build to use the compiler flag in order to ensure - consistent compiler builds: + consistent compiler builds: case `uname -m` in i?86) sed -i 's/^T_CFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in ;; @@ -101,9 +101,9 @@ cd ../gcc-build , that can be used to allow gcc to do do "link time optimization" if specified. No packages in LFS or BLFS currently use this capability. - + To use this feature, it must also be enabled in - binutils. + binutils. Compile the package: @@ -311,14 +311,14 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib Installed directories - c++, cc (link to gcc), cpp, g++, gcc, + c++, cc (link to gcc), cpp, g++, gcc, gcc-ar, gcc-nm, gcc-ranlib, gccbug, and gcov libgcc.a, libgcc_eh.a, libgcc_s.so, libgcov.a, libgomp.{a,so}, liblto_plugin.so, libmudflap.{a,so}, libmudflapth.{a,so}, libquadmath.{a,so}, libssp.{a,so}, libssp_nonshared.a, libstdc++.{a,so} and libsupc++.a - + /usr/include/c++, /usr/lib/gcc, /usr/share/gcc-&gcc-version; diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index aa8bc2f73..e3f0f50d5 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -126,8 +126,8 @@ grep Error glibc-check-log The nptl/tst-clock2, - nptl/tst-attr3, - tst/tst-cputimer1, and + nptl/tst-attr3, + tst/tst-cputimer1, and rt/tst-cpuclock2 tests have been known to fail. The reason is not completely understood, but indications are that minor @@ -139,20 +139,20 @@ grep Error glibc-check-log systems where the CPU is not a relatively new genuine Intel or authentic AMD processor. - + When running on older and slower hardware or on systems under load, some tests can fail because of test timeouts being exceeded. - Modifying the make check command to set a TIMEOUTFACTOR is reported to + Modifying the make check command to set a TIMEOUTFACTOR is reported to help eliminate these errors (e.g. TIMEOUTFACTOR=16 make -k check). - + - Other tests known to fail on some architectures are posix/bug-regex32, + Other tests known to fail on some architectures are posix/bug-regex32, misc/tst-writev, elf/check-textrel, nptl/tst-getpid2, and stdio-common/bug22. - + Though it is a harmless message, the install stage of Glibc will @@ -166,7 +166,7 @@ grep Error glibc-check-log make install Install NIS and RPC related headers that are not installed by - default; these are required to rebuild glibc and by several BLFS + default; these are required to rebuild glibc and by several BLFS packages: cp -v ../glibc-&glibc-version;/sunrpc/rpc/*.h /usr/include/rpc @@ -276,13 +276,13 @@ EOF tar -xf ../tzdata&tzdata-version;.tar.gz ZONEINFO=/usr/share/zoneinfo -mkdir -pv $ZONEINFO/{posix,right} +mkdir -pv $ZONEINFO/{posix,right} for tz in etcetera southamerica northamerica europe africa antarctica \ asia australasia backward pacificnew solar87 solar88 solar89 \ systemv; do - zic -L /dev/null -d $ZONEINFO -y "sh yearistype.sh" ${tz} - zic -L /dev/null -d $ZONEINFO/posix -y "sh yearistype.sh" ${tz} + zic -L /dev/null -d $ZONEINFO -y "sh yearistype.sh" ${tz} + zic -L /dev/null -d $ZONEINFO/posix -y "sh yearistype.sh" ${tz} zic -L leapseconds -d $ZONEINFO/right -y "sh yearistype.sh" ${tz} done @@ -402,7 +402,7 @@ unset ZONEINFO EOF If desired, the dynamic loader can also search a directory and - include the contents of files found there. Generally the files in + include the contents of files found there. Generally the files in this include directory are one line specifying the desired library path. To add this capability run the following commands: diff --git a/chapter06/grub.xml b/chapter06/grub.xml index 5be1d7f74..6354a4777 100644 --- a/chapter06/grub.xml +++ b/chapter06/grub.xml @@ -67,7 +67,7 @@ make install - Using GRUB to make your LFS system bootable will be discussed in + Using GRUB to make your LFS system bootable will be discussed in . @@ -80,7 +80,7 @@ Installed directories - + grub-bios-setup, grub-editenv, grub-fstest, grub-install, grub-kbdcomp, grub-menulst2cfg, grub-mkconfig, grub-mkimage, grub-mklayout, grub-mknetdir, diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml index b367d20ef..b912ca4db 100644 --- a/chapter06/iproute2.xml +++ b/chapter06/iproute2.xml @@ -142,9 +142,9 @@ sed -i 's/arpd.8//' man/man8/Makefile ifcfg - A shell script wrapper for the ip command. - Note that it requires the arping and - rdisk programs from the + A shell script wrapper for the ip command. + Note that it requires the arping and + rdisk programs from the iputils package found at . ifcfg diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml index ea4fdffc5..97adb6899 100644 --- a/chapter06/kbd.xml +++ b/chapter06/kbd.xml @@ -124,7 +124,7 @@ cp -R -v doc/* \ Installed directory - chvt, deallocvt, dumpkeys, fgconsole, getkeycodes, kbdinfo, + chvt, deallocvt, dumpkeys, fgconsole, getkeycodes, kbdinfo, kbd_mode, kbdrate, loadkeys, loadunimap, mapscrn, openvt, psfaddtable (link to psfxtable), psfgettable (link to psfxtable), psfstriptable (link to psfxtable), psfxtable, diff --git a/chapter06/kernfs.xml b/chapter06/kernfs.xml index 51bcbe59c..b46f72437 100644 --- a/chapter06/kernfs.xml +++ b/chapter06/kernfs.xml @@ -72,7 +72,7 @@ mknod -m 666 $LFS/dev/null c 1 3 mount -vt proc proc $LFS/proc mount -vt sysfs sysfs $LFS/sys - In some host systems, /dev/shm is a + In some host systems, /dev/shm is a symbolic link to /run/shm. Inside a chroot environment, this temporary file system needs to be mounted separate from the host file system: diff --git a/chapter06/kmod.xml b/chapter06/kmod.xml index b0957c8aa..fb308d5a3 100644 --- a/chapter06/kmod.xml +++ b/chapter06/kmod.xml @@ -58,9 +58,9 @@ --with-rootlibdir This switch ensures that shared library is installed in - /lib instead of + /lib instead of /usr/lib. - + diff --git a/chapter06/linux-headers.xml b/chapter06/linux-headers.xml index ea1959794..9e424516a 100644 --- a/chapter06/linux-headers.xml +++ b/chapter06/linux-headers.xml @@ -54,7 +54,7 @@ Now test and extract the user-visible kernel headers from the source. They are placed in an intermediate local directory and copied to the needed - location because the extraction process removes any existing files in + location because the extraction process removes any existing files in the target directory. There are also some hidden files used by the kernel developers and not needed by LFS that are removed from the intermediate directory. @@ -97,7 +97,7 @@ find dest/include \( -name .install -o -name ..install.cmd \) -delete /usr/include/asm/*.h - + /usr/include/asm-generic/*.h @@ -107,7 +107,7 @@ find dest/include \( -name .install -o -name ..install.cmd \) -delete /usr/include/asm-generic/*.h - + /usr/include/drm/*.h @@ -117,7 +117,7 @@ find dest/include \( -name .install -o -name ..install.cmd \) -delete /usr/include/drm/*.h - + /usr/include/linux/*.h @@ -127,7 +127,7 @@ find dest/include \( -name .install -o -name ..install.cmd \) -delete /usr/include/linux/*.h - + /usr/include/mtd/*.h @@ -137,7 +137,7 @@ find dest/include \( -name .install -o -name ..install.cmd \) -delete /usr/include/mtd/*.h - + /usr/include/rdma/*.h @@ -147,7 +147,7 @@ find dest/include \( -name .install -o -name ..install.cmd \) -delete /usr/include/rdma/*.h - + /usr/include/scsi/*.h @@ -157,7 +157,7 @@ find dest/include \( -name .install -o -name ..install.cmd \) -delete /usr/include/scsi/*.h - + /usr/include/sound/*.h @@ -167,7 +167,7 @@ find dest/include \( -name .install -o -name ..install.cmd \) -delete /usr/include/sound/*.h - + /usr/include/video/*.h @@ -177,7 +177,7 @@ find dest/include \( -name .install -o -name ..install.cmd \) -delete /usr/include/video/*.h - + /usr/include/xen/*.h @@ -187,7 +187,7 @@ find dest/include \( -name .install -o -name ..install.cmd \) -delete /usr/include/xen/*.h - + diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml index ab9ba7dd3..6f9cc3792 100644 --- a/chapter06/ncurses.xml +++ b/chapter06/ncurses.xml @@ -116,8 +116,8 @@ non-wide-character Ncurses libraries. Trick such applications into linking with wide-character libraries by means of symlinks and linker scripts: -for lib in ncurses form panel menu ; do - rm -vf /usr/lib/lib${lib}.so +for lib in ncurses form panel menu ; do + rm -vf /usr/lib/lib${lib}.so echo "INPUT(-l${lib}w)" > /usr/lib/lib${lib}.so ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a ln -sfv ${lib}w.pc /usr/lib/pkgconfig/${lib}.pc @@ -144,7 +144,7 @@ cp -v -R doc/* /usr/share/doc/ncurses-&ncurses-version; The instructions above don't create non-wide-character Ncurses libraries since no package installed by compiling from sources would link against them at runtime. If you must have such libraries because - of some binary-only application or to be compliant with LSB, build + of some binary-only application or to be compliant with LSB, build the package again with the following commands: make distclean diff --git a/chapter06/perl.xml b/chapter06/perl.xml index 4fb45bd1a..24f99adf0 100644 --- a/chapter06/perl.xml +++ b/chapter06/perl.xml @@ -222,7 +222,7 @@ cpanp-run-perl - Perl script that is used to enable flushing of the output + Perl script that is used to enable flushing of the output buffer after each write in spawned processes cpanp-run-perl diff --git a/chapter06/pkgconfig.xml b/chapter06/pkgconfig.xml index d9493e1b8..4b35c67bb 100644 --- a/chapter06/pkgconfig.xml +++ b/chapter06/pkgconfig.xml @@ -55,7 +55,7 @@ --with-internal-glib - This will allow pkg-config to use it's internal version of + This will allow pkg-config to use it's internal version of glib because an external version is not available in LFS. diff --git a/chapter06/pkgmgt.xml b/chapter06/pkgmgt.xml index 8b563ec33..67ffd1cd7 100644 --- a/chapter06/pkgmgt.xml +++ b/chapter06/pkgmgt.xml @@ -227,7 +227,7 @@ make DESTDIR=/usr/pkg/libfoo/1.1 install Creation of package files that include dependency information is complex and is beyond the scope of LFS. - Slackware uses a tar based system for package + Slackware uses a tar based system for package archives. This system purposely does not handle package dependencies as more complex package managers do. For details of Slackware package management, see the root directory (about 250MB uncompressed for a base LFS build), copying that file via network transfer or CD-ROM to the new system and expanding it. From that point, a few configuration files will have to be changed. - Configuration files that may need to be updated include: + Configuration files that may need to be updated include: /etc/hosts, /etc/fstab, /etc/passwd, @@ -268,7 +268,7 @@ make DESTDIR=/usr/pkg/libfoo/1.1 install /etc/ld.so.conf, /etc/sysconfig/rc.site, /etc/sysconfig/network, and - /etc/sysconfig/ifconfig.eth0. + /etc/sysconfig/ifconfig.eth0. A custom kernel may need to be built for the new system depending on diff --git a/chapter06/popt.xml b/chapter06/popt.xml index 1423f12d5..e1f950808 100644 --- a/chapter06/popt.xml +++ b/chapter06/popt.xml @@ -23,7 +23,7 @@ - <para>The Popt package contains a library used by some programs + <para>The Popt package contains a library used by some programs to parse command-line options.</para> <segmentedlist> diff --git a/chapter06/procps.xml b/chapter06/procps.xml index 8da11e5c0..1b59d83af 100644 --- a/chapter06/procps.xml +++ b/chapter06/procps.xml @@ -57,7 +57,7 @@ <term><parameter>--disable-skill</parameter></term> <listitem> <para>This switch disables the obsolete and unportable - skill and snice commands.</para> + skill and snice commands.</para> </listitem> </varlistentry> <varlistentry> @@ -68,23 +68,23 @@ </listitem> </varlistentry> </variablelist> - + <para>Compile the package:</para> <screen><userinput remap="make">make</userinput></screen> - <para>The test suite needs some custom modifications for LFS. + <para>The test suite needs some custom modifications for LFS. The <command>which</command> is not available and the - <command>pmap</command> test does not match a newline character in + <command>pmap</command> test does not match a newline character in two tests. To run the test suite, run the following commands:</para> <screen><userinput remap="test">pushd testsuite sed -i 's|exec which sleep|exec echo /tools/bin/sleep|' config/unix.exp sed -i 's|pmap_initname\\\$|pmap_initname|' pmap.test/pmap.exp - make site.exp + make site.exp DEJAGNU=global-conf.exp runtest popd</userinput></screen> - + <para>Install the package:</para> <screen><userinput remap="install">make install</userinput></screen> @@ -92,7 +92,7 @@ popd</userinput></screen> <para>Finally move the library to a location that can be found if <filename class="directory">/usr</filename> is not mounted.</para> -<screen><userinput remap="install">mv -v /usr/lib/libprocps.so.* /lib +<screen><userinput remap="install">mv -v /usr/lib/libprocps.so.* /lib ln -sfv ../../lib/libprocps.so.1.1.0 /usr/lib/libprocps.so</userinput></screen> </sect2> @@ -105,7 +105,7 @@ ln -sfv ../../lib/libprocps.so.1.1.0 /usr/lib/libprocps.so</userinput></screen> <segtitle>Installed library</segtitle> <seglistitem> - <seg>free, pgrep, pkill, pmap, ps, pwdx, slabtop, + <seg>free, pgrep, pkill, pmap, ps, pwdx, slabtop, sysctl, tload, top, uptime, vmstat, w, and, watch</seg> <seg>libprocps.so</seg> </seglistitem> diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml index 4a2770489..19d31cec1 100644 --- a/chapter06/psmisc.xml +++ b/chapter06/psmisc.xml @@ -55,7 +55,7 @@ <screen><userinput remap="install">make install</userinput></screen> - <para>Finally, move the <command>killall</command> and <command>fuser</command> + <para>Finally, move the <command>killall</command> and <command>fuser</command> programs to the location specified by the FHS:</para> <screen><userinput remap="install">mv -v /usr/bin/fuser /bin diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml index de5d3b968..a312bd05c 100644 --- a/chapter06/systemd.xml +++ b/chapter06/systemd.xml @@ -25,7 +25,7 @@ <para>The Udev package contains programs for dynamic creation of device nodes. The development of udev has been merged with systemd, but - most of systemd is incompatible with LFS. Here we build and install just + most of systemd is incompatible with LFS. Here we build and install just the needed udev files.</para> <segmentedlist> @@ -44,8 +44,8 @@ <note><para>This package is a little different from other packages. The initial package that is extracted is - <filename>systemd-&systemd-version;.tar.xz</filename> even though the - application we are installing is udev. After changing to the + <filename>systemd-&systemd-version;.tar.xz</filename> even though the + application we are installing is udev. After changing to the systemd directory, follow the instructions below.</para></note> <para>The udev-lfs tarball contains LFS-specific files used to build @@ -93,9 +93,9 @@ <seglistitem> <seg>accelerometer, ata_id, cdrom_id, collect, mtd_probe, scsi_id, v4l_id, udevadm, and udevd</seg> - + <seg>libudev.so</seg> - + <seg>/etc/udev, /lib/udev, /lib/firmware, /usr/share/doc/udev</seg> </seglistitem> </segmentedlist> diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml index fd2ea4aab..78bba2fc9 100644 --- a/chapter06/util-linux.xml +++ b/chapter06/util-linux.xml @@ -92,7 +92,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen> <listitem> <para>This switch sets install location for the Systemd units provided with the package.</para> - </listitem> + </listitem> </varlistentry> </variablelist> @@ -131,7 +131,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen> wdctl, whereis, wipefs, and x86_64</seg> <seg>libblkid.{a,so}, libmount.{a,so}, libuuid.{a,so}</seg> - + <seg>/usr/include/blkid, /usr/include/libmount, /usr/include/uuid, /usr/share/getopt, /var/lib/hwclock</seg> </seglistitem> @@ -362,7 +362,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen> <varlistentry id="findmnt"> <term><command>findmnt</command></term> <listitem> - <para>Is a command line interface to the libmount library + <para>Is a command line interface to the libmount library for work with mountinfo, fstab and mtab files</para> <indexterm zone="ch-system-util-linux findmnt"> <primary sortas="b-findmnt">findmnt</primary> @@ -416,7 +416,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen> <varlistentry id="fsfreeze"> <term><command>fsfreeze</command></term> <listitem> - <para>Is a very simple wrapper around FIFREEZE/FITHAW ioctl + <para>Is a very simple wrapper around FIFREEZE/FITHAW ioctl kernel driver operations</para> <indexterm zone="ch-system-util-linux fsfreeze"> <primary sortas="b-fsfreeze">fsfreeze</primary> -- cgit v1.2.3-54-g00ecf