mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-30 12:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

kern-tools: fix multi patch application without headers

Browse Source 
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>
This commit is contained in:
Bruce Ashfield
2013-09-23 03:55:44 +00:00
committed by Richard Purdie
parent c68888f762
commit f9c1ac34b6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
View File

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70c
DEPENDS = "git-native"
SRCREV = "9bbdd79086c164c82e4f982cbc3eb0b697ba651d"
SRCREV = "a42509b01ccfe5020a226b23d3a52c07b3fb2051"
PR = "r12"
PV = "0.2+git${SRCPV}"