Changeset 4f82906


Ignore:
Timestamp:
Feb 21, 2009, 10:05:26 PM (16 years ago)
Author:
Jim Gifford <clfs@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
f1583ef
Parents:
6392a09d
Message:

Updated to Coreutils 7.1

Files:
1 deleted
6 edited
1 moved

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/common/coreutils.xml

    r6392a09d r4f82906  
    3232
    3333<screen os="p2"><userinput>patch -Np1 -i ../&coreutils-uname-patch;</userinput></screen>
    34 
    35     <para os="p3">This patch adds support for Internationalization:</para>
    36 
    37 <screen os="p4"><userinput>patch -Np1 -i ../&coreutils-i18n-patch;</userinput></screen>
    3834
    3935    <para os="c">Now prepare Coreutils for compilation:</para>

  • BOOK/final-system/multilib/coreutils.xml

    r6392a09d r4f82906  
    2929    href="../common/coreutils.xml"
    3030    xpointer="xpointer(//*[@os='p2'])"/>
    31 
    32     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    33     href="../common/coreutils.xml"
    34     xpointer="xpointer(//*[@os='p3'])"/>
    35 
    36     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    37     href="../common/coreutils.xml"
    38     xpointer="xpointer(//*[@os='p4'])"/>
    3931
    4032    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • BOOK/introduction/common/changelog.xml

    r6392a09d r4f82906  
    4343          <para>[Jim] - LZMA Utils is now XZ Utils. Upgraded package
    4444          to 4.999.8beta.</para>
     45        </listitem>
     46        <listitem>
     47          <para>[jciccone] - Updated Coreutils to 7.1.</para>
    4548        </listitem>
    4649      </itemizedlist>

  • BOOK/materials/common/patches.xml

    r6392a09d r4f82906  
    5050
    5151    <varlistentry>
    52       <term>Coreutils i18n Patch - <token>&coreutils-i18n-patch-size;</token>:</term>
    53       <listitem>
    54         <para>Download: <ulink
    55         url="&patches-root;&coreutils-i18n-patch;"/></para>
    56         <para>MD5 sum: <literal>&coreutils-i18n-patch-md5;</literal></para>
    57       </listitem>
    58     </varlistentry>
    59 
    60     <varlistentry>
    6152      <term>Coreutils Uname Patch - <token>&coreutils-uname-patch-size;</token>:</term>
    6253      <listitem>

  • BOOK/packages.ent

    r6392a09d r4f82906  
    7373<!ENTITY colo-home "http://www.colonel-panic.org/cobalt-mips">
    7474
    75 <!ENTITY coreutils-version "6.12">
    76 <!ENTITY coreutils-size "8,790 KB">
     75<!ENTITY coreutils-version "7.1">
     76<!ENTITY coreutils-size "9,039 KB">
    7777<!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.gz">
    78 <!ENTITY coreutils-md5 "2ca9ac69823dbd567b905a9e9f53c4f6">
     78<!ENTITY coreutils-md5 "cbb2b3d1718ee1237b808e00b5c11b1e">
    7979<!ENTITY coreutils-home "&gnu-software;coreutils">
    8080

  • BOOK/patches.ent

    r6392a09d r4f82906  
    1717<!ENTITY binutils-posix-patch-size "3 KB">
    1818
    19 <!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-1.patch">
    20 <!ENTITY coreutils-i18n-patch-md5 "cc19ae40783df5015893bebcffbd398b">
    21 <!ENTITY coreutils-i18n-patch-size "100 KB">
    22 
    2319<!ENTITY coreutils-uname-patch "coreutils-&coreutils-version;-uname-1.patch">
    24 <!ENTITY coreutils-uname-patch-md5 "d299f910668ab8650e8ecbb6cdc2d5b1">
     20<!ENTITY coreutils-uname-patch-md5 "e21c03d8d79e07366ee558ab4b3c5ece">
    2521<!ENTITY coreutils-uname-patch-size "4 KB">
    2622

  • patches/coreutils-7.1-uname-1.patch

    r6392a09d r4f82906  
    1 Submitted By: Jim Gifford <jim at linuxfromscratch dot org>
    2 Date: 2006-08-24
    3 Initial Package Version: 5.97
    4         Rediffed against 6.12 by Joe Ciccone on 2008-08-30
     1Submitted By: Jim Gifford <jim at cross-lfs dot org>
     2Date: 2009-02-21
     3Initial Package Version: 7.1
    54Upstream Status: Not Accepted
    65Origin: Gentoo - http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/coreutils
    76Description: Display CPU Information from /proc/cpuinfo or /proc/sysinfo
    87
     8Rediffed for 7.1 by Jim Gifford
    99Original Patch by - Matthew Burgess and Scot McPherson
    1010
    11 diff -Naur coreutils-6.12.orig/src/uname.c coreutils-6.12/src/uname.c
    12 --- coreutils-6.12.orig/src/uname.c     2008-05-26 02:40:33.000000000 -0400
    13 +++ coreutils-6.12/src/uname.c  2008-08-31 12:03:12.000000000 -0400
     11diff -Naur coreutils-7.1.orig/src/uname.c coreutils-7.1/src/uname.c
     12--- coreutils-7.1.orig/src/uname.c      2008-09-18 00:06:57.000000000 -0700
     13+++ coreutils-7.1/src/uname.c   2009-02-21 21:48:22.417139823 -0800
    1414@@ -50,6 +50,11 @@
    1515 # include <mach-o/arch.h>
    … …  
    2424 #include "error.h"
    2525 #include "quote.h"
    26 @@ -158,6 +163,106 @@
     26@@ -155,6 +160,117 @@
    2727   exit (status);
    2828 }
    … …  
    5353+       if (tmp != buf)
    5454+               memmove(buf, tmp, strlen(tmp)+1);
     55+       /* finally collapse whitespace */
     56+       tmp = buf;
     57+       while (tmp[0] && tmp[1]) {
     58+               if (isspace(tmp[0]) && isspace(tmp[1])) {
     59+                       memmove(tmp, tmp+1, strlen(tmp));
     60+                       continue;
     61+               }
     62+               ++tmp;
     63+       }
    5564+}
    5665+
    … …  
    6574+               #elif defined(__arm__)
    6675+                       "Processor", "Hardware"
    67 +               #elif defined(bfin)
     76+               #elif defined(__avr32__)
     77+                       "processor", "cpu family"
     78+               #elif defined(__bfin__)
    6879+                       "CPU", "BOARD Name"
    6980+               #elif defined(__cris__)
    … …  
    131142    printed.  */
    132143 
    133 @@ -305,10 +410,14 @@
     144@@ -302,10 +418,14 @@
    134145   if (toprint & PRINT_PROCESSOR)
    135146     {
    … …  
    147158       }
    148159 #endif
    149 @@ -361,9 +470,13 @@
     160@@ -358,9 +478,13 @@
    150161       if (element == unknown)
    151162        {
Note: See TracChangeset for help on using the changeset viewer.