浏览代码

Upgrade to Coreutils-8.16. Fixes #3048.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9799 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Matthew Burgess 13 年之前
父节点
当前提交
8335e5c48b
共有 7 个文件被更改,包括 35 次插入28 次删除
  1. 10 0
      chapter01/changelog.xml
  2. 14 2
      chapter01/whatsnew.xml
  3. 0 8
      chapter03/patches.xml
  4. 5 8
      chapter06/coreutils.xml
  5. 2 2
      general.ent
  6. 3 3
      packages.ent
  7. 1 5
      patches.ent

+ 10 - 0
chapter01/changelog.xml

@@ -36,6 +36,16 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>2012-04-03</para>
+      <itemizedlist>
+         <listitem>
+           <para>[matthew] - Upgrade to Coreutils-8.16 and drop the uname patch.
+           Fixes <ulink url="&lfs-ticket-root;3048">#3048</ulink>.</para>
+         </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2012-03-28</para>
       <itemizedlist>

+ 14 - 2
chapter01/whatsnew.xml

@@ -46,9 +46,9 @@
     <!--<listitem>
       <para>Bzip2 &bzip2-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Coreutils &coreutils-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>DejaGNU &dejagnu-version;</para>
     </listitem>-->
@@ -227,6 +227,10 @@
       <para>&binutils-build-patch;</para>
     </listitem>
 
+    <listitem>
+      <para>&coreutils-i18n-patch;</para>
+    </listitem>
+
     <listitem>
       <para>&gcc-startfiles-patch;</para>
     </listitem>
@@ -244,6 +248,14 @@
       <para>bash-4.2-fixes-4.patch</para>
     </listitem>
 
+    <listitem>
+      <para>coreutils-8.15-i18n-1.patch</para>
+    </listitem>
+
+    <listitem>
+      <para>coreutils-8.15-uname-1.patch</para>
+    </listitem>
+
     <listitem>
       <para>gcc-4.6.2-cross_compile-1.patch</para>
     </listitem>

+ 0 - 8
chapter03/patches.xml

@@ -50,14 +50,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Coreutils Uname Patch - <token>&coreutils-uname-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&coreutils-uname-patch;"/></para>
-        <para>MD5 sum: <literal>&coreutils-uname-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Flex GCC-4.4.x Patch - <token>&flex-gcc-patch-size;</token>:</term>
       <listitem>

+ 5 - 8
chapter06/coreutils.xml

@@ -41,14 +41,10 @@
   <sect2 role="installation">
     <title>Installation of Coreutils</title>
 
-    <para>A known issue with the <command>uname</command> program from
-    this package is that the <parameter>-p</parameter> switch always
-    returns <computeroutput>unknown</computeroutput>. The following patch
-    fixes this behavior for Intel architectures:</para>
+    <para>Fix a bug in a test case:</para>
 
-<screen><userinput remap="pre">case `uname -m` in
- i?86 | x86_64) patch -Np1 -i ../&coreutils-uname-patch; ;;
-esac</userinput></screen>
+<screen><userinput remap="pre">sed -i -e 's/! isatty/isatty/' \
+       -e '45i\              || errno == ENOENT' gnulib-tests/test-getlogin.c</userinput></screen>
 
     <para>POSIX requires that programs from Coreutils recognize character
     boundaries correctly even in multibyte locales. The following patch
@@ -64,7 +60,8 @@ esac</userinput></screen>
 
     <para>Now prepare Coreutils for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr         \
+<screen><userinput remap="configure">FORCE_UNSAFE_CONFIGURE=1 ./configure \
+            --prefix=/usr         \
             --libexecdir=/usr/lib \
             --enable-no-install-program=kill,uptime</userinput></screen>
 

+ 2 - 2
general.ent

@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120328">
-<!ENTITY releasedate "Mar 28, 2012">
+<!ENTITY version "SVN-20120403">
+<!ENTITY releasedate "Apr 03, 2012">
 <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.2">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

+ 3 - 3
packages.ent

@@ -76,10 +76,10 @@
 <!ENTITY check-ch5-du "4.8 MB">
 <!ENTITY check-ch5-sbu "0.1 SBU">
 
-<!ENTITY coreutils-version "8.15">
-<!ENTITY coreutils-size "4,827 KB">
+<!ENTITY coreutils-version "8.16">
+<!ENTITY coreutils-size "4,925 KB">
 <!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.xz">
-<!ENTITY coreutils-md5 "094909fafa86110140b32e4948941545">
+<!ENTITY coreutils-md5 "89b06f91634208dceba7b36ad1f9e8b9">
 <!ENTITY coreutils-home "&gnu-software;coreutils/">
 <!ENTITY coreutils-ch5-du "88 MB">
 <!ENTITY coreutils-ch5-sbu "0.7 SBU">

+ 1 - 5
patches.ent

@@ -18,13 +18,9 @@
 
 
 <!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-1.patch">
-<!ENTITY coreutils-i18n-patch-md5 "70953451fa1d0e950266b3d0477adb8d">
+<!ENTITY coreutils-i18n-patch-md5 "d48bbb0a7f9d8effd975aa9cef9436ce">
 <!ENTITY coreutils-i18n-patch-size "123 KB">
 
-<!ENTITY coreutils-uname-patch "coreutils-&coreutils-version;-uname-1.patch">
-<!ENTITY coreutils-uname-patch-md5 "500481b75892e5c07e19e9953a690e54">
-<!ENTITY coreutils-uname-patch-size "1.6 KB">
-
 
 <!ENTITY diffutils-i18n-patch "diffutils-&diffutils-version;-i18n-1.patch">
 <!ENTITY diffutils-i18n-patch-md5 "c8d481223db274a33b121fb8c25af9f7">