aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2013-01-02 18:39:31 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2013-01-02 18:39:31 +0000
commit49144a2331d7eac0ec495190da87bf8378449648 (patch)
tree6f655a4e3edc3ab93ebd03a243a39897aff8dfb1
parenteec1ca93edd2d902c25d2121438738bc702721a2 (diff)
Upgrade to Coreutils-8.20. Fixes #3215.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10089 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter01/whatsnew.xml16
-rw-r--r--chapter03/patches.xml8
-rw-r--r--chapter06/coreutils.xml9
-rw-r--r--general.ent4
-rw-r--r--packages.ent6
-rw-r--r--patches.ent8
7 files changed, 47 insertions, 14 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 539073539..baea05c90 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,16 @@
-->
<listitem>
+ <para>2013-01-02</para>
+ <itemizedlist>
+ <listitem>
+ <para>[matthew] - Upgrade to Coreutils-8.20. Fixes
+ <ulink url="&lfs-ticket-root;3215">#3215</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2013-01-01</para>
<itemizedlist>
<listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index d5fa816de..ada4bd7da 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -49,9 +49,9 @@
<listitem>
<para>Check &check-version;</para>
</listitem>
- <!--<listitem>
+ <listitem>
<para>Coreutils &coreutils-version;</para>
- </listitem>-->
+ </listitem>
<!--<listitem>
<para>DejaGNU &dejagnu-version;</para>
</listitem>-->
@@ -237,6 +237,14 @@
</listitem>
<listitem>
+ <para>&coreutils-i18n-patch;</para>
+ </listitem>
+
+ <listitem>
+ <para>&coreutils-test-patch;</para>
+ </listitem>
+
+ <listitem>
<para>&kbd-backspace-patch;</para>
</listitem>
@@ -258,6 +266,10 @@
</listitem>
<listitem>
+ <para>coreutils-8.19-i18n-1.patch</para>
+ </listitem>
+
+ <listitem>
<para>gcc-4.7.1-startfiles_fix-1.patch</para>
</listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index a43018f97..8ad0a835e 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -51,6 +51,14 @@
</varlistentry>
<varlistentry>
+ <term>Coreutils Test Fixes Patch - <token>&coreutils-test-patch-size;</token>:</term>
+ <listitem>
+ <para>Download: <ulink url="&patches-root;&coreutils-test-patch;"/></para>
+ <para>MD5 sum: <literal>&coreutils-test-patch-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>Flex Regression Tests Patch - <token>&flex-bison-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink url="&patches-root;&flex-bison-patch;"/></para>
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index ba496de4e..e4ddc79d6 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -41,10 +41,9 @@
<sect2 role="installation">
<title>Installation of Coreutils</title>
- <para>Fix a bug in a test case:</para>
+ <para>Fix a couple of test failures:</para>
-<screen><userinput remap="pre">sed -i -e 's/! isatty/isatty/' \
- -e '45i\ || errno == ENOENT' gnulib-tests/test-getlogin.c</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-test-patch;</userinput></screen>
<para>POSIX requires that programs from Coreutils recognize character
boundaries correctly even in multibyte locales. The following patch
@@ -88,7 +87,7 @@
<para>Now the test suite is ready to be run. First, run the tests that are
meant to be run as user <systemitem class="username">root</systemitem>:</para>
-<screen><userinput remap="test">make NON_ROOT_USERNAME=nobody check-root</userinput></screen>
+<screen><userinput remap="test">make NON_ROOT_USERNAME=nobody SUBDIRS= check-root</userinput></screen>
<para>We're going to run the remainder of the tests as the
<systemitem class="username">nobody</systemitem> user. Certain tests,
@@ -107,7 +106,7 @@
environment includes /tools/bin.</para>
<screen><userinput remap="test">su nobody -s /bin/bash \
- -c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes -k check || true"</userinput></screen>
+ -c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen>
<para>Remove the temporary group:</para>
diff --git a/general.ent b/general.ent
index 44c412cdf..e1c0bad5c 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20130101">
-<!ENTITY releasedate "January 1, 2013">
+<!ENTITY version "SVN-20130102">
+<!ENTITY releasedate "January 2, 2013">
<!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.3">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index c1f86d3d4..d00bc72f3 100644
--- a/packages.ent
+++ b/packages.ent
@@ -76,10 +76,10 @@
<!ENTITY check-ch5-du "6.9 MB">
<!ENTITY check-ch5-sbu "0.1 SBU">
-<!ENTITY coreutils-version "8.19">
-<!ENTITY coreutils-size "4,992 KB">
+<!ENTITY coreutils-version "8.20">
+<!ENTITY coreutils-size "5,150 KB">
<!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.xz">
-<!ENTITY coreutils-md5 "1a01231a2f3ed37c0efc073ccdda9375">
+<!ENTITY coreutils-md5 "3d69af8f561fce512538a9fe85f147ff">
<!ENTITY coreutils-home "&gnu-software;coreutils/">
<!ENTITY coreutils-ch5-du "126 MB">
<!ENTITY coreutils-ch5-sbu "0.7 SBU">
diff --git a/patches.ent b/patches.ent
index 569113b84..fa04b0f1d 100644
--- a/patches.ent
+++ b/patches.ent
@@ -15,8 +15,12 @@
<!ENTITY bzip2-docs-patch-size "1.6 KB">
<!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-1.patch">
-<!ENTITY coreutils-i18n-patch-md5 "befbf82628d019ef08d522c95cba331d">
-<!ENTITY coreutils-i18n-patch-size "272 KB">
+<!ENTITY coreutils-i18n-patch-md5 "065f4a2340085105a68d8c3aa6ac60d3">
+<!ENTITY coreutils-i18n-patch-size "124 KB">
+
+<!ENTITY coreutils-test-patch "coreutils-&coreutils-version;-test_fixes-1.patch">
+<!ENTITY coreutils-test-patch-md5 "69639d7e09e3cfc66f151879e6d5d23d">
+<!ENTITY coreutils-test-patch-size "1.5 KB">
<!ENTITY flex-bison-patch "flex-&flex-version;-bison-2.6.1-1.patch">
<!ENTITY flex-bison-patch-md5 "d5b001ef9bdbbe32e2f27576d97d8ff0">