On Mon, 29 Jun 2009 15:33:17 -0500, Bruce Dubbs <[email protected]> wrote:
> I was experimenting with Util-linux-ng-2.16-rc1 and we may need to fix up
> what we do in chapter 5.
Bruce, if it helps any, here's my latest work in progress patch for
Util-Linux-NG.
The only thing that will probably need fixing up is the incredibly naive sed
in e2fsprogs to suppress its building/installation of libuuid. The patch is
close to going into e2fsprogs now
(http://article.gmane.org/gmane.linux.utilities.util-linux-ng/2351).
Regards,
Matt.
Index: lfs-trunk/packages.ent
===================================================================
--- lfs-trunk.orig/packages.ent 2009-06-29 21:19:04.000000000 +0100
+++ lfs-trunk/packages.ent 2009-06-29 21:52:10.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-rc1">
+<!ENTITY util-linux-ng-size "3,375 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 "5199169973002e50a6acc9a993894771">
<!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-06-27 14:59:23.000000000 +0100
+++ lfs-trunk/chapter05/chapter05.xml 2009-06-29 21:43:00.000000000 +0100
@@ -29,6 +29,8 @@
<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="pkg-config.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="findutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="gawk.xml"/>
@@ -42,7 +44,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="sed.xml"/>
<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="util-linux-ng.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="stripping.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="changingowner.xml"/>
Index: lfs-trunk/chapter05/e2fsprogs.xml
===================================================================
--- lfs-trunk.orig/chapter05/e2fsprogs.xml 2009-06-27 14:59:23.000000000 +0100
+++ lfs-trunk/chapter05/e2fsprogs.xml 2009-06-29 21:43:00.000000000 +0100
@@ -50,7 +50,19 @@
<para>Prepare E2fsprogs for compilation:</para>
-<screen><userinput remap="configure">../configure --prefix=/tools</userinput></screen>
+<screen><userinput remap="configure">../configure --prefix=/tools --disable-libblkid</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>
+ </variablelist>
<para>Compile the package:</para>
Index: lfs-trunk/chapter05/util-linux-ng.xml
===================================================================
--- lfs-trunk.orig/chapter05/util-linux-ng.xml 2009-06-27 14:59:23.000000000 +0100
+++ lfs-trunk/chapter05/util-linux-ng.xml 2009-06-29 21:44:00.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/blkid install
+make -C shlibs/uuid 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-06-27 14:59:24.000000000 +0100
+++ lfs-trunk/chapter06/chapter06.xml 2009-06-29 21:43:00.000000000 +0100
@@ -28,6 +28,8 @@
<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="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"/>
@@ -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/chapter05/pkg-config.xml
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ lfs-trunk/chapter05/pkg-config.xml 2009-06-29 21:43:00.000000000 +0100
@@ -0,0 +1,74 @@
+<?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-tools-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-tools-pkg-config">
+ <primary sortas="a-Pkg-config">Pkg-config</primary>
+ <secondary>tools</secondary>
+ </indexterm>
+
+ <sect2 role="package">
+ <title/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../chapter06/pkg-config.xml"
+ xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
+
+ <segmentedlist>
+ <segtitle>&buildtime;</segtitle>
+ <segtitle>&diskspace;</segtitle>
+
+ <seglistitem>
+ <seg>&pkg-config-ch5-sbu;</seg>
+ <seg>&pkg-config-ch5-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=/tools</userinput></screen>
+
+ <para>Compile the package:</para>
+
+<screen><userinput remap="make">make</userinput></screen>
+
+ <para>Compilation is now complete. As discussed earlier, running the test
+ suite is not mandatory for the temporary tools here in this chapter. To run
+ the Pkg-config test suite anyway, issue the following command:</para>
+
+<screen><userinput remap="test">make check</userinput></screen>
+
+ <para>Install the package:</para>
+
+<screen><userinput remap="install">make install</userinput></screen>
+
+ </sect2>
+
+ <sect2 role="content">
+ <title/>
+
+ <para>Details on this package are located in
+ <xref linkend="contents-pkg-config" role="."/></para>
+
+ </sect2>
+
+</sect1>
Index: lfs-trunk/chapter06/pkg-config.xml
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ lfs-trunk/chapter06/pkg-config.xml 2009-06-29 21:43:00.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-06-29 21:19:04.000000000 +0100
+++ lfs-trunk/chapter01/whatsnew.xml 2009-06-29 21:43:00.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-06-27 14:59:24.000000000 +0100
+++ lfs-trunk/chapter06/e2fsprogs.xml 2009-06-29 21:43:00.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</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
Index: lfs-trunk/chapter06/util-linux-ng.xml
===================================================================
--- lfs-trunk.orig/chapter06/util-linux-ng.xml 2009-06-27 14:59:24.000000000 +0100
+++ lfs-trunk/chapter06/util-linux-ng.xml 2009-06-29 21:43:00.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-06-27 14:59:24.000000000 +0100
+++ lfs-trunk/chapter03/packages.xml 2009-06-29 21:43:00.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-06-29 21:19:04.000000000 +0100
+++ lfs-trunk/chapter01/changelog.xml 2009-06-29 21:47:26.000000000 +0100
@@ -40,6 +40,16 @@
<para>2009-06-29</para>
<itemizedlist>
<listitem>
+ <para>[matthew] - Upgrade to Util-Linux-NG-2.16. Move Util-Linux-NG
+ to before E2fsprogs in Chapter 5 & Chapter 6. Add
+ "--disable-libblkid" configure switch to E2fsprogs so
+ that it uses Util-Linux-NG's version. Add Pkg-Config as it's a
+ pre-requisite of the "--disable-libblkid" switch. Add a
+ <command>sed</command> to prevent E2fsprogs from building libuuid so
+ that is used Util-Linux-NG's version. Fixes
+ <ulink url="&lfs-ticket-root;2391">#2391</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[matthew] - Fixed the generation of the HTML documentation for
Sed. Thanks to Chris Staub for the report and patch. Fixes
<ulink url="&lfs-ticket-root;2422">#2422</ulink>.</para>
--
http://linuxfromscratch.org/mailman/listinfo/lfs-dev
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
