Changeset b159483 for patches


Ignore:
Timestamp:
Sep 12, 2009, 8:38:36 AM (15 years ago)
Author:
jim <jim@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
36069c1
Parents:
4b83b26c
Message:

Updated to Coreutils 7.6

File:
1 moved

Legend:

Unmodified
Added
Removed
  • patches/coreutils-7.6-uname-1.patch

    r4b83b26c rb159483  
    11Submitted By: Jim Gifford <jim at cross-lfs dot org>
    2 Date: 2009-02-21
    3 Initial Package Version: 7.1
     2Date: 2009-09-12
     3Initial Package Version: 7.6
    44Upstream Status: Not Accepted
    55Origin: Gentoo - http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/coreutils
     
    77
    88Rediffed for 7.1 by Jim Gifford
    9 Original Patch by - Matthew Burgess and Scot McPherson
     9Rediffed for 7.5 by Jim Gifford
    1010
    11 diff -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
     11diff -Naur coreutils-7.6.orig/src/uname.c coreutils-7.6/src/uname.c
     12--- coreutils-7.6.orig/src/uname.c      2009-09-01 04:01:16.000000000 -0700
     13+++ coreutils-7.6/src/uname.c   2009-09-12 01:32:54.000000000 -0700
    1414@@ -50,6 +50,11 @@
    1515 # include <mach-o/arch.h>
     
    149149+#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO)
    150150       {
    151         static char processor[257];
     151         static char processor[257];
    152152+#if defined(USE_PROCINFO)
    153 +       if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor))
     153+        if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor))
    154154+#else
    155         if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
     155         if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
    156156+#endif
    157           element = processor;
     157           element = processor;
    158158       }
    159159 #endif
    160160@@ -358,9 +478,13 @@
    161161       if (element == unknown)
    162         {
    163           static char hardware_platform[257];
     162         {
     163           static char hardware_platform[257];
    164164+#if defined(USE_PROCINFO)
    165 +         if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform))
     165+        if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform))
    166166+#else
    167           size_t s = sizeof hardware_platform;
    168           static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM };
    169           if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0)
     167           size_t s = sizeof hardware_platform;
     168           static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM };
     169           if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0)
    170170+#endif
    171             element = hardware_platform;
    172         }
     171             element = hardware_platform;
     172         }
    173173 #endif
Note: See TracChangeset for help on using the changeset viewer.