diff options
Diffstat (limited to 'meta/recipes-kernel')
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 @@ -From 6b5bbdfaac7f216fe8a02c4cf29e5eb2aee5a409 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 15 Sep 2015 00:01:00 +0000 -Subject: [PATCH] include sys/types.h for dev_t definition - -Avoids the build failures when sys/types.h does not get included -indirectly through other headers. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - blktrace.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/blktrace.h b/blktrace.h -index 380aec7..944fc08 100644 ---- a/blktrace.h -+++ b/blktrace.h -@@ -5,6 +5,7 @@ - #include <limits.h> - #include <byteswap.h> - #include <endian.h> -+#include <sys/types.h> - - #include "blktrace_api.h" - #include "rbtree.h" --- -2.5.2 - 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> +++ git/iowatcher/Makefile @@ -1,5 +1,6 @@ C = gcc - CFLAGS = -Wall -O0 -g -W + CFLAGS = -Wall -O2 -g -W -Wunused-result +LDFLAGS = ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 @@ -99,8 +99,8 @@ Signed-off-by: Fahad Usman <fahad_usman@mentor.com> $(CC) -o $*.o -c $(ALL_CFLAGS) $< iowatcher: blkparse.o plot.o main.o tracers.o mpstat.o fio.o -- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm -+ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm $(LDFLAGS) +- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm -lrt ++ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm $(LDFLAGS) -lrt depend: @$(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" DEPENDS = "libaio" -SRCREV = "43fc870ce04e963def45dfc0d1ed4ea21ef10d4b" +SRCREV = "cca113f2fe0759b91fd6a0e10fdcda2c28f18a7e" -PV = "1.1.0+git${SRCPV}" +PV = "1.2.0+git${SRCPV}" SRC_URI = "git://git.kernel.dk/blktrace.git \ file://ldflags.patch \ - file://0001-include-sys-types.h-for-dev_t-definition.patch \ " S = "${WORKDIR}/git" |