* [PATCH 0/1] linux-yocto: yocto-bsp-tools custom qemuppc fix
@ 2013-09-23 3:55 Bruce Ashfield
2013-09-23 3:55 ` [PATCH 1/1] kern-tools: fix multi patch application without headers Bruce Ashfield
0 siblings, 1 reply; 2+ messages in thread
From: Bruce Ashfield @ 2013-09-23 3:55 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
Richard/Saul,
Every relase, TomZ's BSP tools manage to uncover something up with kernel
management tweaks .. they are a great regression test.
This time is no exception. We found an issue with BSPs that inherit and branch
from qemuppc. The fix is in the tools, and is a minor tweak to the way that
a series of non "git am" patches are handled when importing them to the
tree.
I did regression tests via my other patching layers, and all shows fine with
this fix in place.
Cheers,
Bruce
The following changes since commit bf6b0d95db3863a2cfbccb154c0c7ad5b3bbf0b0:
glib-2.0: fix broken python script header on machines using buildtools (2013-09-22 12:23:35 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib zedd/kernel
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel
Bruce Ashfield (1):
kern-tools: fix multi patch application without headers
meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
1.7.10.4
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 1/1] kern-tools: fix multi patch application without headers
2013-09-23 3:55 [PATCH 0/1] linux-yocto: yocto-bsp-tools custom qemuppc fix Bruce Ashfield
@ 2013-09-23 3:55 ` Bruce Ashfield
0 siblings, 0 replies; 2+ messages in thread
From: Bruce Ashfield @ 2013-09-23 3:55 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
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.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
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 6cfb624..8c68ff3 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 = "9bbdd79086c164c82e4f982cbc3eb0b697ba651d"
+SRCREV = "a42509b01ccfe5020a226b23d3a52c07b3fb2051"
PR = "r12"
PV = "0.2+git${SRCPV}"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-09-23 3:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-23 3:55 [PATCH 0/1] linux-yocto: yocto-bsp-tools custom qemuppc fix Bruce Ashfield
2013-09-23 3:55 ` [PATCH 1/1] kern-tools: fix multi patch application without headers Bruce Ashfield
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox