Hi Bruce, Attached are my patches for all outstanding 6.5 tickets. It upgrades Util-Linux-NG as far as 2.16-rc2. This has survived a build and boot test. Feel free to commit them (in the order listed in 'series'), or have me commit them if you're happy with them. Once done, we're just waiting on the final Util-Linux-NG-2.16 release.
Regards, Matt.
Index: lfs-trunk/chapter01/changelog.xml
===================================================================
--- lfs-trunk.orig/chapter01/changelog.xml 2009-07-03 22:32:36.000000000 +0100
+++ lfs-trunk/chapter01/changelog.xml 2009-07-03 22:42:55.000000000 +0100
@@ -41,6 +41,12 @@
<para>2009-07-04</para>
<itemizedlist>
<listitem>
+ <para>[matthew] - Correct GCC <command>sed</command> command to add
+ -fomit-frame-pointer for non-bootstrapped builds of GCC-4.4.x. Thanks
+ to Guy Dalziel for the report and fix.
+ </para>
+ </listitem>
+ <listitem>
<para>[matthew] - Upgrade to E2fsprogs-1.41.7. Fixes
<ulink url="&lfs-ticket-root;2428">#2428</ulink>.</para>
</listitem>
Index: lfs-trunk/chapter05/gcc-pass2.xml
===================================================================
--- lfs-trunk.orig/chapter05/gcc-pass2.xml 2009-07-03 22:32:36.000000000 +0100
+++ lfs-trunk/chapter05/gcc-pass2.xml 2009-07-03 22:34:18.000000000 +0100
@@ -73,7 +73,7 @@
<command>sed</command> command to force the build to use the flag:</para>
<screen><userinput remap="pre">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</userinput></screen>
<para>The following command will change the location of GCC's default
Index: lfs-trunk/chapter06/gcc.xml
===================================================================
--- lfs-trunk.orig/chapter06/gcc.xml 2009-07-03 22:32:37.000000000 +0100
+++ lfs-trunk/chapter06/gcc.xml 2009-07-03 22:34:40.000000000 +0100
@@ -54,7 +54,7 @@
consistent compiler builds:</para>
<screen><userinput remap="pre">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</userinput></screen>
series
Description: Binary data
Index: lfs-trunk/chapter01/changelog.xml
===================================================================
--- lfs-trunk.orig/chapter01/changelog.xml 2009-07-03 22:42:55.000000000 +0100
+++ lfs-trunk/chapter01/changelog.xml 2009-07-03 22:45:24.000000000 +0100
@@ -41,6 +41,10 @@
<para>2009-07-04</para>
<itemizedlist>
<listitem>
+ <para>[matthew] - Upgrade to Linux-2.6.30.1. Fixes
+ <ulink url="&lfs-ticket-root;2430">#2430</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[matthew] - Correct GCC <command>sed</command> command to add
-fomit-frame-pointer for non-bootstrapped builds of GCC-4.4.x. Thanks
to Guy Dalziel for the report and fix.
Index: lfs-trunk/packages.ent
===================================================================
--- lfs-trunk.orig/packages.ent 2009-07-03 22:42:28.000000000 +0100
+++ lfs-trunk/packages.ent 2009-07-03 22:43:50.000000000 +0100
@@ -316,12 +316,12 @@
<!ENTITY linux-major-version "2.6">
<!ENTITY linux-minor-version "30">
-<!-- <!ENTITY linux-patch-version "4"> -->
-<!-- <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;"> -->
+<!ENTITY linux-patch-version "1">
+<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">
-<!ENTITY linux-size "58,043 KB">
+<!ENTITY linux-size "58,024 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;/linux-&linux-version;.tar.bz2">
-<!ENTITY linux-md5 "7a80058a6382e5108cdb5554d1609615">
+<!ENTITY linux-md5 "7da2e2e31f1c00f2673d2dc50de76b33">
<!ENTITY linux-home "http://www.kernel.org/";>
<!ENTITY linux-ch8-du "350 - 500 MB">
<!ENTITY linux-ch8-sbu "1.5 - 5.0 SBU">
Index: lfs-trunk/packages.ent =================================================================== --- lfs-trunk.orig/packages.ent 2009-07-05 15:49:02.000000000 +0100 +++ lfs-trunk/packages.ent 2009-07-05 15:49:06.000000000 +0100 @@ -416,6 +416,16 @@ <!ENTITY perl-ch6-du "171 MB testsuite included"> <!ENTITY perl-ch6-sbu "4.1 SBU"> +<!ENTITY pkg-config-version "0.23"> +<!ENTITY pkg-config-size "1,009 KB"> +<!ENTITY pkg-config-url "http://pkgconfig.freedesktop.org/releases/pkg-config-&pkg-config-version;.tar.gz";> +<!ENTITY pkg-config-md5 "d922a88782b64441d06547632fd85744"> +<!ENTITY pkg-config-home "http://pkg-config.freedesktop.org/";> +<!ENTITY pkg-config-ch5-du " MB"> +<!ENTITY pkg-config-ch5-sbu " SBU"> +<!ENTITY pkg-config-ch6-du " MB"> +<!ENTITY pkg-config-ch6-sbu " SBU"> + <!ENTITY procps-version "3.2.8"> <!ENTITY procps-size "279 KB"> <!ENTITY procps-url "http://procps.sourceforge.net/procps-&procps-version;.tar.gz";> @@ -517,10 +527,10 @@ <!ENTITY udev-config-md5 "UDEV-MD5SUM"> <!-- Updated in Makefile --> <!ENTITY udev-config-home " "> -<!ENTITY util-linux-ng-version "2.14.2"> -<!ENTITY util-linux-ng-size "2,888 KB"> -<!ENTITY util-linux-ng-url "&kernel;linux/utils/util-linux-ng/v2.14/util-linux-ng-&util-linux-ng-version;.tar.bz2"> -<!ENTITY util-linux-ng-md5 "b9d0053a22cfcbf0b9c0aa6d6eccfbc8"> +<!ENTITY util-linux-ng-version "2.16-rc2"> +<!ENTITY util-linux-ng-size "3,376 KB"> +<!ENTITY util-linux-ng-url "&kernel;linux/utils/util-linux-ng/v2.16/util-linux-ng-&util-linux-ng-version;.tar.bz2"> +<!ENTITY util-linux-ng-md5 "9de0a82e814b8f14483d5f9fae9aeff1"> <!ENTITY util-linux-ng-home "http://userweb.kernel.org/~kzak/util-linux-ng/";> <!ENTITY util-linux-ng-ch5-du "19 MB"> <!ENTITY util-linux-ng-ch5-sbu "0.1 SBU"> Index: lfs-trunk/chapter05/chapter05.xml =================================================================== --- lfs-trunk.orig/chapter05/chapter05.xml 2009-07-05 15:48:03.000000000 +0100 +++ lfs-trunk/chapter05/chapter05.xml 2009-07-05 15:49:06.000000000 +0100 @@ -29,7 +29,6 @@ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="bzip2.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="coreutils.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="diffutils.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="e2fsprogs.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="findutils.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="gawk.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="gettext.xml"/> Index: lfs-trunk/chapter05/e2fsprogs.xml =================================================================== --- lfs-trunk.orig/chapter05/e2fsprogs.xml 2009-07-05 15:48:03.000000000 +0100 +++ lfs-trunk/chapter05/e2fsprogs.xml 2009-07-05 15:49:06.000000000 +0100 @@ -48,9 +48,34 @@ <screen><userinput remap="pre">mkdir -v build cd build</userinput></screen> + <para>Fix a bug in E2fsprogs that prevents it from building against Util-Linux-NG's copy of <systemitem class="library">libuuid</systemitem>:</para> + +<screen><userinput remap="pre">cp -v ../MCONFIG.in{,.orig} + sed -e '82 s/LIBUUID/DEPLIBUUID/' ../MCONFIG.in.orig > ../MCONFIG.in</userinput></screen> + <para>Prepare E2fsprogs for compilation:</para> -<screen><userinput remap="configure">../configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">../configure --prefix=/tools --disable-libblkid --disable-libuuid</userinput></screen> + + <variablelist> + <title>The meaning of the new configure option:</title> + + <varlistentry> + <term><parameter>--disable-libblkid</parameter></term> + <listitem> + <para>This prevents E2fsprogs from building its own copy of the + libblkid library, which Util-Linux-NG provides.</para> + </listitem> + </varlistentry> + + <varlistentry> + <term><parameter>--disable-libuuid</parameter></term> + <listitem> + <para>This prevents E2fsprogs from building its own copy of the + libuuid library, which Util-Linux-NG provides.</para> + </listitem> + </varlistentry> + </variablelist> <para>Compile the package:</para> @@ -64,7 +89,7 @@ be removed later:</para> <screen><userinput remap="install">chmod -v u+w \ - /tools/lib/{libblkid,libcom_err,libe2p,libext2fs,libss,libuuid}.a</userinput></screen> + /tools/lib/{libcom_err,libe2p,libext2fs,libss}.a</userinput></screen> </sect2> Index: lfs-trunk/chapter05/util-linux-ng.xml =================================================================== --- lfs-trunk.orig/chapter05/util-linux-ng.xml 2009-07-05 15:48:03.000000000 +0100 +++ lfs-trunk/chapter05/util-linux-ng.xml 2009-07-05 15:49:06.000000000 +0100 @@ -45,7 +45,19 @@ <para>Prepare Util-linux-ng for compilation:</para> -<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/tools --with-fsprobe=builtin</userinput></screen> + + <variablelist> + <title>The meaning of the new configure option:</title> + + <varlistentry> + <term><parameter>--with-fsprobe</parameter></term> + <listitem> + <para>This tells Util-Linux-NG to use its own version of the libblkid + library, rather than a system-installed version.</para> + </listitem> + </varlistentry> + </variablelist> <para>Only a few of the utilities contained in this package need to be built:</para> @@ -65,6 +77,11 @@ <para>This package does not come with a test suite.</para> + <para>Install the shared libraries required by E2fsprogs:</para> + +<screen><userinput remap="install">make -C shlibs/uuid install +make -C shlibs/blkid install</userinput></screen> + <para>Copy these programs to the temporary tools directory:</para> <screen><userinput remap="install">cp -v disk-utils/mkswap mount/{,u}mount text-utils/more /tools/bin</userinput></screen> Index: lfs-trunk/chapter06/chapter06.xml =================================================================== --- lfs-trunk.orig/chapter06/chapter06.xml 2009-07-05 15:48:03.000000000 +0100 +++ lfs-trunk/chapter06/chapter06.xml 2009-07-05 15:49:06.000000000 +0100 @@ -28,12 +28,14 @@ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="gcc.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="db.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="sed.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="pkg-config.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="ncurses.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="util-linux-ng.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="e2fsprogs.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="coreutils.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="iana-etc.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="m4.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="bison.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="ncurses.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="procps.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="grep.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="readline.xml"/> @@ -67,7 +69,6 @@ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="tar.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="texinfo.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="udev.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="util-linux-ng.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="vim.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="aboutdebug.xml"/> <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="strippingagain.xml"/> Index: lfs-trunk/chapter06/pkg-config.xml =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ lfs-trunk/chapter06/pkg-config.xml 2009-07-05 15:49:06.000000000 +0100 @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ + <!ENTITY % general-entities SYSTEM "../general.ent"> + %general-entities; +]> + +<sect1 id="ch-system-pkg-config" role="wrap"> + <?dbhtml filename="pkg-config.html"?> + + <sect1info condition="script"> + <productname>pkg-config</productname> + <productnumber>&pkg-config-version;</productnumber> + <address>&pkg-config-url;</address> + </sect1info> + + <title>Pkg-config-&pkg-config-version;</title> + + <indexterm zone="ch-system-pkg-config"> + <primary sortas="a-Pkg-config">Pkg-config</primary> + </indexterm> + + <sect2 role="package"> + <title/> + + <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</title> + + <para>Prepare Pkg-config for compilation:</para> + +<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen> + + <para>Compile the package:</para> + +<screen><userinput remap="make">make</userinput></screen> + + <para>To test the results, issue:</para> + +<screen><userinput remap="test">make check</userinput></screen> + + <para>Install the package:</para> + +<screen><userinput remap="install">make install</userinput></screen> + + </sect2> + + + <sect2 id="contents-pkg-config" role="content"> + <title>Contents of Pkg-config</title> + + <segmentedlist> + <segtitle>Installed program</segtitle> + + <seglistitem> + <seg>pkg-config</seg> + </seglistitem> + </segmentedlist> + + <variablelist> + <bridgehead renderas="sect3">Short Descriptions</bridgehead> + <?dbfo list-presentation="list"?> + <?dbhtml list-presentation="table"?> + + <varlistentry id="pkg-config"> + <term><command>pkg-config</command></term> + <listitem> + <para>Returns meta information for the specified library or + package.</para> + <indexterm zone="ch-system-pkg-config pkg-config"> + <primary sortas="b-pkg-config">pkg-config</primary> + </indexterm> + </listitem> + </varlistentry> + + </variablelist> + + </sect2> + +</sect1> Index: lfs-trunk/chapter01/whatsnew.xml =================================================================== --- lfs-trunk.orig/chapter01/whatsnew.xml 2009-07-05 15:48:03.000000000 +0100 +++ lfs-trunk/chapter01/whatsnew.xml 2009-07-05 15:49:06.000000000 +0100 @@ -248,6 +248,10 @@ </listitem> <listitem> + <para>Pkg-config-&pkg-config-version;</para> + </listitem> + + <listitem> <para>&readline-fixes-patch;</para> </listitem> Index: lfs-trunk/chapter06/e2fsprogs.xml =================================================================== --- lfs-trunk.orig/chapter06/e2fsprogs.xml 2009-07-05 15:48:03.000000000 +0100 +++ lfs-trunk/chapter06/e2fsprogs.xml 2009-07-05 15:49:06.000000000 +0100 @@ -58,7 +58,7 @@ <para>Prepare E2fsprogs for compilation:</para> <screen><userinput remap="configure">../configure --prefix=/usr --with-root-prefix="" \ - --enable-elf-shlibs</userinput></screen> + --enable-elf-shlibs --disable-libblkid --disable-libuuid</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> @@ -113,7 +113,7 @@ <para>Make the installed static libraries writable so debugging symbols can be removed later.</para> -<screen><userinput remap="install">chmod -v u+w /usr/lib/{libblkid,libcom_err,libe2p,libext2fs,libss,libuuid}.a</userinput></screen> +<screen><userinput remap="install">chmod -v u+w /usr/lib/{libcom_err,libe2p,libext2fs,libss}.a</userinput></screen> <para>This package installs a gzipped <filename class="extension">.info</filename> file but doesn't update the @@ -131,11 +131,7 @@ <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 - -install -v -m644 -D ../doc/libblkid.txt \ - /usr/share/doc/e2fsprogs-&e2fsprogs-version;/libblkid.txt</userinput></screen> - + /usr/share/info/com_err.info</userinput></screen> </sect2> <sect2 id="contents-e2fsprogs" role="content"> @@ -151,8 +147,8 @@ 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.</seg> - <seg>libblkid.{a,so}, libcom_err.{a,so}, libe2p.{a,so}, - libext2fs.{a,so}, libss.{a,so}, and libuuid.{a,so}</seg> + <seg>libcom_err.{a,so}, libe2p.{a,so}, libext2fs.{a,so} and + libss.{a,so}</seg> </seglistitem> </segmentedlist> @@ -513,17 +509,6 @@ </listitem> </varlistentry> - <varlistentry id="libblkid"> - <term><filename class="libraryfile">libblkid</filename></term> - <listitem> - <para>Contains routines for device identification and token - extraction</para> - <indexterm zone="ch-system-e2fsprogs libblkid"> - <primary sortas="c-libblkid">libblkid</primary> - </indexterm> - </listitem> - </varlistentry> - <varlistentry id="libcom_err"> <term><filename class="libraryfile">libcom_err</filename></term> <listitem> @@ -566,17 +551,6 @@ </listitem> </varlistentry> - <varlistentry id="libuuid"> - <term><filename class="libraryfile">libuuid</filename></term> - <listitem> - <para>Contains routines for generating unique identifiers for objects - that may be accessible beyond the local system</para> - <indexterm zone="ch-system-e2fsprogs libuuid"> - <primary sortas="c-libuuid">libuuid</primary> - </indexterm> - </listitem> - </varlistentry> - </variablelist> </sect2> Index: lfs-trunk/chapter06/util-linux-ng.xml =================================================================== --- lfs-trunk.orig/chapter06/util-linux-ng.xml 2009-07-05 15:48:03.000000000 +0100 +++ lfs-trunk/chapter06/util-linux-ng.xml 2009-07-05 15:49:06.000000000 +0100 @@ -58,7 +58,7 @@ <sect2 role="installation"> <title>Installation of Util-linux-ng</title> -<screen><userinput remap="configure">./configure --enable-arch --enable-partx --enable-write</userinput></screen> +<screen><userinput remap="configure">./configure --enable-arch --enable-partx --enable-write --with-fsprobe=builtin</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> Index: lfs-trunk/chapter03/packages.xml =================================================================== --- lfs-trunk.orig/chapter03/packages.xml 2009-07-05 15:48:03.000000000 +0100 +++ lfs-trunk/chapter03/packages.xml 2009-07-05 15:49:06.000000000 +0100 @@ -450,6 +450,15 @@ </varlistentry> <varlistentry> + <term>Pkg-config (&pkg-config-version;) - <token>&pkg-config-size;</token>:</term> + <listitem> + <para>Home page: <ulink url="&pkg-config-home;"/></para> + <para>Download: <ulink url="&pkg-config-url;"/></para> + <para>MD5 sum: <literal>&pkg-config-md5;</literal></para> + </listitem> + </varlistentry> + + <varlistentry> <term>Procps (&procps-version;) - <token>&procps-size;</token>:</term> <listitem> <para>Home page: <ulink url="&procps-home;"/></para> Index: lfs-trunk/chapter01/changelog.xml =================================================================== --- lfs-trunk.orig/chapter01/changelog.xml 2009-07-05 15:49:02.000000000 +0100 +++ lfs-trunk/chapter01/changelog.xml 2009-07-05 15:49:06.000000000 +0100 @@ -41,6 +41,34 @@ <para>2009-07-05</para> <itemizedlist> <listitem> + <para>[matthew] - Upgrade to Util-Linux-NG-2.16. Fixes + <ulink url="&lfs-ticket-root;2391">#2391</ulink>.</para> + <itemizedlist> + <listitem> + <para>Remove E2fsprogs in Chapter 5. It was only there as a + dependency of Util-Linux-NG to provide + <systemitem class="library">libuuid</systemitem> and + <systemitem class="library">libblkid</systemitem>, which + Util-Linux-NG provides for itself now.</para> + </listitem> + <listitem> + <para>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.</para> + </listitem> + <listitem> + <para>Add Pkg-Config as it's a pre-requisite of E2fsprogs' new + configure switches.</para> + </listitem> + <listitem> + <para>Remove "--with-col" from Man-DB's configure + command as Man-DB is now installed after Util-Linux-NG so + <command>col</command> is found automatically.</para> + </listitem> + </itemizedlist> + </listitem> + <listitem> <para>[matthew] - Upgrade to Sed-4.2.1. Fixes <ulink url="&lfs-ticket-root;2427">#2427</ulink>.</para> </listitem> Index: lfs-trunk/chapter06/man-db.xml =================================================================== --- lfs-trunk.orig/chapter06/man-db.xml 2009-07-05 15:48:03.000000000 +0100 +++ lfs-trunk/chapter06/man-db.xml 2009-07-05 15:49:06.000000000 +0100 @@ -51,8 +51,8 @@ <screen><userinput remap="configure">./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</userinput></screen> + --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> @@ -68,7 +68,7 @@ <varlistentry> <term><parameter>--with-...</parameter></term> <listitem> - <para>These four parameters are used to set some default programs. + <para>These three parameters are used to set some default programs. The <command>col</command> program is a part of the Util-linux-ng package, <command>lynx</command> is a text-based web browser (see BLFS for installation instructions), <command>vgrind</command>
Index: lfs-trunk/chapter01/changelog.xml
===================================================================
--- lfs-trunk.orig/chapter01/changelog.xml 2009-07-03 19:23:18.000000000 +0100
+++ lfs-trunk/chapter01/changelog.xml 2009-07-03 19:24:11.000000000 +0100
@@ -36,6 +36,17 @@
</listitem>
-->
+
+ <listitem>
+ <para>2009-07-04</para>
+ <itemizedlist>
+ <listitem>
+ <para>[matthew] - Upgrade to E2fsprogs-1.41.7. Fixes
+ <ulink url="&lfs-ticket-root;2428">#2428</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
<listitem>
<para>2009-06-29</para>
<itemizedlist>
Index: lfs-trunk/general.ent
===================================================================
--- lfs-trunk.orig/general.ent 2009-07-03 19:23:18.000000000 +0100
+++ lfs-trunk/general.ent 2009-07-03 19:23:49.000000000 +0100
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20090629">
-<!ENTITY releasedate "June 29, 2009">
+<!ENTITY version "SVN-20090704">
+<!ENTITY releasedate "July 4, 2009">
<!ENTITY copyrightdate "1999-2009"><!-- jhalfs needs a literal dash, not – -->
<!ENTITY milestone "6.5">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
Index: lfs-trunk/packages.ent
===================================================================
--- lfs-trunk.orig/packages.ent 2009-07-03 19:23:18.000000000 +0100
+++ lfs-trunk/packages.ent 2009-07-03 19:23:23.000000000 +0100
@@ -106,10 +106,10 @@
<!-- NOTE: When updating e2fsprogs, remember to check the list
of acceptable features that can be shown by debugfs in
chapter02/creatingfilesystem.xml -->
-<!ENTITY e2fsprogs-version "1.41.6">
-<!ENTITY e2fsprogs-size "4,319 KB">
+<!ENTITY e2fsprogs-version "1.41.7">
+<!ENTITY e2fsprogs-size "4,321 KB">
<!ENTITY e2fsprogs-url "&sourceforge;e2fsprogs/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "732c559db400c8fc994f4f38568c9f1f">
+<!ENTITY e2fsprogs-md5 "b55d2b557f1f17ff918e9201c1d730f5">
<!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/";>
<!ENTITY e2fsprogs-ch5-du "38 MB">
<!ENTITY e2fsprogs-ch5-sbu "0.3 SBU">
Index: lfs-trunk/chapter01/changelog.xml
===================================================================
--- lfs-trunk.orig/chapter01/changelog.xml 2009-07-03 19:24:26.000000000 +0100
+++ lfs-trunk/chapter01/changelog.xml 2009-07-03 19:25:00.000000000 +0100
@@ -41,6 +41,10 @@
<para>2009-07-04</para>
<itemizedlist>
<listitem>
+ <para>[matthew] - Upgrade to Sed-4.2.1. Fixes
+ <ulink url="&lfs-ticket-root;2427">#2427</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[matthew] - Upgrade to Linux-2.6.30.1. Fixes
<ulink url="&lfs-ticket-root;2430">#2430</ulink>.</para>
</listitem>
Index: lfs-trunk/packages.ent
===================================================================
--- lfs-trunk.orig/packages.ent 2009-07-03 19:24:26.000000000 +0100
+++ lfs-trunk/packages.ent 2009-07-03 19:25:00.000000000 +0100
@@ -440,10 +440,10 @@
<!ENTITY readline-ch6-du "13.8 MB">
<!ENTITY readline-ch6-sbu "0.1 SBU">
-<!ENTITY sed-version "4.2">
-<!ENTITY sed-size "862 KB">
+<!ENTITY sed-version "4.2.1">
+<!ENTITY sed-size "878 KB">
<!ENTITY sed-url "&gnu;sed/sed-&sed-version;.tar.bz2">
-<!ENTITY sed-md5 "41b69b632c0265fc1b16079023499590">
+<!ENTITY sed-md5 "7d310fbd76e01a01115075c1fd3f455a">
<!ENTITY sed-home "&gnu-software;sed/">
<!ENTITY sed-ch5-du "7.6 MB">
<!ENTITY sed-ch5-sbu "0.1 SBU">
Index: lfs-trunk/chapter06/module-init-tools.xml
===================================================================
--- lfs-trunk.orig/chapter06/module-init-tools.xml 2009-07-03 18:50:36.000000000 +0100
+++ lfs-trunk/chapter06/module-init-tools.xml 2009-07-03 18:51:20.000000000 +0100
@@ -86,8 +86,7 @@
<segtitle>Installed programs</segtitle>
<seglistitem>
- <seg>depmod, generate-modprobe.conf, insmod, insmod.static, lsmod,
- modinfo, modprobe, and rmmod</seg>
+ <seg>depmod, insmod, insmod.static, lsmod, modinfo, modprobe, and rmmod</seg>
</seglistitem>
</segmentedlist>
@@ -109,17 +108,6 @@
</listitem>
</varlistentry>
- <varlistentry id="generate-modprobe.conf">
- <term><command>generate-modprobe.conf</command></term>
- <listitem>
- <para>Creates a modprobe.conf file from an existing 2.2 or 2.4 module
- setup</para>
- <indexterm zone="ch-system-module-init-tools generate-modprobe.conf">
- <primary sortas="b-generate-modprobe.conf">generate-modprobe.conf</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
<varlistentry id="insmod">
<term><command>insmod</command></term>
<listitem>
-- http://linuxfromscratch.org/mailman/listinfo/lfs-dev FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
