summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-11-15 16:45:42 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-07 06:34:51 -0800
commit3cc4408f3adb2a70da04425adb68ae1dca03d2a9 (patch)
tree24d538e1bf3e5127f814378494ecdc9c93823acb
parenta6ca00f2afe8859f44a3af613a1da9b6336c161e (diff)
downloadpoky-3cc4408f3adb2a70da04425adb68ae1dca03d2a9.tar.gz
sysstat: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: 4a0c9bb514ff3d6966f1da480cd48c076403f58d) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch29
1 files changed, 13 insertions, 16 deletions
diff --git a/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch b/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch
index c12652307c..5fc26fbc27 100644
--- a/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch
+++ b/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch
@@ -21,10 +21,10 @@ Upstream-Status: Pending
21 sa_common.c | 1 + 21 sa_common.c | 1 +
22 3 files changed, 3 insertions(+) 22 3 files changed, 3 insertions(+)
23 23
24diff --git a/common.c b/common.c 24Index: sysstat-11.5.7/common.c
25index a23155b..ad86446 100644 25===================================================================
26--- a/common.c 26--- sysstat-11.5.7.orig/common.c
27+++ b/common.c 27+++ sysstat-11.5.7/common.c
28@@ -20,6 +20,7 @@ 28@@ -20,6 +20,7 @@
29 */ 29 */
30 30
@@ -32,11 +32,11 @@ index a23155b..ad86446 100644
32+#include <limits.h> 32+#include <limits.h>
33 #include <string.h> 33 #include <string.h>
34 #include <stdlib.h> 34 #include <stdlib.h>
35 #include <time.h> 35 #include <stdarg.h>
36diff --git a/ioconf.c b/ioconf.c 36Index: sysstat-11.5.7/ioconf.c
37index 7d88c5d..6d67691 100644 37===================================================================
38--- a/ioconf.c 38--- sysstat-11.5.7.orig/ioconf.c
39+++ b/ioconf.c 39+++ sysstat-11.5.7/ioconf.c
40@@ -27,6 +27,7 @@ 40@@ -27,6 +27,7 @@
41 #include <errno.h> 41 #include <errno.h>
42 #include <dirent.h> 42 #include <dirent.h>
@@ -45,10 +45,10 @@ index 7d88c5d..6d67691 100644
45 45
46 #include "ioconf.h" 46 #include "ioconf.h"
47 #include "common.h" 47 #include "common.h"
48diff --git a/sa_common.c b/sa_common.c 48Index: sysstat-11.5.7/sa_common.c
49index b7351d9..c9e3299 100644 49===================================================================
50--- a/sa_common.c 50--- sysstat-11.5.7.orig/sa_common.c
51+++ b/sa_common.c 51+++ sysstat-11.5.7/sa_common.c
52@@ -20,6 +20,7 @@ 52@@ -20,6 +20,7 @@
53 */ 53 */
54 54
@@ -57,6 +57,3 @@ index b7351d9..c9e3299 100644
57 #include <string.h> 57 #include <string.h>
58 #include <stdlib.h> 58 #include <stdlib.h>
59 #include <time.h> 59 #include <time.h>
60--
612.5.2
62