Changeset 229ed25 for patches/coreutils-8.22-uname-1.patch

Timestamp:

Jan 4, 2014, 12:03:38 AM (12 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f90d077

Parents:

ec008670 (diff), e57ce38 (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' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:

• patches/coreutils-8.22-uname-1.patch (moved) (moved from patches/coreutils-8.12-uname-1.patch ) (4 diffs)

patches/coreutils-8.22-uname-1.patch

@@ -10 +10 @@
 Rediffed for 8.4 by Joe Ciccone
 Rediffed for 8.9 by Joe Ciccone
+Rediffed for 8.16 by Jonathan Norman - 2012-06-10
+Rediffed for 8.19 by William Harrington - 2012-08-27
+Renamed for 8.20 by William Harrington - 2012-11-01
+Rediffed for 8.21 by William Harrington 2013-05-31
+Renamed for 8.22 by William Harrington - 2013-12-14
 
---- coreutils-8.9.orig/src/uname.c      2010-01-01 08:06:47.000000000 -0500
-+++ coreutils-8.9/src/uname.c   2010-07-26 20:44:24.389842706 -0400
-@@ -50,6 +50,11 @@
+diff -Naur coreutils-8.21.orig/src/uname.c coreutils-8.21/src/uname.c
+--- coreutils-8.21.orig/src/uname.c     2013-01-31 00:46:24.000000000 +0000
++++ coreutils-8.21/src/uname.c  2013-05-31 13:41:32.683326834 +0000
+@@ -49,6 +49,11 @@
  # include <mach-o/arch.h>
  #endif
@@ -25 +31 @@
  #include "error.h"
  #include "quote.h"
-@@ -155,6 +160,117 @@
+@@ -153,6 +158,117 @@
    exit (status);
  }
@@ -143 +149 @@
     printed.  */
  
-@@ -302,10 +418,14 @@
+@@ -300,10 +416,14 @@
    if (toprint & PRINT_PROCESSOR)
      {
@@ -159 +165 @@
        }
  #endif
-@@ -358,9 +478,13 @@
+@@ -356,9 +476,13 @@
        if (element == unknown)
          {