Patchwork [1/3] linux-yocto: .diff is a valid patch extension

login
register
mail settings
Submitter Bruce Ashfield
Date April 17, 2012, 10:01 p.m.
Message ID <f74ed24324007c2f7a644065eaa8a2d4a097dfe7.1334699045.git.bruce.ashfield@windriver.com>
Download mbox | patch
Permalink /patch/26091/
State Accepted
Commit 0ade3f26f40b67d7296725b1e956c46be9a86089
Headers show

Comments

Bruce Ashfield - April 17, 2012, 10:01 p.m.
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.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/classes/kernel-yocto.bbclass                  |    2 +-
 .../kern-tools/kern-tools-native_git.bb            |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 0caf6a6..c995a2e 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 d1c2ee4..754ebe5 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}"