summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-06-07 15:59:50 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-08 11:56:32 +0100
commit27c051f00697181a43be5d9d755642e6e1bfec64 (patch)
treed23508d9ca9cfb86d6bd06159be77bdcc054d01b
parent7f44713308fcb14a644932ae886ea6ccf88e88f3 (diff)
downloadpoky-27c051f00697181a43be5d9d755642e6e1bfec64.tar.gz
kern-tools: anchor KMACHINE test
Updating the kern-tools SRCREV to pick up the following fix: Out of tree feature descriptions (.scc files) take two forms: normal features and BSP descriptions. A normal feature is detected and added to the end of the current machine being processed. During tree processing, it's configuration and patches will be applied. A BSP description on the other hand must be matched based on three critera (which are in the .scc file via "define <foo>"): - machine - kernel type - architecture Since features that define machines are only explicitly added, they are removed from the list of features that should be automatically added. The criteria for removing them from the auto-add list is the definitions found in the .scc file. The existing check was simply for KMACHINE anywhere in the file. This meant that a conditional or even a comment containing that phrase would exclude a file. Properly anchoring the KMACHINE test to "^define.*KMACHINE" fixes the problem of overly agreesive exclusions. (From OE-Core rev: 75a973328d50ef3c007edb7a471ea77fb97911ea) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/kern-tools/kern-tools-native_git.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index becb0def0d..2329ab997a 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70c
4 4
5DEPENDS = "git-native guilt-native" 5DEPENDS = "git-native guilt-native"
6 6
7SRCREV = "0859d2f73cc6f6973835fa5713b5a98a43ed43ff" 7SRCREV = "4b1fef0a85db38bad6db7f14d44ea59713a64fdb"
8PR = "r12" 8PR = "r12"
9PV = "0.1+git${SRCPV}" 9PV = "0.1+git${SRCPV}"
10 10