summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-04-17 18:01:44 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-17 23:16:29 +0100
commit0f8c8c844ba6e48ac5964461438230a7b8b6f7bd (patch)
tree531ca540d4d78e95bd944ea5625b185e4c5e3f02
parentbb2929692ad0859c05a0f34da70b76bfe1d7bac0 (diff)
downloadpoky-0f8c8c844ba6e48ac5964461438230a7b8b6f7bd.tar.gz
poky-0f8c8c844ba6e48ac5964461438230a7b8b6f7bd.tar.bz2
poky-0f8c8c844ba6e48ac5964461438230a7b8b6f7bd.zip
linux-yocto: .diff is a valid patch extension
In fixing an existing patch migration bug, the list of valid extensions got out of sync from the core patch class. As a result, valid patches were not being applied to the tree. Updating the tools to migrate .diff files fixes the issue. Also in this fix is the removal of .patch in the find_sccs() routine, since it will never be returned by patch.bbclass when all non-patches are requested, it is simply confusing. (From OE-Core rev: 0ade3f26f40b67d7296725b1e956c46be9a86089) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel-yocto.bbclass2
-rw-r--r--meta/recipes-kernel/kern-tools/kern-tools-native_git.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 0caf6a67f0..c995a2ef57 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -20,7 +20,7 @@ def find_sccs(d):
sources_list=[]
for s in sources:
base, ext = os.path.splitext(os.path.basename(s))
- if ext and ext in ('.scc' '.cfg' '.patch'):
+ if ext and ext in ('.scc' '.cfg'):
sources_list.append(s)
elif base and base in 'defconfig':
sources_list.append(s)
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 d1c2ee476c..754ebe5fb2 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=e2bf4415f3d8
DEPENDS = "git-native guilt-native"
-SRCREV = "67bcedda582b2b191f26ec47dd1d4eac37f1305c"
+SRCREV = "2bbbaaa00cc70887d6d6f745b9425890d522d240"
PR = "r12"
PV = "0.1+git${SRCPV}"