diff options
| author | Huang Qiyu <huangqy.fnst@cn.fujitsu.com> | 2018-01-26 15:06:32 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-29 08:49:50 +0000 |
| commit | 9bd7375e114309e6736f0b22710c13bae2590e6c (patch) | |
| tree | fd173acc89d0cd4737259cac35bba95c60ccf9b0 /meta/recipes-kernel/blktrace/blktrace/ldflags.patch | |
| parent | e8830ad932d666dc01c8fef715e1b60b8f831529 (diff) | |
| download | poky-9bd7375e114309e6736f0b22710c13bae2590e6c.tar.gz | |
blktrace: 1.1.0+gitX -> 1.2.0+gitX
1.Upgrade blktrace form 1.1.0+gitX to 1.2.0+gitX
2.Delete 0001-include-sys-types.h-for-dev_t-definition.patch, since it is integrated upstream.
3.Modify ldflags.patch, since iowatcher/Makefile has been changed.
(From OE-Core rev: bd1326a1e778f1c774fe3efd93b888bf9ee9df3d)
Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/blktrace/blktrace/ldflags.patch')
| -rw-r--r-- | meta/recipes-kernel/blktrace/blktrace/ldflags.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/blktrace/blktrace/ldflags.patch b/meta/recipes-kernel/blktrace/blktrace/ldflags.patch index dea1aa2028..29eb0f2728 100644 --- a/meta/recipes-kernel/blktrace/blktrace/ldflags.patch +++ b/meta/recipes-kernel/blktrace/blktrace/ldflags.patch | |||
| @@ -90,7 +90,7 @@ Signed-off-by: Fahad Usman <fahad_usman@mentor.com> | |||
| 90 | +++ git/iowatcher/Makefile | 90 | +++ git/iowatcher/Makefile |
| 91 | @@ -1,5 +1,6 @@ | 91 | @@ -1,5 +1,6 @@ |
| 92 | C = gcc | 92 | C = gcc |
| 93 | CFLAGS = -Wall -O0 -g -W | 93 | CFLAGS = -Wall -O2 -g -W -Wunused-result |
| 94 | +LDFLAGS = | 94 | +LDFLAGS = |
| 95 | ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 | 95 | ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 |
| 96 | 96 | ||
| @@ -99,8 +99,8 @@ Signed-off-by: Fahad Usman <fahad_usman@mentor.com> | |||
| 99 | $(CC) -o $*.o -c $(ALL_CFLAGS) $< | 99 | $(CC) -o $*.o -c $(ALL_CFLAGS) $< |
| 100 | 100 | ||
| 101 | iowatcher: blkparse.o plot.o main.o tracers.o mpstat.o fio.o | 101 | iowatcher: blkparse.o plot.o main.o tracers.o mpstat.o fio.o |
| 102 | - $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm | 102 | - $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm -lrt |
| 103 | + $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm $(LDFLAGS) | 103 | + $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm $(LDFLAGS) -lrt |
| 104 | 104 | ||
| 105 | depend: | 105 | depend: |
| 106 | @$(CC) -MM $(ALL_CFLAGS) *.c 1> .depend | 106 | @$(CC) -MM $(ALL_CFLAGS) *.c 1> .depend |