diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 80538ceea..5bc0db949 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -36,6 +36,61 @@ --> + + + 2009-07-04 + + + [matthew] - Upgrade to Util-Linux-NG-2.16-rc2. This + is temporary until the release version of 2.16 comes out. + See #2391 for + more details. + + + Remove E2fsprogs in Chapter 5. It was only there as a + dependency of Util-Linux-NG to provide + libuuid and + libblkid, which + Util-Linux-NG provides for itself now. + + + Move Util-Linux-NG to before E2fsprogs in Chapter 6 and add + "--disable-libblkid" and "--disable-libuuid" + configure switches to E2fsprogs so that it uses Util-Linux-NG's + versions. + + + Add Pkg-Config as it's a pre-requisite of E2fsprogs' new + configure switches. + + + Remove "--with-col" from Man-DB's configure + command as Man-DB is now installed after Util-Linux-NG so + col is found automatically. + + + + + [matthew] - Upgrade to Sed-4.2.1. Fixes + #2427. + + + [matthew] - Upgrade to Linux-2.6.30.1. Fixes + #2430. + + + [matthew] - Correct GCC sed command to add + -fomit-frame-pointer for non-bootstrapped builds of GCC-4.4.x. Thanks + to Guy Dalziel for the report and fix. + + + + [matthew] - Upgrade to E2fsprogs-1.41.7. Fixes + #2428. + + + + 2009-06-29 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index d2983c939..97e919409 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -247,6 +247,10 @@ &patch-fixes-patch; + + Pkg-config-&pkg-config-version; + + &readline-fixes-patch; diff --git a/chapter03/packages.xml b/chapter03/packages.xml index cb972fcd2..2cd622eb9 100644 --- a/chapter03/packages.xml +++ b/chapter03/packages.xml @@ -449,6 +449,15 @@ + + Pkg-config (&pkg-config-version;) - &pkg-config-size;: + + Home page: + Download: + MD5 sum: &pkg-config-md5; + + + Procps (&procps-version;) - &procps-size;: diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml index 096717c36..c938a72cc 100644 --- a/chapter05/chapter05.xml +++ b/chapter05/chapter05.xml @@ -29,7 +29,6 @@ - diff --git a/chapter05/e2fsprogs.xml b/chapter05/e2fsprogs.xml index 43cea7558..7adb6bc07 100644 --- a/chapter05/e2fsprogs.xml +++ b/chapter05/e2fsprogs.xml @@ -48,9 +48,34 @@ mkdir -v build cd build + Fix a bug in E2fsprogs that prevents it from building against Util-Linux-NG's copy of libuuid: + +cp -v ../MCONFIG.in{,.orig} + sed -e '82 s/LIBUUID/DEPLIBUUID/' ../MCONFIG.in.orig > ../MCONFIG.in + Prepare E2fsprogs for compilation: -../configure --prefix=/tools +../configure --prefix=/tools --disable-libblkid --disable-libuuid + + + The meaning of the new configure option: + + + --disable-libblkid + + This prevents E2fsprogs from building its own copy of the + libblkid library, which Util-Linux-NG provides. + + + + + --disable-libuuid + + This prevents E2fsprogs from building its own copy of the + libuuid library, which Util-Linux-NG provides. + + + Compile the package: @@ -64,7 +89,7 @@ cd build be removed later: chmod -v u+w \ - /tools/lib/{libblkid,libcom_err,libe2p,libext2fs,libss,libuuid}.a + /tools/lib/{libcom_err,libe2p,libext2fs,libss}.a diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index ff31b3b4d..3db93f0d6 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -73,7 +73,7 @@ sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig > gcc/Makefile.insed command to force the build to use the flag: cp -v gcc/Makefile.in{,.tmp} -sed 's/^XCFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \ +sed 's/^T_CFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \ > gcc/Makefile.in The following command will change the location of GCC's default diff --git a/chapter05/util-linux-ng.xml b/chapter05/util-linux-ng.xml index 67b0b9f42..955698e3a 100644 --- a/chapter05/util-linux-ng.xml +++ b/chapter05/util-linux-ng.xml @@ -46,7 +46,19 @@ Prepare Util-linux-ng for compilation: ./configure --prefix=/tools + Only a few of the utilities contained in this package need to be built: @@ -65,6 +77,11 @@ make -C text-utils more This package does not come with a test suite. + Install the shared libraries required by E2fsprogs: + +make -C shlibs/uuid install +make -C shlibs/blkid install + Copy these programs to the temporary tools directory: cp -v disk-utils/mkswap mount/{,u}mount text-utils/more /tools/bin diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index bc6158607..3b14b217c 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -28,12 +28,14 @@ + + + - @@ -67,7 +69,6 @@ - diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml index 4e2e39eea..64e79e560 100644 --- a/chapter06/e2fsprogs.xml +++ b/chapter06/e2fsprogs.xml @@ -58,7 +58,7 @@ cd build Prepare E2fsprogs for compilation: ../configure --prefix=/usr --with-root-prefix="" \ - --enable-elf-shlibs + --enable-elf-shlibs --disable-libblkid --disable-libuuid The meaning of the configure options: @@ -113,7 +113,7 @@ cd build Make the installed static libraries writable so debugging symbols can be removed later. -chmod -v u+w /usr/lib/{libblkid,libcom_err,libe2p,libext2fs,libss,libuuid}.a +chmod -v u+w /usr/lib/{libcom_err,libe2p,libext2fs,libss}.a This package installs a gzipped .info file but doesn't update the @@ -131,11 +131,7 @@ install-info --dir-file=/usr/share/info/dir \ 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 - -install -v -m644 -D ../doc/libblkid.txt \ - /usr/share/doc/e2fsprogs-&e2fsprogs-version;/libblkid.txt - + /usr/share/info/com_err.info @@ -151,8 +147,8 @@ install -v -m644 -D ../doc/libblkid.txt \ fsck.ext2, fsck.ext3, fsck.ext4, fsck.ext4dev, logsave, lsattr, mk_cmds, mke2fs, mkfs.ext2, mkfs.ext3, mkfs.ext4, mkfs.ext4dev, mklost+found, resize2fs, tune2fs, uuidd, and uuidgen. - libblkid.{a,so}, libcom_err.{a,so}, libe2p.{a,so}, - libext2fs.{a,so}, libss.{a,so}, and libuuid.{a,so} + libcom_err.{a,so}, libe2p.{a,so}, libext2fs.{a,so} and + libss.{a,so} @@ -513,17 +509,6 @@ install -v -m644 -D ../doc/libblkid.txt \ - - libblkid - - Contains routines for device identification and token - extraction - - libblkid - - - - libcom_err @@ -566,17 +551,6 @@ install -v -m644 -D ../doc/libblkid.txt \ - - libuuid - - Contains routines for generating unique identifiers for objects - that may be accessible beyond the local system - - libuuid - - - - diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index ff2ea17f8..e2ef9bf29 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -54,7 +54,7 @@ consistent compiler builds: case `uname -m` in - i?86) sed -i 's/^XCFLAGS =$/& -fomit-frame-pointer/' \ + i?86) sed -i 's/^T_CFLAGS =$/& -fomit-frame-pointer/' \ gcc/Makefile.in ;; esac diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml index da27532ad..2e2b1c0f6 100644 --- a/chapter06/man-db.xml +++ b/chapter06/man-db.xml @@ -51,8 +51,8 @@ ./configure --prefix=/usr --libexecdir=/usr/lib \ --sysconfdir=/etc --disable-setuid \ - --with-browser=/usr/bin/lynx --with-col=/usr/bin/col \ - --with-vgrind=/usr/bin/vgrind --with-grap=/usr/bin/grap + --with-browser=/usr/bin/lynx --with-vgrind=/usr/bin/vgrind \ + --with-grap=/usr/bin/grap The meaning of the configure options: @@ -68,9 +68,8 @@ --with-... - These four parameters are used to set some default programs. - The col program is a part of the Util-linux-ng - package, lynx is a text-based web browser (see + These three parameters are used to set some default programs. + lynx is a text-based web browser (see BLFS for installation instructions), vgrind converts program sources to Groff input, and grap is useful for typesetting graphs in Groff documents. The diff --git a/chapter06/module-init-tools.xml b/chapter06/module-init-tools.xml index b19ac384f..20c4cb452 100644 --- a/chapter06/module-init-tools.xml +++ b/chapter06/module-init-tools.xml @@ -86,8 +86,7 @@ make clean Installed programs - depmod, generate-modprobe.conf, insmod, insmod.static, lsmod, - modinfo, modprobe, and rmmod + depmod, insmod, insmod.static, lsmod, modinfo, modprobe, and rmmod @@ -109,17 +108,6 @@ make clean - - generate-modprobe.conf - - Creates a modprobe.conf file from an existing 2.2 or 2.4 module - setup - - generate-modprobe.conf - - - - insmod diff --git a/chapter06/pkg-config.xml b/chapter06/pkg-config.xml new file mode 100644 index 000000000..ceb9581cf --- /dev/null +++ b/chapter06/pkg-config.xml @@ -0,0 +1,95 @@ + + + %general-entities; +]> + + + + + + pkg-config + &pkg-config-version; +
&pkg-config-url;
+ + + Pkg-config-&pkg-config-version; + + + Pkg-config + + + + + + <para>The pkg-config package contains a tool for passing the include path + and/or library paths to build tools during the configure and make file + execution.</para> + + <segmentedlist> + <segtitle>&buildtime;</segtitle> + <segtitle>&diskspace;</segtitle> + + <seglistitem> + <seg>&pkg-config-ch6-sbu;</seg> + <seg>&pkg-config-ch6-du;</seg> + </seglistitem> + </segmentedlist> + + </sect2> + + <sect2 role="installation"> + <title>Installation of Pkg-config + + Prepare Pkg-config for compilation: + +./configure --prefix=/usr + + Compile the package: + +make + + To test the results, issue: + +make check + + Install the package: + +make install + + + + + + Contents of Pkg-config + + + Installed program + + + pkg-config + + + + + Short Descriptions + + + + + pkg-config + + Returns meta information for the specified library or + package. + + pkg-config + + + + + + + + + diff --git a/general.ent b/general.ent index 4b2ada01b..590da373c 100644 --- a/general.ent +++ b/general.ent @@ -1,6 +1,6 @@ - - + + diff --git a/packages.ent b/packages.ent index 6d1ba1dc1..7a0004708 100644 --- a/packages.ent +++ b/packages.ent @@ -106,10 +106,10 @@ - - + + - + @@ -316,12 +316,12 @@ - - + + - + - + @@ -416,6 +416,16 @@ + + + + + + + + + + @@ -440,10 +450,10 @@ - - + + - + @@ -517,10 +527,10 @@ - - - - + + + +