[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. bf87a72b4eda71716360604e3dffd28eb5e50701
git
git at cross-lfs.org
Wed Jun 6 13:37:46 PDT 2012
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 bf87a72b4eda71716360604e3dffd28eb5e50701 (commit)
from 3e3e2265308ee94dc220ec5a062fb2efc0fd747d (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 bf87a72b4eda71716360604e3dffd28eb5e50701
Author: Jonathan Norman <jon at cosmo1847.co.uk>
Date: Wed Jun 6 20:25:18 2012 +0100
Updated coreutils from 2.20 to 2.20.1
diff --git a/BOOK/boot/64/util-linux.xml b/BOOK/boot/64/util-linux.xml
index 5268154..906e947 100644
--- a/BOOK/boot/64/util-linux.xml
+++ b/BOOK/boot/64/util-linux.xml
@@ -21,6 +21,14 @@
<sect2 role="installation">
<title>Installation of Util-linux</title>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../chroot/common/util-linux.xml"
+ xpointer="xpointer(//*[@os='f1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../chroot/common/util-linux.xml"
+ xpointer="xpointer(//*[@os='f2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/util-linux.xml"
@@ -29,7 +37,8 @@
<screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
./configure --prefix=/tools --exec-prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
- --enable-login-utils --disable-makeinstall-chown</userinput></screen>
+ --enable-login-utils --disable-makeinstall-chown \
+ --config-cache</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/util-linux.xml"
diff --git a/BOOK/boot/common/util-linux.xml b/BOOK/boot/common/util-linux.xml
index fa91cd5..a99dc30 100644
--- a/BOOK/boot/common/util-linux.xml
+++ b/BOOK/boot/common/util-linux.xml
@@ -21,6 +21,14 @@
<sect2 role="installation">
<title>Installation of Util-linux</title>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../chroot/common/util-linux.xml"
+ xpointer="xpointer(//*[@os='f1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../chroot/common/util-linux.xml"
+ xpointer="xpointer(//*[@os='f2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/util-linux.xml"
@@ -29,7 +37,8 @@
<screen os="b"><userinput>PKG_CONFIG=true \
./configure --prefix=/tools --exec-prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
- --enable-login-utils --disable-makeinstall-chown</userinput></screen>
+ --enable-login-utils --disable-makeinstall-chown\
+ --config-cache</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/util-linux.xml"
diff --git a/BOOK/boot/multilib/util-linux.xml b/BOOK/boot/multilib/util-linux.xml
index 54a5097..4d6ac9f 100644
--- a/BOOK/boot/multilib/util-linux.xml
+++ b/BOOK/boot/multilib/util-linux.xml
@@ -21,6 +21,14 @@
<sect2 role="installation">
<title>Installation of Util-linux</title>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../chroot/common/util-linux.xml"
+ xpointer="xpointer(//*[@os='f1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../chroot/common/util-linux.xml"
+ xpointer="xpointer(//*[@os='f2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/util-linux.xml"
@@ -31,7 +39,7 @@
--prefix=/tools --exec-prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
--libdir=/tools/lib64 --enable-login-utils \
- --disable-makeinstall-chown</userinput></screen>
+ --disable-makeinstall-chown --config-cache</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/util-linux.xml"
diff --git a/BOOK/boot/ppc64/util-linux-32.xml b/BOOK/boot/ppc64/util-linux-32.xml
index 760da49..d661c01 100644
--- a/BOOK/boot/ppc64/util-linux-32.xml
+++ b/BOOK/boot/ppc64/util-linux-32.xml
@@ -21,6 +21,14 @@
<sect2 role="installation">
<title>Installation of Util-linux 32 bit</title>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../chroot/common/util-linux.xml"
+ xpointer="xpointer(//*[@os='f1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../chroot/common/util-linux.xml"
+ xpointer="xpointer(//*[@os='f2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/util-linux.xml"
@@ -31,7 +39,7 @@
--prefix=/tools --exec-prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET32} \
--enable-login-utils --without-ncurses \
- --disable-makeinstall-chown</userinput></screen>
+ --disable-makeinstall-chown --config-cache</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/util-linux.xml"
diff --git a/BOOK/chroot/common/util-linux.xml b/BOOK/chroot/common/util-linux.xml
index 7269677..b4e7f7b 100644
--- a/BOOK/chroot/common/util-linux.xml
+++ b/BOOK/chroot/common/util-linux.xml
@@ -22,13 +22,19 @@
<sect2 role="installation">
<title>Installation of Util-linux</title>
+ <para os="f1">Util-linux cannot test for scanf type modifiers when cross compiling
+ and stops. We can issue the following to instruct it to use the one
+ we've compiled.</para>
+
+ <screen os="f2"><userinput>echo "scanf_cv_type_modifier=as" > config.cache</userinput></screen>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/util-linux.xml"
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
- --disable-makeinstall-chown</userinput></screen>
+ --disable-makeinstall-chown --config-cache</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/util-linux.xml"
diff --git a/BOOK/chroot/multilib/util-linux.xml b/BOOK/chroot/multilib/util-linux.xml
index 115cc7e..028a615 100644
--- a/BOOK/chroot/multilib/util-linux.xml
+++ b/BOOK/chroot/multilib/util-linux.xml
@@ -21,6 +21,14 @@
<sect2 role="installation">
<title>Installation of Util-linux</title>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/util-linux.xml"
+ xpointer="xpointer(//*[@os='f1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/util-linux.xml"
+ xpointer="xpointer(//*[@os='f2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/util-linux.xml"
@@ -28,7 +36,7 @@
<screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
- --disable-makeinstall-chown</userinput></screen>
+ --disable-makeinstall-chown --config-cache</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/util-linux.xml"
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 3bb9612..70a9f7d 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,15 @@
-->
<listitem>
+ <para>6 June 2012</para>
+ <itemizedlist>
+ <listitem>
+ <para>[Jonathan] - Updated Util-linux from 2.20 to 2.20.1.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>4 June 2012</para>
<itemizedlist>
<listitem>
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index e4a2a1f..9e0a89c 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -441,10 +441,10 @@
<!ENTITY uname_hack-home " ">
<!ENTITY util-linux-major-version "2.20">
-<!ENTITY util-linux-version "&util-linux-major-version;">
-<!ENTITY util-linux-size "4,397 KB">
+<!ENTITY util-linux-version "&util-linux-major-version;.1">
+<!ENTITY util-linux-size "4,508 KB">
<!ENTITY util-linux-url "&kernel;/linux/utils/util-linux/v&util-linux-major-version;/util-linux-&util-linux-version;.tar.bz2">
-<!ENTITY util-linux-md5 "4dcacdbdafa116635e52b977d9d0e879">
+<!ENTITY util-linux-md5 "079b37517fd4e002a2e6e992e8b4e361">
<!ENTITY util-linux-blkid-id "1.1.0">
<!ENTITY util-linux-uuid-id "1.3.0">
<!ENTITY util-linux-home "http://userweb.kernel.org/~kzak/util-linux/">
-----------------------------------------------------------------------
Summary of changes:
BOOK/boot/64/util-linux.xml | 11 ++++++++++-
BOOK/boot/common/util-linux.xml | 11 ++++++++++-
BOOK/boot/multilib/util-linux.xml | 10 +++++++++-
BOOK/boot/ppc64/util-linux-32.xml | 10 +++++++++-
BOOK/chroot/common/util-linux.xml | 8 +++++++-
BOOK/chroot/multilib/util-linux.xml | 10 +++++++++-
BOOK/introduction/common/changelog.xml | 9 +++++++++
BOOK/packages.ent | 6 +++---
8 files changed, 66 insertions(+), 9 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list