Changeset 4f82906 for patches


Ignore:
Timestamp:
Feb 22, 2009, 6:05:26 AM (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

Location:
patches
Files:
1 deleted
1 moved

Legend:

Unmodified
Added
Removed
  • 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.