r2344 - / branches/clfs-2.0/BOOK branches/clfs-2.0/BOOK/final-system branches/clfs-2.0/BOOK/final-system/common branches/clfs-2.0/BOOK/final-system/x86 branches/clfs-2.0/BOOK/introduction/common branches/clfs-2.0/BOOK/materials/common branches/clfs-2.0/BOOK/materials/x86

jim at linuxfromscratch.org jim at linuxfromscratch.org
Wed Aug 30 12:55:18 PDT 2006


Author: jim
Date: 2006-08-30 13:55:17 -0600 (Wed, 30 Aug 2006)
New Revision: 2344

Removed:
   branches/clfs-2.0/BOOK/final-system/x86/coreutils.xml
Modified:
   /
   branches/clfs-2.0/BOOK/final-system/common/coreutils.xml
   branches/clfs-2.0/BOOK/final-system/x86-chapter.xml
   branches/clfs-2.0/BOOK/introduction/common/changelog.xml
   branches/clfs-2.0/BOOK/materials/common/patches.xml
   branches/clfs-2.0/BOOK/materials/x86/patches.xml
   branches/clfs-2.0/BOOK/patches.ent
Log:
 r5387 at server (orig r2481):  jciccone | 2006-08-30 11:37:31 -0700
 Updated the uname patch to one that works on all architectures.



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:2480
   + b6734a72-470d-0410-b049-f317dca95413:/:2481

Modified: branches/clfs-2.0/BOOK/final-system/common/coreutils.xml
===================================================================
--- branches/clfs-2.0/BOOK/final-system/common/coreutils.xml	2006-08-30 19:55:05 UTC (rev 2343)
+++ branches/clfs-2.0/BOOK/final-system/common/coreutils.xml	2006-08-30 19:55:17 UTC (rev 2344)
@@ -30,6 +30,13 @@
 
 <screen os="p2"><userinput>patch -Np1 -i ../&coreutils-suppress-patch;</userinput></screen>
 
+    <para os="p3">A known issue with the <command>uname</command> program from
+    this package is that the <option>-p</option> switch always
+    returns <computeroutput>unknown</computeroutput>. The following patch
+    fixes this behavior for all architectures:</para>
+
+<screen os="p4"><userinput>patch -Np1 -i ../&coreutils-uname-patch;</userinput></screen>
+
     <para os="a">Configure doesn't properly handle the following tests
     when cross-compiling:</para>
 

Deleted: branches/clfs-2.0/BOOK/final-system/x86/coreutils.xml
===================================================================
--- branches/clfs-2.0/BOOK/final-system/x86/coreutils.xml	2006-08-30 19:55:05 UTC (rev 2343)
+++ branches/clfs-2.0/BOOK/final-system/x86/coreutils.xml	2006-08-30 19:55:17 UTC (rev 2344)
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-coreutils" role="wrap">
-  <?dbhtml filename="coreutils.html"?>
-
-  <title>Coreutils-&coreutils-version;</title>
-
-  <indexterm zone="ch-system-coreutils">
-    <primary sortas="a-Coreutils">Coreutils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/coreutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Coreutils</title>
-
-    <para os="aa">A known issue with the <command>uname</command> program from
-    this package is that the <option>-p</option> switch always
-    returns <computeroutput>unknown</computeroutput>. The following patch
-    fixes this behavior for Intel architectures:</para>
-
-<screen os="ab"><userinput>patch -Np1 -i ../&coreutils-x86_uname-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/coreutils.xml"
-  xpointer="xpointer(id('contents-coreutils'))"/>
-
-</sect1>

Modified: branches/clfs-2.0/BOOK/final-system/x86-chapter.xml
===================================================================
--- branches/clfs-2.0/BOOK/final-system/x86-chapter.xml	2006-08-30 19:55:05 UTC (rev 2343)
+++ branches/clfs-2.0/BOOK/final-system/x86-chapter.xml	2006-08-30 19:55:17 UTC (rev 2344)
@@ -17,7 +17,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/coreutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>

