diff options
Diffstat (limited to 'chapter06')
-rw-r--r-- | chapter06/bash.xml | 8 | ||||
-rw-r--r-- | chapter06/chroot.xml | 4 | ||||
-rw-r--r-- | chapter06/e2fsprogs.xml | 19 | ||||
-rw-r--r-- | chapter06/findutils.xml | 5 | ||||
-rw-r--r-- | chapter06/flex.xml | 3 | ||||
-rw-r--r-- | chapter06/gawk.xml | 3 | ||||
-rw-r--r-- | chapter06/gcc.xml | 18 | ||||
-rw-r--r-- | chapter06/glibc.xml | 9 | ||||
-rw-r--r-- | chapter06/grub.xml | 10 | ||||
-rw-r--r-- | chapter06/inetutils.xml | 10 | ||||
-rw-r--r-- | chapter06/iproute2.xml | 4 | ||||
-rw-r--r-- | chapter06/kmod.xml | 10 | ||||
-rw-r--r-- | chapter06/libpipeline.xml | 5 | ||||
-rw-r--r-- | chapter06/man-db.xml | 18 | ||||
-rw-r--r-- | chapter06/mpfr.xml | 5 | ||||
-rw-r--r-- | chapter06/perl.xml | 2 | ||||
-rw-r--r-- | chapter06/psmisc.xml | 2 | ||||
-rw-r--r-- | chapter06/sysvinit.xml | 3 | ||||
-rw-r--r-- | chapter06/tar.xml | 6 | ||||
-rw-r--r-- | chapter06/util-linux.xml | 3 |
20 files changed, 89 insertions, 58 deletions
diff --git a/chapter06/bash.xml b/chapter06/bash.xml index 1e92190da..f6a5ca7a6 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -47,9 +47,11 @@ <para>Prepare Bash for compilation:</para> -<screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin \ - --htmldir=/usr/share/doc/bash-&bash-version; --without-bash-malloc \ - --with-installed-readline</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr \ + --bindir=/bin \ + --htmldir=/usr/share/doc/bash-&bash-version; \ + --without-bash-malloc \ + --with-installed-readline</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> diff --git a/chapter06/chroot.xml b/chapter06/chroot.xml index 08f051e86..c90285c9a 100644 --- a/chapter06/chroot.xml +++ b/chapter06/chroot.xml @@ -16,7 +16,9 @@ realm that is, at the moment, populated with only the temporary tools:</para> <screen><userinput>chroot "$LFS" /tools/bin/env -i \ - HOME=/root TERM="$TERM" PS1='\u:\w\$ ' \ + HOME=/root \ + TERM="$TERM" \ + PS1='\u:\w\$ ' \ PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \ /tools/bin/bash --login +h</userinput></screen> diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml index 8a0efa696..22b6ba24f 100644 --- a/chapter06/e2fsprogs.xml +++ b/chapter06/e2fsprogs.xml @@ -52,10 +52,15 @@ cd build</userinput></screen> <para>Prepare E2fsprogs for compilation:</para> -<screen><userinput remap="configure">PKG_CONFIG=/tools/bin/true LDFLAGS="-lblkid -luuid" \ - ../configure --prefix=/usr --with-root-prefix="" \ - --enable-elf-shlibs --disable-libblkid --disable-libuuid \ - --disable-uuidd --disable-fsck</userinput></screen> +<screen><userinput remap="configure">PKG_CONFIG=/tools/bin/true \ +LDFLAGS="-lblkid -luuid" \ +../configure --prefix=/usr \ + --with-root-prefix="" \ + --enable-elf-shlibs \ + --disable-libblkid \ + --disable-libuuid \ + --disable-uuidd \ + --disable-fsck</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> @@ -139,16 +144,14 @@ cd build</userinput></screen> commands.</para> <screen><userinput remap="install">gunzip -v /usr/share/info/libext2fs.info.gz -install-info --dir-file=/usr/share/info/dir \ - /usr/share/info/libext2fs.info</userinput></screen> +install-info --dir-file=/usr/share/info/dir /usr/share/info/libext2fs.info</userinput></screen> <para>If desired, create and install some additional documentation by issuing the following commands:</para> <screen><userinput remap="install">makeinfo -o doc/com_err.info ../lib/et/com_err.texinfo install -v -m644 doc/com_err.info /usr/share/info -install-info --dir-file=/usr/share/info/dir \ - /usr/share/info/com_err.info</userinput></screen> +install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userinput></screen> </sect2> <sect2 id="contents-e2fsprogs" role="content"> diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml index d7d02cced..96f9a5133 100644 --- a/chapter06/findutils.xml +++ b/chapter06/findutils.xml @@ -45,8 +45,9 @@ <para>Prepare Findutils for compilation:</para> -<screen><userinput remap="configure">./configure --prefix=/usr --libexecdir=/usr/lib/findutils \ - --localstatedir=/var/lib/locate</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr \ + --libexecdir=/usr/lib/findutils \ + --localstatedir=/var/lib/locate</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> diff --git a/chapter06/flex.xml b/chapter06/flex.xml index bb6484912..df31b7f39 100644 --- a/chapter06/flex.xml +++ b/chapter06/flex.xml @@ -88,8 +88,7 @@ chmod -v 755 /usr/bin/lex</userinput></screen> file:</para> <screen><userinput remap="install">mkdir -v /usr/share/doc/flex-&flex-version; -cp -v doc/flex.pdf \ - /usr/share/doc/flex-&flex-version;</userinput></screen> +cp -v doc/flex.pdf /usr/share/doc/flex-&flex-version;</userinput></screen> </sect2> diff --git a/chapter06/gawk.xml b/chapter06/gawk.xml index c52c84508..832def654 100644 --- a/chapter06/gawk.xml +++ b/chapter06/gawk.xml @@ -59,8 +59,7 @@ <para>If desired, install the documentation:</para> <screen><userinput remap="install">mkdir -v /usr/share/doc/gawk-&gawk-version; -cp -v doc/{awkforai.txt,*.{eps,pdf,jpg}} \ - /usr/share/doc/gawk-&gawk-version;</userinput></screen> +cp -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version;</userinput></screen> </sect2> diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index 013d69c8c..834331a2c 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -54,8 +54,7 @@ consistent compiler builds:</para> <screen><userinput remap="pre">case `uname -m` in - i?86) sed -i 's/^T_CFLAGS =$/& -fomit-frame-pointer/' \ - gcc/Makefile.in ;; + i?86) sed -i 's/^T_CFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in ;; esac</userinput></screen> <para>The <command>fixincludes</command> script is known to occasionally @@ -74,11 +73,16 @@ cd ../gcc-build</userinput></screen> <para>Prepare GCC for compilation:</para> -<screen><userinput remap="configure">../gcc-&gcc-version;/configure --prefix=/usr \ - --libexecdir=/usr/lib --enable-shared \ - --enable-threads=posix --enable-__cxa_atexit \ - --enable-clocale=gnu --enable-languages=c,c++ \ - --disable-multilib --disable-bootstrap --with-system-zlib</userinput></screen> +<screen><userinput remap="configure">../gcc-&gcc-version;/configure --prefix=/usr \ + --libexecdir=/usr/lib \ + --enable-shared \ + --enable-threads=posix \ + --enable-__cxa_atexit \ + --enable-clocale=gnu \ + --enable-languages=c,c++ \ + --disable-multilib \ + --disable-bootstrap \ + --with-system-zlib</userinput></screen> <para>Note that for other languages, there are some prerequisites that are not available. See the BLFS Book for instructions on how to diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index 37ec19105..9ff6c5559 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -130,9 +130,12 @@ esac</userinput></screen> <para>Prepare Glibc for compilation:</para> -<screen><userinput remap="configure">../glibc-&glibc-version;/configure --prefix=/usr \ - --disable-profile --enable-add-ons \ - --enable-kernel=2.6.25 --libexecdir=/usr/lib/glibc</userinput></screen> +<screen><userinput remap="configure">../glibc-&glibc-version;/configure \ + --prefix=/usr \ + --disable-profile \ + --enable-add-ons \ + --enable-kernel=2.6.25 \ + --libexecdir=/usr/lib/glibc</userinput></screen> <variablelist> <title>The meaning of the new configure options:</title> diff --git a/chapter06/grub.xml b/chapter06/grub.xml index bf09ac522..33c4ce452 100644 --- a/chapter06/grub.xml +++ b/chapter06/grub.xml @@ -42,11 +42,11 @@ <para>Prepare GRUB for compilation:</para> -<screen><userinput remap="configure">./configure --prefix=/usr \ - --sysconfdir=/etc \ - --disable-grub-emu-usb \ - --disable-efiemu \ - --disable-werror</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr \ + --sysconfdir=/etc \ + --disable-grub-emu-usb \ + --disable-efiemu \ + --disable-werror</userinput></screen> <para>The --disable switches minimize what is built by disabling features and testing programs not really needed for LFS.</para> diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml index b6dd98c97..460fe98c7 100644 --- a/chapter06/inetutils.xml +++ b/chapter06/inetutils.xml @@ -40,9 +40,13 @@ <sect2 role="installation"> <title>Installation of Inetutils</title> -<screen><userinput remap="configure">./configure --prefix=/usr --libexecdir=/usr/sbin \ - --localstatedir=/var --disable-ifconfig \ - --disable-logger --disable-syslogd --disable-whois \ +<screen><userinput remap="configure">./configure --prefix=/usr \ + --libexecdir=/usr/sbin \ + --localstatedir=/var \ + --disable-ifconfig \ + --disable-logger \ + --disable-syslogd \ + --disable-whois \ --disable-servers</userinput></screen> <variablelist> diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml index 5a69518e9..169054a3b 100644 --- a/chapter06/iproute2.xml +++ b/chapter06/iproute2.xml @@ -87,7 +87,9 @@ rm man/man8/arpd.8</userinput></screen> <para>Install the package:</para> -<screen><userinput remap="install">make DESTDIR= MANDIR=/usr/share/man \ +<screen><userinput remap="install"> +make DESTDIR= \ + MANDIR=/usr/share/man \ DOCDIR=/usr/share/doc/iproute2-&iproute2-version; install</userinput></screen> </sect2> diff --git a/chapter06/kmod.xml b/chapter06/kmod.xml index 736e0d129..649cb76d3 100644 --- a/chapter06/kmod.xml +++ b/chapter06/kmod.xml @@ -47,8 +47,12 @@ liblzma_LIBS="-L/lib -llzma" \ zlib_CFLAGS="-I/usr/include" \ zlib_LIBS="-L/lib -lz" \ -./configure --prefix=/usr --bindir=/bin --libdir=/lib --sysconfdir=/etc \ - --with-xz --with-zlib</userinput></screen> +./configure --prefix=/usr \ + --bindir=/bin \ + --libdir=/lib \ + --sysconfdir=/etc \ + --with-xz \ + --with-zlib</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> @@ -77,9 +81,11 @@ zlib_LIBS="-L/lib -lz" \ </para> <screen><userinput remap="install">make pkgconfigdir=/usr/lib/pkgconfig install + for target in depmod insmod modinfo modprobe rmmod; do ln -sv ../bin/kmod /sbin/$target done + ln -sv kmod /bin/lsmod</userinput></screen> </sect2> diff --git a/chapter06/libpipeline.xml b/chapter06/libpipeline.xml index a2a573892..04bc472b4 100644 --- a/chapter06/libpipeline.xml +++ b/chapter06/libpipeline.xml @@ -43,8 +43,9 @@ <para>Prepare Libpipeline for compilation:</para> -<screen><userinput remap="configure">./configure CHECK_CFLAGS=-I/tools/include \ - CHECK_LIBS="-L/tools/lib -lcheck" --prefix=/usr</userinput></screen> +<screen><userinput remap="configure">./configure CHECK_CFLAGS=-I/tools/include \ + CHECK_LIBS="-L/tools/lib -lcheck" \ + --prefix=/usr</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml index 833099bef..d5fa4f5bf 100644 --- a/chapter06/man-db.xml +++ b/chapter06/man-db.xml @@ -43,13 +43,17 @@ <para>Prepare Man-DB for compilation:</para> -<screen><userinput remap="configure">PKG_CONFIG=/tools/bin/true \ - libpipeline_CFLAGS='' \ - libpipeline_LIBS='-lpipeline' \ - ./configure --prefix=/usr --libexecdir=/usr/lib \ - --docdir=/usr/share/doc/man-db-&man-db-version; --sysconfdir=/etc \ - --disable-setuid --with-browser=/usr/bin/lynx \ - --with-vgrind=/usr/bin/vgrind --with-grap=/usr/bin/grap</userinput></screen> +<screen><userinput remap="configure">PKG_CONFIG=/tools/bin/true \ +libpipeline_CFLAGS='' \ +libpipeline_LIBS='-lpipeline' \ +./configure --prefix=/usr \ + --libexecdir=/usr/lib \ + --docdir=/usr/share/doc/man-db-&man-db-version; \ + --sysconfdir=/etc \ + --disable-setuid \ + --with-browser=/usr/bin/lynx \ + --with-vgrind=/usr/bin/vgrind \ + --with-grap=/usr/bin/grap</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> diff --git a/chapter06/mpfr.xml b/chapter06/mpfr.xml index fe183fb7d..b4a6cd28d 100644 --- a/chapter06/mpfr.xml +++ b/chapter06/mpfr.xml @@ -47,8 +47,9 @@ <para>Prepare MPFR for compilation:</para> -<screen><userinput remap="configure">./configure --prefix=/usr --enable-thread-safe \ - --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr \ + --enable-thread-safe \ + --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen> <para>Compile the package:</para> diff --git a/chapter06/perl.xml b/chapter06/perl.xml index 813405376..285c4ec98 100644 --- a/chapter06/perl.xml +++ b/chapter06/perl.xml @@ -66,7 +66,7 @@ this package is built. Alternatively, use the command exactly as below to use the defaults that Perl auto-detects:</para> -<screen><userinput remap="configure">sh Configure -des -Dprefix=/usr \ +<screen><userinput remap="configure">sh Configure -des -Dprefix=/usr \ -Dvendorprefix=/usr \ -Dman1dir=/usr/share/man/man1 \ -Dman3dir=/usr/share/man/man3 \ diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml index b0c0cea89..4a2770489 100644 --- a/chapter06/psmisc.xml +++ b/chapter06/psmisc.xml @@ -58,7 +58,7 @@ <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 +<screen><userinput remap="install">mv -v /usr/bin/fuser /bin mv -v /usr/bin/killall /bin</userinput></screen> </sect2> diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml index 222850613..2acf8972d 100644 --- a/chapter06/sysvinit.xml +++ b/chapter06/sysvinit.xml @@ -52,8 +52,7 @@ <quote>Sending processes configured via /etc/inittab the TERM signal</quote> instead:</para> -<screen><userinput remap="pre">sed -i 's@Sending processes@& configured via /etc/inittab@g' \ - src/init.c</userinput></screen> +<screen><userinput remap="pre">sed -i 's@Sending processes@& configured via /etc/inittab@g' src/init.c</userinput></screen> <para>Maintained versions of the <command>wall</command> and <command>mountpoint</command> programs were diff --git a/chapter06/tar.xml b/chapter06/tar.xml index 94044d6dd..842b17156 100644 --- a/chapter06/tar.xml +++ b/chapter06/tar.xml @@ -42,8 +42,10 @@ <para>Prepare Tar for compilation:</para> -<screen><userinput remap="configure">FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix=/usr \ - --bindir=/bin --libexecdir=/usr/sbin</userinput></screen> +<screen><userinput remap="configure">FORCE_UNSAFE_CONFIGURE=1 \ +./configure --prefix=/usr \ + --bindir=/bin \ + --libexecdir=/usr/sbin</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml index b728a237d..ba93f2825 100644 --- a/chapter06/util-linux.xml +++ b/chapter06/util-linux.xml @@ -49,8 +49,7 @@ <command>hwclock</command> program FHS-compliant, run the following:</para> -<screen><userinput remap="pre">sed -e 's@etc/adjtime@var/lib/hwclock/adjtime@g' \ - -i $(grep -rl '/etc/adjtime' .) +<screen><userinput remap="pre">sed -e 's@etc/adjtime@var/lib/hwclock/adjtime@g' -i $(grep -rl '/etc/adjtime' .) mkdir -pv /var/lib/hwclock</userinput></screen> </sect2> |