diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-09-23 03:55:44 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-24 17:24:12 +0100 |
commit | f9c1ac34b6229eb7703de4b61075905f5e2929af (patch) | |
tree | 09854ed5ef4f55668744bbcb05dbeb27cad9df38 /meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | |
parent | c68888f762f190c24a2fb97c9ff9ea55aadf6375 (diff) | |
download | poky-f9c1ac34b6229eb7703de4b61075905f5e2929af.tar.gz |
kern-tools: fix multi patch application without headers
Updating the kern-tools SRCREV to import the following change:
kgit-s2q: always update ORIG_HEAD after applying changes
In situations where git am fails to apply patches, and git apply is used,
we must update ORIG_HEAD as well as HEAD. This is required, since if the
next patch in the queue also fails git am application, it will reset to
ORIG_HEAD before using git apply. If we haven't updated ORIG_HEAD, we'll
end up warping back to the top of the branch each time.
This problem can only be seen in very specific situations, in particular if
a generated BSP branches from qemuppc, and has a series of non git "am able"
patches. We fail, since all of the qemuppc patches are not applied due to
the branch head constantly being reset.
(From OE-Core rev: 5126ac0aeb3154d31769dc20a46b6b1a6b2e3d9b)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/kern-tools/kern-tools-native_git.bb')
-rw-r--r-- | meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 |
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 6cfb624cc3..8c68ff3ac8 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 | ||
5 | DEPENDS = "git-native" | 5 | DEPENDS = "git-native" |
6 | 6 | ||
7 | SRCREV = "9bbdd79086c164c82e4f982cbc3eb0b697ba651d" | 7 | SRCREV = "a42509b01ccfe5020a226b23d3a52c07b3fb2051" |
8 | PR = "r12" | 8 | PR = "r12" |
9 | PV = "0.2+git${SRCPV}" | 9 | PV = "0.2+git${SRCPV}" |
10 | 10 | ||