summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorHuang Qiyu <huangqy.fnst@cn.fujitsu.com>2018-01-26 15:06:32 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-29 08:49:50 +0000
commit9bd7375e114309e6736f0b22710c13bae2590e6c (patch)
treefd173acc89d0cd4737259cac35bba95c60ccf9b0 /meta/recipes-kernel
parente8830ad932d666dc01c8fef715e1b60b8f831529 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-kernel/blktrace/blktrace/0001-include-sys-types.h-for-dev_t-definition.patch30
-rw-r--r--meta/recipes-kernel/blktrace/blktrace/ldflags.patch6
-rw-r--r--meta/recipes-kernel/blktrace/blktrace_git.bb5
3 files changed, 5 insertions, 36 deletions
diff --git a/meta/recipes-kernel/blktrace/blktrace/0001-include-sys-types.h-for-dev_t-definition.patch b/meta/recipes-kernel/blktrace/blktrace/0001-include-sys-types.h-for-dev_t-definition.patch
deleted file mode 100644
index a4b7157b4f..0000000000
--- a/meta/recipes-kernel/blktrace/blktrace/0001-include-sys-types.h-for-dev_t-definition.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 6b5bbdfaac7f216fe8a02c4cf29e5eb2aee5a409 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 15 Sep 2015 00:01:00 +0000
4Subject: [PATCH] include sys/types.h for dev_t definition
5
6Avoids the build failures when sys/types.h does not get included
7indirectly through other headers.
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11Upstream-Status: Submitted
12
13 blktrace.h | 1 +
14 1 file changed, 1 insertion(+)
15
16diff --git a/blktrace.h b/blktrace.h
17index 380aec7..944fc08 100644
18--- a/blktrace.h
19+++ b/blktrace.h
20@@ -5,6 +5,7 @@
21 #include <limits.h>
22 #include <byteswap.h>
23 #include <endian.h>
24+#include <sys/types.h>
25
26 #include "blktrace_api.h"
27 #include "rbtree.h"
28--
292.5.2
30
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
diff --git a/meta/recipes-kernel/blktrace/blktrace_git.bb b/meta/recipes-kernel/blktrace/blktrace_git.bb
index 770575fdae..663de2ed53 100644
--- a/meta/recipes-kernel/blktrace/blktrace_git.bb
+++ b/meta/recipes-kernel/blktrace/blktrace_git.bb
@@ -5,13 +5,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
5 5
6DEPENDS = "libaio" 6DEPENDS = "libaio"
7 7
8SRCREV = "43fc870ce04e963def45dfc0d1ed4ea21ef10d4b" 8SRCREV = "cca113f2fe0759b91fd6a0e10fdcda2c28f18a7e"
9 9
10PV = "1.1.0+git${SRCPV}" 10PV = "1.2.0+git${SRCPV}"
11 11
12SRC_URI = "git://git.kernel.dk/blktrace.git \ 12SRC_URI = "git://git.kernel.dk/blktrace.git \
13 file://ldflags.patch \ 13 file://ldflags.patch \
14 file://0001-include-sys-types.h-for-dev_t-definition.patch \
15" 14"
16 15
17S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"