summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-09 20:56:09 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-11 06:27:01 -0700
commit795934f307038c9edad171d6af814060490316c6 (patch)
treed35e29f15847220e027a87a7439dc1c37252cf75
parent631e06643bafd7151d5daaf362293c27c8f3fa97 (diff)
downloadpoky-795934f307038c9edad171d6af814060490316c6.tar.gz
blktrace: 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: 0666146a9f12c90e2b5f9fd3b03b21429fb9327c) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/blktrace/blktrace/ldflags.patch16
1 files changed, 12 insertions, 4 deletions
diff --git a/meta/recipes-kernel/blktrace/blktrace/ldflags.patch b/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
index 29eb0f2728..ab905cf0da 100644
--- a/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
+++ b/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
@@ -10,6 +10,8 @@ aed463414e2e2bf8ca44ba54ee5973e7ed599e57
10 10
11Signed-off-by: Fahad Usman <fahad_usman@mentor.com> 11Signed-off-by: Fahad Usman <fahad_usman@mentor.com>
12 12
13Index: git/Makefile
14===================================================================
13--- git.orig/Makefile 15--- git.orig/Makefile
14+++ git/Makefile 16+++ git/Makefile
15@@ -1,5 +1,6 @@ 17@@ -1,5 +1,6 @@
@@ -19,7 +21,7 @@ Signed-off-by: Fahad Usman <fahad_usman@mentor.com>
19 ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 21 ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
20 PROGS = blkparse blktrace verify_blkparse blkrawverify blkiomon 22 PROGS = blkparse blktrace verify_blkparse blkrawverify blkiomon
21 LIBS = -lpthread 23 LIBS = -lpthread
22@@ -23,19 +24,19 @@ btreplay/btreplay: 24@@ -26,19 +27,19 @@ btreplay/btreplay:
23 $(CC) -o $*.o -c $(ALL_CFLAGS) $< 25 $(CC) -o $*.o -c $(ALL_CFLAGS) $<
24 26
25 blkparse: blkparse.o blkparse_fmt.o rbtree.o act_mask.o 27 blkparse: blkparse.o blkparse_fmt.o rbtree.o act_mask.o
@@ -44,6 +46,8 @@ Signed-off-by: Fahad Usman <fahad_usman@mentor.com>
44 46
45 $(PROGS): | depend 47 $(PROGS): | depend
46 48
49Index: git/btreplay/Makefile
50===================================================================
47--- git.orig/btreplay/Makefile 51--- git.orig/btreplay/Makefile
48+++ git/btreplay/Makefile 52+++ git/btreplay/Makefile
49@@ -7,6 +7,7 @@ 53@@ -7,6 +7,7 @@
@@ -55,8 +59,8 @@ Signed-off-by: Fahad Usman <fahad_usman@mentor.com>
55 OCFLAGS = -UCOUNT_IOS -UDEBUG -DNDEBUG 59 OCFLAGS = -UCOUNT_IOS -UDEBUG -DNDEBUG
56 XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 60 XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
57@@ -32,10 +33,10 @@ clean: docsclean 61@@ -32,10 +33,10 @@ clean: docsclean
58 $(CC) $(CFLAGS) -c -o $*.o $< 62 $(CC) $(CFLAGS) -c -o $*.o $<
59 63
60 btrecord: btrecord.o 64 btrecord: btrecord.o
61- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) 65- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^)
62+ $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS) 66+ $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS)
@@ -67,6 +71,8 @@ Signed-off-by: Fahad Usman <fahad_usman@mentor.com>
67 71
68 depend: 72 depend:
69 @$(CC) -MM $(CFLAGS) *.c 1> .depend 73 @$(CC) -MM $(CFLAGS) *.c 1> .depend
74Index: git/btt/Makefile
75===================================================================
70--- git.orig/btt/Makefile 76--- git.orig/btt/Makefile
71+++ git/btt/Makefile 77+++ git/btt/Makefile
72@@ -7,6 +7,7 @@ 78@@ -7,6 +7,7 @@
@@ -86,10 +92,12 @@ Signed-off-by: Fahad Usman <fahad_usman@mentor.com>
86 92
87 ifneq ($(wildcard .depend),) 93 ifneq ($(wildcard .depend),)
88 include .depend 94 include .depend
95Index: git/iowatcher/Makefile
96===================================================================
89--- git.orig/iowatcher/Makefile 97--- git.orig/iowatcher/Makefile
90+++ git/iowatcher/Makefile 98+++ git/iowatcher/Makefile
91@@ -1,5 +1,6 @@ 99@@ -1,5 +1,6 @@
92 C = gcc 100 CC = gcc
93 CFLAGS = -Wall -O2 -g -W -Wunused-result 101 CFLAGS = -Wall -O2 -g -W -Wunused-result
94+LDFLAGS = 102+LDFLAGS =
95 ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 103 ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64