Modified: branches/clfs-2.0/BOOK/introduction/common/changelog.xml
===================================================================
--- branches/clfs-2.0/BOOK/introduction/common/changelog.xml	2006-08-30 19:55:05 UTC (rev 2343)
+++ branches/clfs-2.0/BOOK/introduction/common/changelog.xml	2006-08-30 19:55:17 UTC (rev 2344)
@@ -40,6 +40,9 @@
       <para>August 30, 2006</para>
       <itemizedlist>
         <listitem>
+          <para>[jciccone] - Updated to Coreutils Uname Patch -2, which supports all architectures.</para>
+        </listitem>
+        <listitem>
           <para>[jciccone] - Updated to Vim Patch -10, which contains upstream 
           fixes.</para>
         </listitem>

Modified: branches/clfs-2.0/BOOK/materials/common/patches.xml
===================================================================
--- branches/clfs-2.0/BOOK/materials/common/patches.xml	2006-08-30 19:55:05 UTC (rev 2343)
+++ branches/clfs-2.0/BOOK/materials/common/patches.xml	2006-08-30 19:55:17 UTC (rev 2344)
@@ -72,6 +72,15 @@
       </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>Gawk Segfault Patch - <token>&gawk-segfault-patch-size;</token>:</term>
       <listitem>

Modified: branches/clfs-2.0/BOOK/materials/x86/patches.xml
===================================================================
--- branches/clfs-2.0/BOOK/materials/x86/patches.xml	2006-08-30 19:55:05 UTC (rev 2343)
+++ branches/clfs-2.0/BOOK/materials/x86/patches.xml	2006-08-30 19:55:17 UTC (rev 2344)
@@ -10,6 +10,8 @@
 
   <title>Additional Patches for X86</title>
 
+<!--
+
   <variablelist role="materials">
 
     <varlistentry os="coreutils-x86_uname-patch">
@@ -23,6 +25,8 @@
 
   </variablelist>
 
+-->
+
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/patches.xml"
   xpointer="xpointer(//*[@os='a'])"/>

Modified: branches/clfs-2.0/BOOK/patches.ent
===================================================================
--- branches/clfs-2.0/BOOK/patches.ent	2006-08-30 19:55:05 UTC (rev 2343)
+++ branches/clfs-2.0/BOOK/patches.ent	2006-08-30 19:55:17 UTC (rev 2344)
@@ -27,6 +27,10 @@
 <!ENTITY coreutils-suppress-patch "coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch">
 <!ENTITY coreutils-suppress-patch-md5 "227d41a6d0f13c31375153eae91e913d">
 <!ENTITY coreutils-suppress-patch-size "13 KB">
+ 
+<!ENTITY coreutils-uname-patch "coreutils-&coreutils-version;-uname-2.patch">
+<!ENTITY coreutils-uname-patch-md5 "865d271bec9039f45a3be0ada21edae0">
+<!ENTITY coreutils-uname-patch-size "8 KB">
 
 <!ENTITY gawk-segfault-patch "gawk-&gawk-version;-segfault_fix-1.patch">
 <!ENTITY gawk-segfault-patch-md5 "7679530d88bf3eb56c42eb6aba342ddb">
@@ -135,9 +139,3 @@
 <!ENTITY zlib-fpic-patch "zlib-&zlib-version;-fPIC-1.patch">
 <!ENTITY zlib-fpic-patch-md5 "545d60b20bfde6f53023de44438cef59">
 <!ENTITY zlib-fpic-patch-size "3.2 KB">
-
-<!-- Start of x86/x86_64 patches -->
-
-<!ENTITY coreutils-x86_uname-patch "coreutils-&coreutils-version;-uname-1.patch">
-<!ENTITY coreutils-x86_uname-patch-md5 "c05b735710fbd62239588c07084852a0">
-<!ENTITY coreutils-x86_uname-patch-size "4.5 KB">




More information about the cross-lfs mailing list