From 9a1705ef805b0b5a8e8bf2986a521bf5f29e4556 Mon Sep 17 00:00:00 2001 From: Liang Li Date: Wed, 22 Aug 2012 16:02:33 +0800 Subject: kernel.bbclass: fix INC directory for SLANG In the kernel's tools/perf/Makefile CFLAGS was previously hard coded to contain "-I/usr/include/slang" to work with hosts that have "/usr/include/slang/slang.h" as well as hosts that have "/usr/include/slang.h". This path can cause compile warnings like: cc1: warning: '/usr/include/slang' doesn't exists. or cc1: warning: include location "/usr/include/slang" is unsafe for cross-compilation [-Wpoison-system-directories] Then in some cases warnings become errors if WERROR is enabled hence build errors. In coordination with a kernel fix, we can fix this error for all kernels by modifying the perf Makefile within the staged kernel source. (From OE-Core rev: 4e0daf05ed04e9fb4343032c6290a379f53b89f3) Signed-off-by: Liang Li Signed-off-by: Bruce Ashfield Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto_3.2.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'meta/recipes-kernel/linux/linux-yocto_3.2.bb') 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" SRCREV_machine ?= "7cc31a952f78b8f8e8469eed93c23e9675a8eeb5" SRCREV_meta ?= "486f7aec824b4127e91ef53228823e996b3696f0" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" PV = "${LINUX_VERSION}+git${SRCPV}" KMETA = "meta" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.2;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" -SRC_URI += "file://noslang.patch" - COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64" # Functionality flags -- cgit v1.2.3-54-g00ecf