From 0f8c8c844ba6e48ac5964461438230a7b8b6f7bd Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 17 Apr 2012 18:01:44 -0400 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 2 +- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 0caf6a67f0f..c995a2ef576 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 d1c2ee476c2..754ebe5fb2e 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}" -- cgit 1.2.3-korg