diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 929bad666..6ab8be734 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -35,6 +35,17 @@ --> + + 2014-02-18 + + + [bdubbs] - Change kmod instructions to allow + installation of man pages. Fixes + #3502. + + + + 2014-02-16 diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml index 6766005fa..decec8b6f 100644 --- a/chapter05/binutils-pass1.xml +++ b/chapter05/binutils-pass1.xml @@ -72,7 +72,7 @@ cd ../binutils-build Now prepare Binutils for compilation: -../binutils-&binutils-version;/configure \ +../binutils-&binutils-version;/configure \ --prefix=/tools \ --with-sysroot=$LFS \ --with-lib-path=/tools/lib \ diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml index 69d0e3ff3..9ebf763e7 100644 --- a/chapter05/binutils-pass2.xml +++ b/chapter05/binutils-pass2.xml @@ -53,7 +53,7 @@ cd ../binutils-build CC=$LFS_TGT-gcc \ AR=$LFS_TGT-ar \ RANLIB=$LFS_TGT-ranlib \ -../binutils-&binutils-version;/configure \ +../binutils-&binutils-version;/configure \ --prefix=/tools \ --disable-nls \ --with-lib-path=/tools/lib \ diff --git a/chapter05/expect.xml b/chapter05/expect.xml index d53394504..ae6f50026 100644 --- a/chapter05/expect.xml +++ b/chapter05/expect.xml @@ -51,8 +51,9 @@ sed 's:/usr/local/bin:/bin:' configure.orig > configure Now prepare Expect for compilation: -./configure --prefix=/tools --with-tcl=/tools/lib \ - --with-tclinclude=/tools/include +./configure --prefix=/tools \ + --with-tcl=/tools/lib \ + --with-tclinclude=/tools/include The meaning of the configure options: diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index e96c469ad..6fb0792c4 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -77,7 +77,7 @@ esac do cp -uv $file{,.orig} sed -e 's@/lib\(64\)\?\(32\)\?/ld@/tools&@g' \ - -e 's@/usr@/tools@g' $file.orig > $file + -e 's@/usr@/tools@g' $file.orig > $file echo ' #undef STANDARD_STARTFILE_PREFIX_1 #undef STANDARD_STARTFILE_PREFIX_2 diff --git a/chapter05/libstdc++.xml b/chapter05/libstdc++.xml index 9a6ad2415..23d0a3a4a 100644 --- a/chapter05/libstdc++.xml +++ b/chapter05/libstdc++.xml @@ -56,13 +56,13 @@ cd ../gcc-build Prepare Libstdc++ for compilation: ../gcc-&gcc-version;/libstdc++-v3/configure \ - --host=$LFS_TGT \ - --prefix=/tools \ - --disable-multilib \ - --disable-shared \ - --disable-nls \ - --disable-libstdcxx-threads \ - --disable-libstdcxx-pch \ + --host=$LFS_TGT \ + --prefix=/tools \ + --disable-multilib \ + --disable-shared \ + --disable-nls \ + --disable-libstdcxx-threads \ + --disable-libstdcxx-pch \ --with-gxx-include-dir=/tools/$LFS_TGT/include/c++/&gcc-version; diff --git a/chapter05/stripping.xml b/chapter05/stripping.xml index 2d8fe6568..ad2cb3ae0 100644 --- a/chapter05/stripping.xml +++ b/chapter05/stripping.xml @@ -16,10 +16,11 @@ debugging symbols. Remove those symbols with: strip --strip-debug /tools/lib/* -strip --strip-unneeded /tools/{,s}bin/* +/usr/bin/strip --strip-unneeded /tools/{,s}bin/* These commands will skip a number of files, reporting that it does not - recognize their file format. Most of these are scripts instead of binaries. + recognize their file format. Most of these are scripts instead of binaries. + Also use the system strip command to include the strip binary in /tools. Take care not to use --strip-unneeded on the libraries. The static diff --git a/chapter06/creatingdirs.xml b/chapter06/creatingdirs.xml index 5443326a9..8240d2f35 100644 --- a/chapter06/creatingdirs.xml +++ b/chapter06/creatingdirs.xml @@ -22,9 +22,13 @@ mkdir -pv /usr/{,local/}share/{color,dict,doc,info,locale,man} mkdir -v /usr/{,local/}share/{misc,terminfo,zoneinfo} mkdir -v /usr/libexec mkdir -pv /usr/{,local/}share/man/man{1..8} + case $(uname -m) in - x86_64) ln -sv lib /lib64 && ln -sv lib /usr/lib64 && ln -sv lib /usr/local/lib64 ;; + x86_64) ln -sv lib /lib64 && + ln -sv lib /usr/lib64 && + ln -sv lib /usr/local/lib64 ;; esac + mkdir -v /var/{log,mail,spool} ln -sv /run /var/run ln -sv /run/lock /var/lock diff --git a/chapter06/db.xml b/chapter06/db.xml index 0a899962b..5549c2ed4 100644 --- a/chapter06/db.xml +++ b/chapter06/db.xml @@ -273,7 +273,7 @@ - libdb.{so,a} + libdb.{a,so} Contains functions to manipulate database files from C programs @@ -284,7 +284,7 @@ - libdb_cxx.{so,a} + libdb_cxx.{a,so} Contains functions to manipulate database files from C++ programs diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml index c7424bf0c..94a2985b0 100644 --- a/chapter06/findutils.xml +++ b/chapter06/findutils.xml @@ -45,8 +45,7 @@ Prepare Findutils for compilation: -./configure --prefix=/usr \ - --localstatedir=/var/lib/locate +./configure --prefix=/usr --localstatedir=/var/lib/locate The meaning of the configure options: diff --git a/chapter06/flex.xml b/chapter06/flex.xml index 6b4d42363..8ec53658b 100644 --- a/chapter06/flex.xml +++ b/chapter06/flex.xml @@ -47,8 +47,7 @@ Prepare Flex for compilation: -./configure --prefix=/usr \ - --docdir=/usr/share/doc/flex-&flex-version; +./configure --prefix=/usr --docdir=/usr/share/doc/flex-&flex-version; Compile the package: @@ -97,7 +96,7 @@ chmod -v 755 /usr/bin/lex flex, flex++ (link to flex), and lex - libfl.{so,a} and libfl_pic.{so.a} + libfl.{a,so} and libfl_pic.{a,so} /usr/share/doc/flex-&flex-version; diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index 7fe9fe94d..83cac4ece 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -70,16 +70,17 @@ cd ../gcc-build Prepare GCC for compilation: -SED=sed \ -../gcc-&gcc-version;/configure --prefix=/usr \ - --enable-shared \ - --enable-threads=posix \ - --enable-__cxa_atexit \ - --enable-clocale=gnu \ - --enable-languages=c,c++ \ - --disable-multilib \ - --disable-bootstrap \ - --with-system-zlib +SED=sed \ +../gcc-&gcc-version;/configure \ + --prefix=/usr \ + --enable-shared \ + --enable-threads=posix \ + --enable-__cxa_atexit \ + --enable-clocale=gnu \ + --enable-languages=c,c++ \ + --disable-multilib \ + --disable-bootstrap \ + --with-system-zlib 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/gdbm.xml b/chapter06/gdbm.xml index f0e34616d..051207671 100644 --- a/chapter06/gdbm.xml +++ b/chapter06/gdbm.xml @@ -83,7 +83,7 @@ testgdbm - libgdbm.{so,a} and libgdbm_compat.{so,a} + libgdbm.{a,so} and libgdbm_compat.{a,so} diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml index 684cd3060..8c64a5059 100644 --- a/chapter06/gettext.xml +++ b/chapter06/gettext.xml @@ -45,8 +45,7 @@ Prepare Gettext for compilation: -./configure --prefix=/usr \ - --docdir=/usr/share/doc/gettext-&gettext-version; +./configure --prefix=/usr --docdir=/usr/share/doc/gettext-&gettext-version; Compile the package: diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index 4d198ca1b..c88b6a6b0 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -73,10 +73,10 @@ cd ../glibc-build Prepare Glibc for compilation: -../glibc-&glibc-version;/configure \ - --prefix=/usr \ - --disable-profile \ - --enable-kernel=&min-kernel; \ +../glibc-&glibc-version;/configure \ + --prefix=/usr \ + --disable-profile \ + --enable-kernel=&min-kernel; \ --enable-obsolete-rpc diff --git a/chapter06/kmod.xml b/chapter06/kmod.xml index 9832437d1..c772c6436 100644 --- a/chapter06/kmod.xml +++ b/chapter06/kmod.xml @@ -46,7 +46,6 @@ ./configure --prefix=/usr \ --bindir=/bin \ --sysconfdir=/etc \ - --disable-manpages \ --with-rootlibdir=/lib \ --with-xz \ --with-zlib @@ -60,16 +59,16 @@ These options enable Kmod to handle compressed kernel modules. - + --with-rootlibdir=/lib diff --git a/chapter06/pcre.xml b/chapter06/pcre.xml index 800d0aa04..f44e5003d 100644 --- a/chapter06/pcre.xml +++ b/chapter06/pcre.xml @@ -106,7 +106,7 @@ ln -v -sf ../../lib/libpcre.so.0 /usr/lib/libpcre.so pcregrep, pcretest, and pcre-config - libpcre.{so,a}, libpcrecpp.{so,a} and libpcreposix.{so,a} + libpcre.{a,so}, libpcrecpp.{a,so} and libpcreposix.{a,so} /usr/share/doc/pcre-&pcre-version; diff --git a/chapter06/procps.xml b/chapter06/procps.xml index 0114b1e6b..3dbafd4d7 100644 --- a/chapter06/procps.xml +++ b/chapter06/procps.xml @@ -70,7 +70,6 @@ To run the test suite, run the following commands: sed -i -r 's|(pmap_initname)\\\$|\1|' testsuite/pmap.test/pmap.exp - make check Install the package: diff --git a/chapter06/readline.xml b/chapter06/readline.xml index 6ad6ecaaa..2b0c334fc 100644 --- a/chapter06/readline.xml +++ b/chapter06/readline.xml @@ -90,9 +90,8 @@ ln -sfv ../../lib/$(readlink /usr/lib/libhistory.so ) /usr/lib/libhistory.soIf desired, install the documentation: -mkdir -v /usr/share/doc/readline-&readline-version; -install -v -m644 doc/*.{ps,pdf,html,dvi} \ - /usr/share/doc/readline-&readline-version; +mkdir -v /usr/share/doc/readline-&readline-version; +install -v -m644 doc/*.{ps,pdf,html,dvi} /usr/share/doc/readline-&readline-version; diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml index acbbbf7ac..0f30426d8 100644 --- a/chapter06/shadow.xml +++ b/chapter06/shadow.xml @@ -69,8 +69,7 @@ find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \; If you chose to build Shadow with Cracklib support, run the following: -sed -i 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' \ - etc/login.defs +sed -i 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' etc/login.defs Prepare Shadow for compilation: diff --git a/chapter06/strippingagain.xml b/chapter06/strippingagain.xml index 14f87829d..5492e679c 100644 --- a/chapter06/strippingagain.xml +++ b/chapter06/strippingagain.xml @@ -32,15 +32,15 @@ Then reenter it with: -chroot $LFS /tools/bin/env -i \ +chroot $LFS /tools/bin/env -i \ HOME=/root TERM=$TERM PS1='\u:\w\$ ' \ - PATH=/bin:/usr/bin:/sbin:/usr/sbin \ + PATH=/bin:/usr/bin:/sbin:/usr/sbin \ /tools/bin/bash --login Now the binaries and libraries can be safely stripped: /tools/bin/find /{,usr/}{bin,lib,sbin} -type f \ - -exec /tools/bin/strip --strip-debug '{}' ';' + -exec /tools/bin/strip --strip-debug '{}' ';' A large number of files will be reported as having their file format not recognized. These warnings can be safely ignored. These diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml index 063082be0..5afa8965b 100644 --- a/chapter06/util-linux.xml +++ b/chapter06/util-linux.xml @@ -50,7 +50,7 @@ following: sed -i -e 's@etc/adjtime@var/lib/hwclock/adjtime@g' \ - $(grep -rl '/etc/adjtime' .) + $(grep -rl '/etc/adjtime' .) mkdir -pv /var/lib/hwclock diff --git a/chapter06/xz.xml b/chapter06/xz.xml index 2f21e0f29..c90409a16 100644 --- a/chapter06/xz.xml +++ b/chapter06/xz.xml @@ -46,8 +46,7 @@ Prepare Xz for compilation with: -./configure --prefix=/usr \ - --docdir=/usr/share/doc/xz-&xz-version; +./configure --prefix=/usr --docdir=/usr/share/doc/xz-&xz-version; Compile the package: diff --git a/general.ent b/general.ent index 9fef9411a..04131a2c2 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ - - + +