summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch17
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers/connector-msg-size-fix.patch29
-rw-r--r--meta/recipes-kernel/linux/linux-yocto/tools-perf-no-scripting.patch52
3 files changed, 0 insertions, 98 deletions
diff --git a/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch b/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch
deleted file mode 100644
index 0268216230..0000000000
--- a/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1Upstream-Status: Not applicable
2
3Index: git/libkmod/libkmod-private.h
4===================================================================
5--- git.orig/libkmod/libkmod-private.h 2013-08-21 10:07:51.000000000 -0700
6+++ git/libkmod/libkmod-private.h 2013-08-21 14:34:04.558278849 -0700
7@@ -9,6 +9,10 @@
8 #include "macro.h"
9 #include "libkmod.h"
10
11+#ifndef O_CLOEXEC
12+# define O_CLOEXEC 0
13+#endif
14+
15 static _always_inline_ _printf_format_(2, 3) void
16 kmod_log_null(struct kmod_ctx *ctx, const char *format, ...) {}
17
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/connector-msg-size-fix.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/connector-msg-size-fix.patch
deleted file mode 100644
index 5d531d65e4..0000000000
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/connector-msg-size-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Currently default header is linux-libc-header, which leads the dismatch
4with wrs kernel.
5
6The different headers for same file cause trouble between kerenl module and
7user level binary. E.g. segfault in v86d due to different
8CONNECTOR_MAX_MSG_SIZE in connector.h from the one used by uvesafb.
9
10This fix is work around to sync with wrs kernel headers, and should be removed
11after switching to linux-libc-headers-wrs.
12
13[BUGID #279] fixed by this.
14
15Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
16
17Index: linux-2.6.34/include/linux/connector.h
18===================================================================
19--- linux-2.6.34.orig/include/linux/connector.h 2010-09-30 14:15:25.000000000 +0800
20+++ linux-2.6.34/include/linux/connector.h 2010-09-30 14:15:43.000000000 +0800
21@@ -48,7 +48,7 @@
22 /*
23 * Maximum connector's message size.
24 */
25-#define CONNECTOR_MAX_MSG_SIZE 16384
26+#define CONNECTOR_MAX_MSG_SIZE 65536
27
28 /*
29 * idx and val are unique identifiers which
diff --git a/meta/recipes-kernel/linux/linux-yocto/tools-perf-no-scripting.patch b/meta/recipes-kernel/linux/linux-yocto/tools-perf-no-scripting.patch
deleted file mode 100644
index d07335a5f7..0000000000
--- a/meta/recipes-kernel/linux/linux-yocto/tools-perf-no-scripting.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1
2Upstream-Status: Inappropriate [configuration]
3
4Index: tools/perf/Makefile
5===================================================================
6--- a/tools/perf/Makefile 2011-01-14 14:17:33.127008554 -0600
7+++ b/tools/perf/Makefile 2011-01-14 14:18:14.227008548 -0600
8@@ -588,42 +588,8 @@
9 endif
10 endif
11
12-ifdef NO_LIBPERL
13- BASIC_CFLAGS += -DNO_LIBPERL
14-else
15- PERL_EMBED_LDOPTS = $(shell perl -MExtUtils::Embed -e ldopts 2>/dev/null)
16- PERL_EMBED_LDFLAGS = $(call strip-libs,$(PERL_EMBED_LDOPTS))
17- PERL_EMBED_LIBADD = $(call grep-libs,$(PERL_EMBED_LDOPTS))
18- PERL_EMBED_CCOPTS = `perl -MExtUtils::Embed -e ccopts 2>/dev/null`
19- FLAGS_PERL_EMBED=$(PERL_EMBED_CCOPTS) $(PERL_EMBED_LDOPTS)
20-
21- ifneq ($(call try-cc,$(SOURCE_PERL_EMBED),$(FLAGS_PERL_EMBED)),y)
22- BASIC_CFLAGS += -DNO_LIBPERL
23- else
24- ALL_LDFLAGS += $(PERL_EMBED_LDFLAGS)
25- EXTLIBS += $(PERL_EMBED_LIBADD)
26- LIB_OBJS += $(OUTPUT)util/scripting-engines/trace-event-perl.o
27- LIB_OBJS += $(OUTPUT)scripts/perl/Perf-Trace-Util/Context.o
28- endif
29-endif
30-
31-ifdef NO_LIBPYTHON
32- BASIC_CFLAGS += -DNO_LIBPYTHON
33-else
34- PYTHON_EMBED_LDOPTS = $(shell python-config --ldflags 2>/dev/null)
35- PYTHON_EMBED_LDFLAGS = $(call strip-libs,$(PYTHON_EMBED_LDOPTS))
36- PYTHON_EMBED_LIBADD = $(call grep-libs,$(PYTHON_EMBED_LDOPTS))
37- PYTHON_EMBED_CCOPTS = `python-config --cflags 2>/dev/null`
38- FLAGS_PYTHON_EMBED=$(PYTHON_EMBED_CCOPTS) $(PYTHON_EMBED_LDOPTS)
39- ifneq ($(call try-cc,$(SOURCE_PYTHON_EMBED),$(FLAGS_PYTHON_EMBED)),y)
40- BASIC_CFLAGS += -DNO_LIBPYTHON
41- else
42- ALL_LDFLAGS += $(PYTHON_EMBED_LDFLAGS)
43- EXTLIBS += $(PYTHON_EMBED_LIBADD)
44- LIB_OBJS += $(OUTPUT)util/scripting-engines/trace-event-python.o
45- LIB_OBJS += $(OUTPUT)scripts/python/Perf-Trace-Util/Context.o
46- endif
47-endif
48+BASIC_CFLAGS += -DNO_LIBPERL
49+BASIC_CFLAGS += -DNO_LIBPYTHON
50
51 ifdef NO_DEMANGLE
52 BASIC_CFLAGS += -DNO_DEMANGLE