Changeset e92465d for patches/coreutils-7.6-uname-1.patch

Timestamp:

Sep 13, 2009, 8:25:05 PM (15 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

0a81d23

Parents:

dca5b7b (diff), 32cb8ca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​git://git.cross-lfs.org/cross-lfs

File:

• patches/coreutils-7.6-uname-1.patch (moved) (moved from patches/coreutils-7.5-uname-1.patch ) (3 diffs)

patches/coreutils-7.6-uname-1.patch

@@ -1 +1 @@
 Submitted By: Jim Gifford <jim at cross-lfs dot org>
-Date: 2009-02-21
-Initial Package Version: 7.1
+Date: 2009-09-12
+Initial Package Version: 7.6
 Upstream Status: Not Accepted
 Origin: Gentoo - http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/coreutils
@@ -7 +7 @@
 
 Rediffed for 7.1 by Jim Gifford
-Original Patch by - Matthew Burgess and Scot McPherson
+Rediffed for 7.5 by Jim Gifford
 
-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
+diff -Naur coreutils-7.6.orig/src/uname.c coreutils-7.6/src/uname.c
+--- coreutils-7.6.orig/src/uname.c      2009-09-01 04:01:16.000000000 -0700
++++ coreutils-7.6/src/uname.c   2009-09-12 01:32:54.000000000 -0700
 @@ -50,6 +50,11 @@
  # include <mach-o/arch.h>
@@ -149 +149 @@
 +#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO)
        {
-        static char processor[257];
+         static char processor[257];
 +#if defined(USE_PROCINFO)
-+       if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor))
++        if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor))
 +#else
-        if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
+         if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
 +#endif
-          element = processor;
+           element = processor;
        }
  #endif
 @@ -358,9 +478,13 @@
        if (element == unknown)
-        {
-          static char hardware_platform[257];
+         {
+           static char hardware_platform[257];
 +#if defined(USE_PROCINFO)
-+         if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform))
++        if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform))
 +#else
-          size_t s = sizeof hardware_platform;
-          static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM };
-          if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0)
+           size_t s = sizeof hardware_platform;
+           static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM };
+           if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0)
 +#endif
-            element = hardware_platform;
-        }
+             element = hardware_platform;
+         }
  #endif