summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-kernel/linux/linux-yocto/tools-perf-no-scripting.patch49
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_git.bb5
2 files changed, 52 insertions, 2 deletions
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
new file mode 100644
index 0000000000..e0ad9997f7
--- /dev/null
+++ b/meta/recipes-kernel/linux/linux-yocto/tools-perf-no-scripting.patch
@@ -0,0 +1,49 @@
1Index: tools/perf/Makefile
2===================================================================
3--- a/tools/perf/Makefile 2011-01-14 14:17:33.127008554 -0600
4+++ b/tools/perf/Makefile 2011-01-14 14:18:14.227008548 -0600
5@@ -588,42 +588,8 @@
6 endif
7 endif
8
9-ifdef NO_LIBPERL
10- BASIC_CFLAGS += -DNO_LIBPERL
11-else
12- PERL_EMBED_LDOPTS = $(shell perl -MExtUtils::Embed -e ldopts 2>/dev/null)
13- PERL_EMBED_LDFLAGS = $(call strip-libs,$(PERL_EMBED_LDOPTS))
14- PERL_EMBED_LIBADD = $(call grep-libs,$(PERL_EMBED_LDOPTS))
15- PERL_EMBED_CCOPTS = `perl -MExtUtils::Embed -e ccopts 2>/dev/null`
16- FLAGS_PERL_EMBED=$(PERL_EMBED_CCOPTS) $(PERL_EMBED_LDOPTS)
17-
18- ifneq ($(call try-cc,$(SOURCE_PERL_EMBED),$(FLAGS_PERL_EMBED)),y)
19- BASIC_CFLAGS += -DNO_LIBPERL
20- else
21- ALL_LDFLAGS += $(PERL_EMBED_LDFLAGS)
22- EXTLIBS += $(PERL_EMBED_LIBADD)
23- LIB_OBJS += $(OUTPUT)util/scripting-engines/trace-event-perl.o
24- LIB_OBJS += $(OUTPUT)scripts/perl/Perf-Trace-Util/Context.o
25- endif
26-endif
27-
28-ifdef NO_LIBPYTHON
29- BASIC_CFLAGS += -DNO_LIBPYTHON
30-else
31- PYTHON_EMBED_LDOPTS = $(shell python-config --ldflags 2>/dev/null)
32- PYTHON_EMBED_LDFLAGS = $(call strip-libs,$(PYTHON_EMBED_LDOPTS))
33- PYTHON_EMBED_LIBADD = $(call grep-libs,$(PYTHON_EMBED_LDOPTS))
34- PYTHON_EMBED_CCOPTS = `python-config --cflags 2>/dev/null`
35- FLAGS_PYTHON_EMBED=$(PYTHON_EMBED_CCOPTS) $(PYTHON_EMBED_LDOPTS)
36- ifneq ($(call try-cc,$(SOURCE_PYTHON_EMBED),$(FLAGS_PYTHON_EMBED)),y)
37- BASIC_CFLAGS += -DNO_LIBPYTHON
38- else
39- ALL_LDFLAGS += $(PYTHON_EMBED_LDFLAGS)
40- EXTLIBS += $(PYTHON_EMBED_LIBADD)
41- LIB_OBJS += $(OUTPUT)util/scripting-engines/trace-event-python.o
42- LIB_OBJS += $(OUTPUT)scripts/python/Perf-Trace-Util/Context.o
43- endif
44-endif
45+BASIC_CFLAGS += -DNO_LIBPERL
46+BASIC_CFLAGS += -DNO_LIBPYTHON
47
48 ifdef NO_DEMANGLE
49 BASIC_CFLAGS += -DNO_DEMANGLE
diff --git a/meta/recipes-kernel/linux/linux-yocto_git.bb b/meta/recipes-kernel/linux/linux-yocto_git.bb
index 21023da54b..7833f65fa4 100644
--- a/meta/recipes-kernel/linux/linux-yocto_git.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_git.bb
@@ -13,12 +13,13 @@ KMACHINE_beagleboard = "yocto/standard/beagleboard"
13 13
14LINUX_VERSION ?= "2.6.37" 14LINUX_VERSION ?= "2.6.37"
15LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" 15LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
16PR = "r14" 16PR = "r15"
17PV = "${LINUX_VERSION}+git${SRCPV}" 17PV = "${LINUX_VERSION}+git${SRCPV}"
18SRCREV_FORMAT = "meta_machine" 18SRCREV_FORMAT = "meta_machine"
19 19
20SRC_URI = "git://git.pokylinux.org/linux-yocto-2.6.37;protocol=git;fullclone=1;branch=${KBRANCH};name=machine \ 20SRC_URI = "git://git.pokylinux.org/linux-yocto-2.6.37;protocol=git;fullclone=1;branch=${KBRANCH};name=machine \
21 git://git.pokylinux.org/linux-yocto-2.6.37;protocol=git;noclone=1;branch=meta;name=meta" 21 git://git.pokylinux.org/linux-yocto-2.6.37;protocol=git;noclone=1;branch=meta;name=meta \
22 file://tools-perf-no-scripting.patch"
22 23
23COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64|mpc8315e-rdb|routerstationpro)" 24COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64|mpc8315e-rdb|routerstationpro)"
24 25