vapier      15/08/05 07:45:29

  Modified:             003_all_coreutils-gentoo-uname.patch
  Log:
  switch arm processor key name to match the v3.8+ behavior -- this breaks 
parsing on older kernels, but it has been two years now, and adding uname() 
calls in the code would make things more bothersome.  we can see if anyone even 
notices before looking into the issue further.  reported via crbug.com/p/43365

Revision  Changes    Path
1.7                  
src/patchsets/coreutils/8.24/003_all_coreutils-gentoo-uname.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/coreutils/8.24/003_all_coreutils-gentoo-uname.patch?rev=1.7&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/coreutils/8.24/003_all_coreutils-gentoo-uname.patch?rev=1.7&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/coreutils/8.24/003_all_coreutils-gentoo-uname.patch?r1=1.6&r2=1.7

Index: 003_all_coreutils-gentoo-uname.patch
===================================================================
RCS file: 
/var/cvsroot/gentoo/src/patchsets/coreutils/8.24/003_all_coreutils-gentoo-uname.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- 003_all_coreutils-gentoo-uname.patch        5 Aug 2015 07:35:34 -0000       
1.6
+++ 003_all_coreutils-gentoo-uname.patch        5 Aug 2015 07:45:29 -0000       
1.7
@@ -24,7 +24,7 @@
  #include "system.h"
  #include "error.h"
  #include "quote.h"
-@@ -138,6 +144,118 @@
+@@ -138,6 +144,119 @@
    exit (status);
  }
  
@@ -73,7 +73,8 @@
 +              #if defined (__alpha__)
 +                      "cpu model", "system type"
 +              #elif defined (__arm__)
-+                      "Processor", "Hardware"
++                      /* linux-3.8+ uses "model name", but older uses 
"Processor".  */
++                      "model name", "Hardware"
 +              #elif defined (__avr32__)
 +                      "processor", "cpu family"
 +              #elif defined (__bfin__)
@@ -143,7 +144,7 @@
  /* Print ELEMENT, preceded by a space if something has already been
     printed.  */
  
-@@ -250,10 +368,14 @@ main (int argc, char **argv)
+@@ -250,10 +369,14 @@ main (int argc, char **argv)
    if (toprint & PRINT_PROCESSOR)
      {
        char const *element = unknown;
@@ -159,7 +160,7 @@
            element = processor;
        }
  #endif
-@@ -306,9 +428,13 @@ main (int argc, char **argv)
+@@ -306,9 +429,13 @@ main (int argc, char **argv)
        if (element == unknown)
          {
            static char hardware_platform[257];




Reply via email to