From 660c90458e8b4114e4a8deb920e44263e03a1ec6 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 1 Oct 2014 00:43:31 -0400 Subject: kern-tools: fix overly greedy path relocations During patch processing a consolidated set of configs, patches and directives is created under the kernel source tree being modified. During that processing, absolutely paths are converted to relative. It has been found that if directories are sufficiently similar, like so: /path/to/my-linux /path/to/my-linux-3.16 The processing will chop to much of some paths, resulting in invalid relative directories (like -3.16 in the above example). Importing the following two kern tools fixes for the issue: 23345b8846fe kgit: retain trailing / in directory processing a8cf93a3bc94 kgit-s2q: move subject and diffstat mismatch to 'fuzzy' matching [YOCTO: #6753] Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bca1decf7b..ce872354f2 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 DEPENDS = "git-native" -SRCREV = "83f468ab8ef748a8880cba7d26779c35abfcc0bf" +SRCREV = "23345b8846fe4bd167efdf1bd8a1224b2ba9a5ff" PR = "r12" PV = "0.2+git${SRCPV}" -- cgit v1.2.3