Changeset 4171479 in clfs-sysroot

Timestamp:

Mar 17, 2009, 6:24:48 PM (16 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

master

Children:

f79dced

Parents:

b051602

Message:

Update Coreutils Patch.

Location:

patches

Files:

• coreutils-7.1-uname-1.patch (moved) (moved from patches/coreutils-6.12-uname-1.patch ) (6 diffs)
• sysvinit-2.86-fixes-1.patch (added)

patches/coreutils-7.1-uname-1.patch

@@ -1 @@
-Submitted By: Jim Gifford <jim at linuxfromscratch dot org>
-Date: 2006-08-24
-Initial Package Version: 5.97
-        Rediffed against 6.12 by Joe Ciccone on 2008-08-30
+Submitted By: Jim Gifford <jim at cross-lfs dot org>
+Date: 2009-02-21
+Initial Package Version: 7.1
 Upstream Status: Not Accepted
 Origin: Gentoo - http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/coreutils
 Description: Display CPU Information from /proc/cpuinfo or /proc/sysinfo
 
+Rediffed for 7.1 by Jim Gifford
 Original Patch by - Matthew Burgess and Scot McPherson
 
-diff -Naur coreutils-6.12.orig/src/uname.c coreutils-6.12/src/uname.c
---- coreutils-6.12.orig/src/uname.c     2008-05-26 02:40:33.000000000 -0400
-+++ coreutils-6.12/src/uname.c  2008-08-31 12:03:12.000000000 -0400
+diff -Naur coreutils-7.1.orig/src/uname.c coreutils-7.1/src/uname.c
+--- coreutils-7.1.orig/src/uname.c      2008-09-18 00:06:57.000000000 -0700
++++ coreutils-7.1/src/uname.c   2009-02-21 21:48:22.417139823 -0800
 @@ -50,6 +50,11 @@
  # include <mach-o/arch.h>
@@ -24 +24 @@
  #include "error.h"
  #include "quote.h"
-@@ -158,6 +163,106 @@
+@@ -155,6 +160,117 @@
    exit (status);
  }
@@ -53 +53 @@
 +       if (tmp != buf)
 +               memmove(buf, tmp, strlen(tmp)+1);
++       /* finally collapse whitespace */
++       tmp = buf;
++       while (tmp[0] && tmp[1]) {
++               if (isspace(tmp[0]) && isspace(tmp[1])) {
++                       memmove(tmp, tmp+1, strlen(tmp));
++                       continue;
++               }
++               ++tmp;
++       }
 +}
 +
@@ -65 +74 @@
 +               #elif defined(__arm__)
 +                       "Processor", "Hardware"
-+               #elif defined(bfin)
++               #elif defined(__avr32__)
++                       "processor", "cpu family"
++               #elif defined(__bfin__)
 +                       "CPU", "BOARD Name"
 +               #elif defined(__cris__)
@@ -131 +142 @@
     printed.  */
  
-@@ -305,10 +410,14 @@
+@@ -302,10 +418,14 @@
    if (toprint & PRINT_PROCESSOR)
      {
@@ -147 +158 @@
        }
  #endif
-@@ -361,9 +470,13 @@
+@@ -358,9 +478,13 @@
        if (element == unknown)
         {