summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-kernel/blktrace/blktrace/blktrace-makefile.patch55
-rw-r--r--meta/recipes-kernel/blktrace/blktrace/ldflags.patch89
-rw-r--r--meta/recipes-kernel/blktrace/blktrace_git.bb18
3 files changed, 97 insertions, 65 deletions
diff --git a/meta/recipes-kernel/blktrace/blktrace/blktrace-makefile.patch b/meta/recipes-kernel/blktrace/blktrace/blktrace-makefile.patch
deleted file mode 100644
index c0f5fb0b3e..0000000000
--- a/meta/recipes-kernel/blktrace/blktrace/blktrace-makefile.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: git/Makefile
4===================================================================
5--- git.orig/Makefile 2010-11-22 11:20:14.303472770 -0600
6+++ git/Makefile 2010-11-22 14:11:19.152635423 -0600
7@@ -1,5 +1,3 @@
8-CC = gcc
9-CFLAGS = -Wall -O2 -g -W
10 ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
11 PROGS = blkparse blktrace verify_blkparse blkrawverify blkiomon
12 LIBS = -lpthread
13@@ -11,13 +9,13 @@
14 all: $(ALL)
15
16 btt/btt:
17- $(MAKE) -C btt
18+ CC="${CC}" CFLAGS="${CFLAGS}" $(MAKE) -C btt CC="${CC}" CFLAGS="${CFLAGS}"
19
20 btreplay/btrecord:
21- $(MAKE) -C btreplay
22+ CC="${CC}" CFLAGS="${CFLAGS}" $(MAKE) -C btreplay CC="${CC}" CFLAGS="${CFLAGS}" btrecord
23
24 btreplay/btreplay:
25- $(MAKE) -C btreplay
26+ CC="${CC}" CFLAGS="${CFLAGS}" $(MAKE) -C btreplay CC="${CC}" CFLAGS="${CFLAGS}" btreplay
27
28 %.o: %.c
29 $(CC) -o $*.o -c $(ALL_CFLAGS) $<
30Index: git/btreplay/Makefile
31===================================================================
32--- git.orig/btreplay/Makefile 2010-11-22 11:21:12.972679035 -0600
33+++ git/btreplay/Makefile 2010-11-22 14:07:01.492839945 -0600
34@@ -5,8 +5,6 @@
35 # NDEBUG - Defined: no asserts, Undefined: asserts
36 #
37
38-CC = gcc
39-CFLAGS = -Wall -W -O2 -g
40 INCS = -I. -I.. -I../btt
41 OCFLAGS = -UCOUNT_IOS -UDEBUG -DNDEBUG
42 XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
43Index: git/btt/Makefile
44===================================================================
45--- git.orig/btt/Makefile 2010-11-22 11:21:01.833758370 -0600
46+++ git/btt/Makefile 2010-11-22 14:07:15.783258253 -0600
47@@ -5,8 +5,6 @@
48 # NDEBUG - Defined: no asserts, Undefined: asserts
49 #
50
51-CC = gcc
52-CFLAGS = -Wall -W -O2 -g
53 INCS = -I. -I..
54 XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
55 override CFLAGS += $(INCS) $(XCFLAGS)
diff --git a/meta/recipes-kernel/blktrace/blktrace/ldflags.patch b/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
new file mode 100644
index 0000000000..b9c7c20c2b
--- /dev/null
+++ b/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
@@ -0,0 +1,89 @@
1blktrace: obey LDFLAGS
2
3Upstream-Status: Pending
4
5Signed-off-by: Christopher Larson <chris_larson@mentor.com>
6
7the patch was imported from meta-mentor layer on yoctoproject git server
8http://git.yoctoproject.org/cgit/cgit.cgi/meta-mentor as of commit id
9aed463414e2e2bf8ca44ba54ee5973e7ed599e57
10
11Signed-off-by: Fahad Usman <fahad_usman@mentor.com>
12---
13 Makefile | 11 ++++++-----
14 btreplay/Makefile | 3 ++-
15 btt/Makefile | 3 ++-
16 3 files changed, 10 insertions(+), 7 deletions(-)
17
18--- git.orig/Makefile
19+++ git/Makefile
20@@ -1,5 +1,6 @@
21 CC = gcc
22 CFLAGS = -Wall -O2 -g -W
23+LDFLAGS =
24 ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
25 PROGS = blkparse blktrace verify_blkparse blkrawverify blkiomon
26 LIBS = -lpthread
27@@ -23,19 +24,19 @@ btreplay/btreplay:
28 $(CC) -o $*.o -c $(ALL_CFLAGS) $<
29
30 blkparse: blkparse.o blkparse_fmt.o rbtree.o act_mask.o
31- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
32+ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS)
33
34 blktrace: blktrace.o act_mask.o
35- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
36+ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) $(LDFLAGS)
37
38 verify_blkparse: verify_blkparse.o
39- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
40+ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS)
41
42 blkrawverify: blkrawverify.o
43- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
44+ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS)
45
46 blkiomon: blkiomon.o rbtree.o
47- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt
48+ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt $(LDFLAGS)
49
50 $(PROGS): | depend
51
52--- git.orig/btreplay/Makefile
53+++ git/btreplay/Makefile
54@@ -7,6 +7,7 @@
55
56 CC = gcc
57 CFLAGS = -Wall -W -O2 -g
58+LDFLAGS =
59 INCS = -I. -I.. -I../btt
60 OCFLAGS = -UCOUNT_IOS -UDEBUG -DNDEBUG
61 XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
62@@ -35,7 +36,7 @@ btrecord: btrecord.o
63 $(CC) $(CFLAGS) -o $@ $(filter %.o,$^)
64
65 btreplay: btreplay.o
66- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
67+ $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) $(LDFLAGS)
68
69 depend:
70 @$(CC) -MM $(CFLAGS) *.c 1> .depend
71--- git.orig/btt/Makefile
72+++ git/btt/Makefile
73@@ -7,6 +7,7 @@
74
75 CC = gcc
76 CFLAGS = -Wall -W -O2 -g
77+LDFLAGS =
78 INCS = -I. -I..
79 XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
80 override CFLAGS += $(INCS) $(XCFLAGS)
81@@ -38,7 +39,7 @@ clean: docsclean
82 $(CC) $(CFLAGS) -c -o $*.o $<
83
84 btt: $(OBJS)
85- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
86+ $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) $(LDFLAGS)
87
88 ifneq ($(wildcard .depend),)
89 include .depend
diff --git a/meta/recipes-kernel/blktrace/blktrace_git.bb b/meta/recipes-kernel/blktrace/blktrace_git.bb
index dbc07c5a97..80cb14c82e 100644
--- a/meta/recipes-kernel/blktrace/blktrace_git.bb
+++ b/meta/recipes-kernel/blktrace/blktrace_git.bb
@@ -6,19 +6,17 @@ DEPENDS = "libaio"
6 6
7SRCREV = "d6918c8832793b4205ed3bfede78c2f915c23385" 7SRCREV = "d6918c8832793b4205ed3bfede78c2f915c23385"
8 8
9PR = "r4" 9PR = "r5"
10PV = "1.0.5+git${SRCPV}" 10PV = "1.0.5+git${SRCPV}"
11 11
12SRC_URI = "git://git.kernel.dk/blktrace.git;protocol=git \ 12SRC_URI = "git://git.kernel.dk/blktrace.git;protocol=git \
13 file://blktrace-makefile.patch" 13 file://ldflags.patch"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
17do_compile() { 17EXTRA_OEMAKE = "\
18 oe_runmake ARCH="${ARCH}" CC="${CC}" LD="${LD}" prefix=${prefix} 18 'CC=${CC}' \
19} 19 'CFLAGS=${CFLAGS}' \
20 20 'LDFLAGS=${LDFLAGS}' \
21do_install() { 21"
22 oe_runmake ARCH="${ARCH}" CC="${CC}" LD="${LD}" \ 22PARALLEL_MAKE = ""
23 prefix=${prefix} DESTDIR=${D} install
24}