[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.0.0-359-gf4e3f3c
git
git at cross-lfs.org
Tue Sep 10 11:07:23 PDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, master has been updated
via f4e3f3ce3452ba69bbe8f95f78bbc6fec6922f6a (commit)
via af5caa0fc3973712d43fa2890222992b0138f694 (commit)
from 22bfda04ae4be081f18497bd28b57869c7ab426a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f4e3f3ce3452ba69bbe8f95f78bbc6fec6922f6a
Author: William Harrington <kb0iic at berzerkula.org>
Date: Tue Sep 10 13:06:11 2013 -0500
Pkg-config should be Pkg-config-lite. It also removes lite- from the pkg-config-lite version entity, and this also lets JHALFS extract the pkg-config commands to generate a proper Makefile. Do not put extra strings in front of versions. Evil.
diff --git a/BOOK/final-system/alpha-chapter.xml b/BOOK/final-system/alpha-chapter.xml
index b862bda..83eecf8 100644
--- a/BOOK/final-system/alpha-chapter.xml
+++ b/BOOK/final-system/alpha-chapter.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
diff --git a/BOOK/final-system/common/pkg-config.xml b/BOOK/final-system/common/pkg-config-lite.xml
similarity index 68%
rename from BOOK/final-system/common/pkg-config.xml
rename to BOOK/final-system/common/pkg-config-lite.xml
index 5810fa7..fa9fb74 100644
--- a/BOOK/final-system/common/pkg-config.xml
+++ b/BOOK/final-system/common/pkg-config-lite.xml
@@ -5,27 +5,27 @@
%general-entities;
]>
-<sect1 id="ch-system-pkg-config" role="wrap">
- <?dbhtml filename="pkg-config.html"?>
+<sect1 id="ch-system-pkg-config-lite" role="wrap">
+ <?dbhtml filename="pkg-config-lite.html"?>
- <title>Pkg-config-&pkg-config-version;</title>
+ <title>Pkg-config-lite-&pkg-config-lite-version;</title>
- <indexterm zone="ch-system-pkg-config">
- <primary sortas="a-Pkg-config">Pkg-config</primary>
+ <indexterm zone="ch-system-pkg-config-lite">
+ <primary sortas="a-Pkg-config-lite">Pkg-config-lite</primary>
</indexterm>
<sect2 role="package">
<title/>
- <para>Pkg-config is a tool to help you insert the correct compiler options
+ <para>Pkg-config-lite is a tool to help you insert the correct compiler options
on the command line when compiling applications and libraries.</para>
</sect2>
<sect2 role="installation">
- <title>Installation of Pkg-config</title>
+ <title>Installation of Pkg-config-lite</title>
- <para os="a">Prepare Pkg-config for compilation:</para>
+ <para os="a">Prepare Pkg-config-lite for compilation:</para>
<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
@@ -42,8 +42,8 @@
</sect2>
- <sect2 id="contents-pkg-config" role="content">
- <title>Contents of Pkg-config</title>
+ <sect2 id="contents-pkg-config-lite" role="content">
+ <title>Contents of Pkg-config-lite</title>
<segmentedlist>
<segtitle>Installed programs</segtitle>
@@ -60,14 +60,14 @@
<?dbfo list-presentation="list"?>
<?dbhtml list-presentation="table"?>
- <varlistentry id="pkg-config">
+ <varlistentry id="pkg-config-lite">
<term><command>pkg-config</command></term>
<listitem>
<para>The <command>pkg-config</command> program is used to retrieve
information about installed libraries in the system. It is typically
used to compile and link against one or more libraries.</para>
- <indexterm zone="ch-system-pkg-config pkg-config">
- <primary sortas="b-pkg-config">pkg-config</primary>
+ <indexterm zone="ch-system-pkg-config-lite pkg-config-lite">
+ <primary sortas="b-pkg-config-lite">pkg-config</primary>
</indexterm>
</listitem>
</varlistentry>
diff --git a/BOOK/final-system/mips-chapter.xml b/BOOK/final-system/mips-chapter.xml
index 31d08cc..60c1e0e 100644
--- a/BOOK/final-system/mips-chapter.xml
+++ b/BOOK/final-system/mips-chapter.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/gcc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
diff --git a/BOOK/final-system/mips64-64-chapter.xml b/BOOK/final-system/mips64-64-chapter.xml
index 393cba8..23aed52 100644
--- a/BOOK/final-system/mips64-64-chapter.xml
+++ b/BOOK/final-system/mips64-64-chapter.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/gcc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
diff --git a/BOOK/final-system/mips64-chapter.xml b/BOOK/final-system/mips64-chapter.xml
index 47e24b8..0753926 100644
--- a/BOOK/final-system/mips64-chapter.xml
+++ b/BOOK/final-system/mips64-chapter.xml
@@ -44,7 +44,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses-n32.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses-64bit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/pkg-config.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-n32.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit.xml"/>
diff --git a/BOOK/final-system/mips64/pkg-config.xml b/BOOK/final-system/mips64/pkg-config-lite.xml
similarity index 68%
rename from BOOK/final-system/mips64/pkg-config.xml
rename to BOOK/final-system/mips64/pkg-config-lite.xml
index 746ee93..07813ab 100644
--- a/BOOK/final-system/mips64/pkg-config.xml
+++ b/BOOK/final-system/mips64/pkg-config-lite.xml
@@ -5,52 +5,52 @@
%general-entities;
]>
-<sect1 id="ch-system-pkg-config" role="wrap">
- <?dbhtml filename="pkg-config.html"?>
+<sect1 id="ch-system-pkg-config-lite" role="wrap">
+ <?dbhtml filename="pkg-config-lite.html"?>
- <title>Pkg-config-&pkg-config-version;</title>
+ <title>Pkg-config-lite-&pkg-config-lite-version;</title>
- <indexterm zone="ch-system-pkg-config">
- <primary sortas="a-Autoconf">Pkg-config</primary>
+ <indexterm zone="ch-system-pkg-config-lite">
+ <primary sortas="a-Pkg-config-lite">Pkg-config-lite</primary>
</indexterm>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/pkg-config.xml"
+ href="../common/pkg-config-lite.xml"
xpointer="xpointer(//*[@role='package'])"/>
<sect2 role="installation">
- <title>Installation of Pkg-config</title>
+ <title>Installation of Pkg-config-lite</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/pkg-config.xml"
+ href="../common/pkg-config-lite.xml"
xpointer="xpointer(//*[@os='a'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../multilib/pkg-config.xml"
+ href="../multilib/pkg-config-lite.xml"
xpointer="xpointer(//*[@os='b'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/pkg-config.xml"
+ href="../common/pkg-config-lite.xml"
xpointer="xpointer(//*[@os='c'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/pkg-config.xml"
+ href="../common/pkg-config-lite.xml"
xpointer="xpointer(//*[@os='d'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/pkg-config.xml"
+ href="../common/pkg-config-lite.xml"
xpointer="xpointer(//*[@os='e'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/pkg-config.xml"
+ href="../common/pkg-config-lite.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/pkg-config.xml"
+ href="../common/pkg-config-lite.xml"
xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../multilib/pkg-config.xml"
+ href="../multilib/pkg-config-lite.xml"
xpointer="xpointer(//*[@os='m1'])"/>
<screen os="m2"><userinput>export PKG_CONFIG_PATH32="/usr/lib/pkgconfig"
@@ -58,7 +58,7 @@ export PKG_CONFIG_PATHN32="/usr/lib32/pkgconfig"
export PKG_CONFIG_PATH64="/usr/lib64/pkgconfig"</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../multilib/pkg-config.xml"
+ href="../multilib/pkg-config-lite.xml"
xpointer="xpointer(//*[@os='m3'])"/>
<screen os="m4"><userinput>cat >> ${CLFS}/root/.bash_profile << EOF
@@ -70,7 +70,7 @@ EOF</userinput></screen>
</sect2>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/pkg-config.xml"
- xpointer="xpointer(id('contents-pkg-config'))"/>
+ href="../common/pkg-config-lite.xml"
+ xpointer="xpointer(id('contents-pkg-config-lite'))"/>
</sect1>
diff --git a/BOOK/final-system/multilib/pkg-config.xml b/BOOK/final-system/multilib/pkg-config-lite.xml
similarity index 72%
rename from BOOK/final-system/multilib/pkg-config.xml
rename to BOOK/final-system/multilib/pkg-config-lite.xml
index 160c682..01363b6 100644
--- a/BOOK/final-system/multilib/pkg-config.xml
+++ b/BOOK/final-system/multilib/pkg-config-lite.xml
@@ -5,47 +5,47 @@
%general-entities;
]>
-<sect1 id="ch-system-pkg-config" role="wrap">
- <?dbhtml filename="pkg-config.html"?>
+<sect1 id="ch-system-pkg-config-lite" role="wrap">
+ <?dbhtml filename="pkg-config-lite.html"?>
- <title>Pkg-config-&pkg-config-version;</title>
+ <title>Pkg-config-lite-&pkg-config-lite-version;</title>
- <indexterm zone="ch-system-pkg-config">
- <primary sortas="a-Pkg-config">Pkg-config</primary>
+ <indexterm zone="ch-system-pkg-config-lite">
+ <primary sortas="a-Pkg-config-lite">Pkg-config-lite</primary>
</indexterm>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/pkg-config.xml"
+ href="../common/pkg-config-lite.xml"
xpointer="xpointer(//*[@role='package'])"/>
<sect2 role="installation">
- <title>Installation of Pkg-config</title>
+ <title>Installation of Pkg-config-lite</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/pkg-config.xml"
+ href="../common/pkg-config-lite.xml"
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
--with-pc-path=/usr/share/pkgconfig</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/pkg-config.xml"
+ href="../common/pkg-config-lite.xml"
xpointer="xpointer(//*[@os='c'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/pkg-config.xml"
+ href="../common/pkg-config-lite.xml"
xpointer="xpointer(//*[@os='d'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/pkg-config.xml"
+ href="../common/pkg-config-lite.xml"
xpointer="xpointer(//*[@os='e'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/pkg-config.xml"
+ href="../common/pkg-config-lite.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/pkg-config.xml"
+ href="../common/pkg-config-lite.xml"
xpointer="xpointer(//*[@os='g'])"/>
<para os="m1">On multilib builds the library direcory has been removed from
@@ -66,7 +66,7 @@ EOF</userinput></screen>
</sect2>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/pkg-config.xml"
- xpointer="xpointer(id('contents-pkg-config'))"/>
+ href="../common/pkg-config-lite.xml"
+ xpointer="xpointer(id('contents-pkg-config-lite'))"/>
</sect1>
diff --git a/BOOK/final-system/ppc-chapter.xml b/BOOK/final-system/ppc-chapter.xml
index 4109670..19c3428 100644
--- a/BOOK/final-system/ppc-chapter.xml
+++ b/BOOK/final-system/ppc-chapter.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
diff --git a/BOOK/final-system/ppc64-64-chapter.xml b/BOOK/final-system/ppc64-64-chapter.xml
index ce4145d..e62c262 100644
--- a/BOOK/final-system/ppc64-64-chapter.xml
+++ b/BOOK/final-system/ppc64-64-chapter.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
diff --git a/BOOK/final-system/ppc64-chapter.xml b/BOOK/final-system/ppc64-chapter.xml
index aabf1fd..e86e2c8 100644
--- a/BOOK/final-system/ppc64-chapter.xml
+++ b/BOOK/final-system/ppc64-chapter.xml
@@ -38,7 +38,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses-64bit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps.xml"/>
diff --git a/BOOK/final-system/sparc-chapter.xml b/BOOK/final-system/sparc-chapter.xml
index a1fdda8..3cfbd99 100644
--- a/BOOK/final-system/sparc-chapter.xml
+++ b/BOOK/final-system/sparc-chapter.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
diff --git a/BOOK/final-system/sparc64-64-chapter.xml b/BOOK/final-system/sparc64-64-chapter.xml
index 7be1afa..817ea24 100644
--- a/BOOK/final-system/sparc64-64-chapter.xml
+++ b/BOOK/final-system/sparc64-64-chapter.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
diff --git a/BOOK/final-system/sparc64-chapter.xml b/BOOK/final-system/sparc64-chapter.xml
index 8efd503..fec8bc3 100644
--- a/BOOK/final-system/sparc64-chapter.xml
+++ b/BOOK/final-system/sparc64-chapter.xml
@@ -38,7 +38,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses-64bit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps.xml"/>
diff --git a/BOOK/final-system/x86-chapter.xml b/BOOK/final-system/x86-chapter.xml
index 92afbbc..8dd0061 100644
--- a/BOOK/final-system/x86-chapter.xml
+++ b/BOOK/final-system/x86-chapter.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
diff --git a/BOOK/final-system/x86_64-64-chapter.xml b/BOOK/final-system/x86_64-64-chapter.xml
index 2c5406d..9c0511f 100644
--- a/BOOK/final-system/x86_64-64-chapter.xml
+++ b/BOOK/final-system/x86_64-64-chapter.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
diff --git a/BOOK/final-system/x86_64-chapter.xml b/BOOK/final-system/x86_64-chapter.xml
index 6302fb2..cf16584 100644
--- a/BOOK/final-system/x86_64-chapter.xml
+++ b/BOOK/final-system/x86_64-chapter.xml
@@ -38,7 +38,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses-64bit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/procps.xml"/>
diff --git a/BOOK/materials/common/packages.xml b/BOOK/materials/common/packages.xml
index 0a7d64f..355bd5a 100644
--- a/BOOK/materials/common/packages.xml
+++ b/BOOK/materials/common/packages.xml
@@ -456,11 +456,11 @@
</varlistentry>
<varlistentry>
- <term>Pkg-config (&pkg-config-version;) - <token>&pkg-config-size;</token>:</term>
+ <term>Pkg-config-lite (&pkg-config-lite-version;) - <token>&pkg-config-lite-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>
+ <para>Home page: <ulink url="&pkg-config-lite-home;"/></para>
+ <para>Download: <ulink url="&pkg-config-lite-url;"/></para>
+ <para>MD5 sum: <literal>&pkg-config-lite-md5;</literal></para>
</listitem>
</varlistentry>
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 7c27051..2f185f0 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -348,11 +348,11 @@
<!ENTITY perl-md5 "4ec1a3f3824674552e749ae420c5e68c">
<!ENTITY perl-home "http://www.perl.org">
-<!ENTITY pkg-config-version "lite-0.28-1">
-<!ENTITY pkg-config-size "384 KB">
-<!ENTITY pkg-config-url "http://sourceforge.net/projects/pkgconfiglite/files/0.28-1/pkg-config-&pkg-config-version;.tar.gz">
-<!ENTITY pkg-config-md5 "61f05feb6bab0a6bbfab4b6e3b2f44b6">
-<!ENTITY pkg-config-home "http://sourceforge.net/projects/pkgconfiglite">
+<!ENTITY pkg-config-lite-version "0.28-1">
+<!ENTITY pkg-config-lite-size "384 KB">
+<!ENTITY pkg-config-lite-url "http://sourceforge.net/projects/pkgconfiglite/files/0.28-1/pkg-config-lite-&pkg-config-lite-version;.tar.gz">
+<!ENTITY pkg-config-lite-md5 "61f05feb6bab0a6bbfab4b6e3b2f44b6">
+<!ENTITY pkg-config-lite-home "http://sourceforge.net/projects/pkgconfiglite">
<!ENTITY powerpcutils-version "1.1.3">
<!ENTITY powerpcutils-size "28 KB">
commit af5caa0fc3973712d43fa2890222992b0138f694
Author: William Harrington <kb0iic at berzerkula.org>
Date: Tue Sep 10 13:04:12 2013 -0500
Update Rationale and Dependencies. Tidy up some obsolete entries.
diff --git a/BOOK/appendices/dependencies/common.xml b/BOOK/appendices/dependencies/common.xml
index c1ea886..c913a0a 100644
--- a/BOOK/appendices/dependencies/common.xml
+++ b/BOOK/appendices/dependencies/common.xml
@@ -482,7 +482,7 @@
<seglistitem>
<seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, Gettext, Grep, Gzip,
- Make, Pkg-config, Sed, Texinfo and Util-linux</seg>
+ Make, Pkg-config-lite, Sed, Texinfo and Util-linux</seg>
</seglistitem>
</segmentedlist>
@@ -620,8 +620,9 @@
<segtitle>&dependencies;</segtitle>
<seglistitem>
- <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
- GCC, GMP, Grep, Make, MPFR, Patch, Perl, Sed, Tar and Texinfo</seg>
+ <seg>Bash, Binutils, CLooG-ISL, Coreutils, Diffutils, EGLIBC,
+ Findutils, Gawk, GCC, GMP, Grep, ISL, Make, MPFR, Patch, Perl, Sed,
+ Tar and Texinfo</seg>
</seglistitem>
</segmentedlist>
@@ -629,7 +630,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>DejaGNU and Expect</seg>
+ <seg>Check, DejaGNU, and Expect</seg>
</seglistitem>
</segmentedlist>
@@ -692,7 +693,7 @@
<segtitle>&before;</segtitle>
<seglistitem>
- <seg>Pkg-config</seg>
+ <seg>Pkg-config-lite</seg>
</seglistitem>
</segmentedlist>
@@ -946,6 +947,35 @@
</seglistitem>
</segmentedlist>
+<!-- Begin KMOD dependency info -->
+ <bridgehead renderas="sect2" id="kmod-dep">KMOD</bridgehead>
+
+ <segmentedlist>
+ <segtitle>&dependencies;</segtitle>
+
+ <seglistitem>
+ <seg>Bash, Binutils, Bison, Coreutils, EGLIBC, Flex, Gawk, GCC,
+ Gettext, Gzip, Make, Pkg-config-lite, Sed, XZ-Utils, and Zlib.
+ </seg>
+ </seglistitem>
+ </segmentedlist>
+
+ <segmentedlist>
+ <segtitle>&testsuites;</segtitle>
+
+ <seglistitem>
+ <seg>No testsuite available</seg>
+ </seglistitem>
+ </segmentedlist>
+
+ <segmentedlist>
+ <segtitle>&before;</segtitle>
+
+ <seglistitem>
+ <seg>Eudev</seg>
+ </seglistitem>
+ </segmentedlist>
+
<!-- Begin Less dependency info -->
<bridgehead renderas="sect2" id="less-dep">Less</bridgehead>
@@ -982,7 +1012,7 @@
<seglistitem>
<seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
- GCC, Grep, Libestr, Make, Pkg-config, Sed and Texinfo</seg>
+ GCC, Grep, Libestr, Make, Pkg-config-lite, Sed and Texinfo</seg>
</seglistitem>
</segmentedlist>
@@ -1093,7 +1123,7 @@
<seglistitem>
<seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, GCC, Grep,
- Gzip, Make, Module-Init-Tools, Ncurses, Perl and Sed</seg>
+ Gzip, Make, KMOD, Ncurses, Perl and Sed</seg>
</seglistitem>
</segmentedlist>
@@ -1280,8 +1310,8 @@
</seglistitem>
</segmentedlist>
-<!-- Begin Module-Init-Tools dependency info -->
- <bridgehead renderas="sect2" id="module-init-tools-dep">Module-Init-Tools</bridgehead>
+<!-- Begin KMOD dependency info -->
+ <bridgehead renderas="sect2" id="module-init-tools-dep">KMOD</bridgehead>
<segmentedlist>
<segtitle>&dependencies;</segtitle>
@@ -1392,8 +1422,8 @@
</seglistitem>
</segmentedlist>
-<!-- Begin Pkg-config dependency info -->
- <bridgehead renderas="sect2" id="pkg-config-dep">Pkg-config</bridgehead>
+<!-- Begin Pkg-config-lite dependency info -->
+ <bridgehead renderas="sect2" id="pkg-config-lite-dep">Pkg-config-lite</bridgehead>
<segmentedlist>
<segtitle>&dependencies;</segtitle>
@@ -1734,7 +1764,7 @@
<seglistitem>
<seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep,
- Make, Ncurses, Pkg-config, Sed, Texinfo and Zlib</seg>
+ Make, Ncurses, Pkg-config-lite, Sed, Texinfo and Zlib</seg>
</seglistitem>
</segmentedlist>
@@ -1833,7 +1863,7 @@
<segtitle>&before;</segtitle>
<seglistitem>
- <seg>File, Module-Init-Tools and Util-linux</seg>
+ <seg>File, KMOD and Util-linux</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/appendices/rationale/common.xml b/BOOK/appendices/rationale/common.xml
index 899af99..fa9fa1f 100644
--- a/BOOK/appendices/rationale/common.xml
+++ b/BOOK/appendices/rationale/common.xml
@@ -303,7 +303,7 @@
</listitem>
<listitem>
- <para>Pkg-config</para>
+ <para>Pkg-config-lite</para>
<para>Needed by E2fsprogs</para>
</listitem>
-----------------------------------------------------------------------
Summary of changes:
BOOK/appendices/dependencies/common.xml | 56 +++++++++++++++-----
BOOK/appendices/rationale/common.xml | 2 +-
BOOK/final-system/alpha-chapter.xml | 2 +-
.../common/{pkg-config.xml => pkg-config-lite.xml} | 26 +++++-----
BOOK/final-system/mips-chapter.xml | 2 +-
BOOK/final-system/mips64-64-chapter.xml | 2 +-
BOOK/final-system/mips64-chapter.xml | 2 +-
.../mips64/{pkg-config.xml => pkg-config-lite.xml} | 36 ++++++------
.../{pkg-config.xml => pkg-config-lite.xml} | 30 +++++-----
BOOK/final-system/ppc-chapter.xml | 2 +-
BOOK/final-system/ppc64-64-chapter.xml | 2 +-
BOOK/final-system/ppc64-chapter.xml | 2 +-
BOOK/final-system/sparc-chapter.xml | 2 +-
BOOK/final-system/sparc64-64-chapter.xml | 2 +-
BOOK/final-system/sparc64-chapter.xml | 2 +-
BOOK/final-system/x86-chapter.xml | 2 +-
BOOK/final-system/x86_64-64-chapter.xml | 2 +-
BOOK/final-system/x86_64-chapter.xml | 2 +-
BOOK/materials/common/packages.xml | 8 ++--
BOOK/packages.ent | 10 ++--
20 files changed, 112 insertions(+), 82 deletions(-)
rename BOOK/final-system/common/{pkg-config.xml => pkg-config-lite.xml} (68%)
rename BOOK/final-system/mips64/{pkg-config.xml => pkg-config-lite.xml} (68%)
rename BOOK/final-system/multilib/{pkg-config.xml => pkg-config-lite.xml} (72%)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list