diff options
-rw-r--r-- | meta/classes/kernel.bbclass | 3 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto/noslang.patch | 20 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.0.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.2.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.4.bb | 4 |
5 files changed, 6 insertions, 29 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index f34e63263a..fdef1bea97 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass | |||
@@ -204,6 +204,9 @@ kernel_do_install() { | |||
204 | for entry in $bin_files; do | 204 | for entry in $bin_files; do |
205 | rm -f $kerneldir/$entry | 205 | rm -f $kerneldir/$entry |
206 | done | 206 | done |
207 | |||
208 | # Fix SLANG_INC for slang.h | ||
209 | sed -i 's#-I/usr/include/slang#-I=/usr/include/slang#g' $kerneldir/tools/perf/Makefile | ||
207 | } | 210 | } |
208 | 211 | ||
209 | sysroot_stage_all_append() { | 212 | sysroot_stage_all_append() { |
diff --git a/meta/recipes-kernel/linux/linux-yocto/noslang.patch b/meta/recipes-kernel/linux/linux-yocto/noslang.patch deleted file mode 100644 index 9cada34d11..0000000000 --- a/meta/recipes-kernel/linux/linux-yocto/noslang.patch +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | We (OE) install slang into /usr/include so we never need to look into | ||
2 | /usr/include/slang/. We never want to look into a hardcoded path like this | ||
3 | since it triggers host infection issues. For now, simply remove this | ||
4 | since it causes us problems. | ||
5 | |||
6 | Upstream-Status: Pending (would need rework) | ||
7 | |||
8 | Index: tools/perf/Makefile | ||
9 | =================================================================== | ||
10 | --- linux.orig/tools/perf/Makefile 2012-08-07 10:29:43.020149620 +0000 | ||
11 | +++ linux/tools/perf/Makefile 2012-08-07 10:30:08.128148098 +0000 | ||
12 | @@ -504,7 +504,7 @@ | ||
13 | BASIC_CFLAGS += -DNO_NEWT_SUPPORT | ||
14 | else | ||
15 | # Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h | ||
16 | - BASIC_CFLAGS += -I/usr/include/slang | ||
17 | + # BASIC_CFLAGS += -I/usr/include/slang | ||
18 | EXTLIBS += -lnewt -lslang | ||
19 | LIB_OBJS += $(OUTPUT)util/ui/setup.o | ||
20 | LIB_OBJS += $(OUTPUT)util/ui/browser.o | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb index 4d19664f15..d16cdf0dc2 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb | |||
@@ -19,13 +19,11 @@ SRCREV_machine_qemux86-64 ?= "fe23c7dd94eb94dd5887028683093615ac921086" | |||
19 | SRCREV_machine ?= "cef17a18d72eae749dc78de3c83772f52815d842" | 19 | SRCREV_machine ?= "cef17a18d72eae749dc78de3c83772f52815d842" |
20 | SRCREV_meta ?= "bf5ee4945ee6d748e6abe16356f2357f76b5e2f0" | 20 | SRCREV_meta ?= "bf5ee4945ee6d748e6abe16356f2357f76b5e2f0" |
21 | 21 | ||
22 | PR = "${INC_PR}.0" | 22 | PR = "${INC_PR}.1" |
23 | PV = "${LINUX_VERSION}+git${SRCPV}" | 23 | PV = "${LINUX_VERSION}+git${SRCPV}" |
24 | 24 | ||
25 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" | 25 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" |
26 | 26 | ||
27 | SRC_URI += "file://noslang.patch" | ||
28 | |||
29 | COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64" | 27 | COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64" |
30 | 28 | ||
31 | # Functionality flags | 29 | # Functionality flags |
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.2.bb b/meta/recipes-kernel/linux/linux-yocto_3.2.bb index c3fb2521aa..b17e479802 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.2.bb | |||
@@ -17,15 +17,13 @@ SRCREV_machine_qemux86-64 ?= "f3625121d459b8e38f7528c2f5d2feb6078d0de9" | |||
17 | SRCREV_machine ?= "7cc31a952f78b8f8e8469eed93c23e9675a8eeb5" | 17 | SRCREV_machine ?= "7cc31a952f78b8f8e8469eed93c23e9675a8eeb5" |
18 | SRCREV_meta ?= "486f7aec824b4127e91ef53228823e996b3696f0" | 18 | SRCREV_meta ?= "486f7aec824b4127e91ef53228823e996b3696f0" |
19 | 19 | ||
20 | PR = "${INC_PR}.0" | 20 | PR = "${INC_PR}.1" |
21 | PV = "${LINUX_VERSION}+git${SRCPV}" | 21 | PV = "${LINUX_VERSION}+git${SRCPV}" |
22 | 22 | ||
23 | KMETA = "meta" | 23 | KMETA = "meta" |
24 | 24 | ||
25 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.2;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" | 25 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.2;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" |
26 | 26 | ||
27 | SRC_URI += "file://noslang.patch" | ||
28 | |||
29 | COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64" | 27 | COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64" |
30 | 28 | ||
31 | # Functionality flags | 29 | # Functionality flags |
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb index 691d78968a..440deef57e 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb | |||
@@ -13,11 +13,9 @@ SRCREV_meta ?= "28bcd46af1d592dab39bd8a0891c872454fde8bc" | |||
13 | 13 | ||
14 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" | 14 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" |
15 | 15 | ||
16 | SRC_URI += "file://noslang.patch" | ||
17 | |||
18 | LINUX_VERSION ?= "3.4.7" | 16 | LINUX_VERSION ?= "3.4.7" |
19 | 17 | ||
20 | PR = "${INC_PR}.0" | 18 | PR = "${INC_PR}.1" |
21 | PV = "${LINUX_VERSION}+git${SRCPV}" | 19 | PV = "${LINUX_VERSION}+git${SRCPV}" |
22 | 20 | ||
23 | KMETA = "meta" | 21 | KMETA = "meta" |