[oe-commits] Bruce Ashfield : linux-yocto: fix unapplied patch error message
git at git.openembedded.org
git at git.openembedded.org
Tue Sep 4 13:52:00 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: b2b2512cbc4196fa0f814be3677517dab30e5b52
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b2b2512cbc4196fa0f814be3677517dab30e5b52
Author: Bruce Ashfield <bruce.ashfield at windriver.com>
Date: Tue Sep 4 08:40:33 2012 -0400
linux-yocto: fix unapplied patch error message
When patches fail to apply, the status of all pending patches should
be exported to the logs and to the user. Currently, a missing export
of GUILT_BASE makes it look more like an internal error, than a 'normal'
patch failure:
| [ERROR] unable to complete push
| pending patches are:
| Patches directory doesn't exist, try guilt-init
With this variable exported, we have this:
| [INFO] validating against known patches (qemux86-standard-meta)
| error: patch failed: Makefile:2
| error: Makefile: patch does not apply
| To force apply this patch, use 'guilt push -f'
| [ERROR] unable to complete push
| pending patches are:
| links/files/0002-makefile-patch.patch
Signed-off-by: Bruce Ashfield <bruce.ashfield at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/kernel-yocto.bbclass | 3 ++-
.../kern-tools/kern-tools-native_git.bb | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 3dcc8b5..45918d6 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -97,7 +97,8 @@ do_patch() {
# executes and modifies the source tree as required
patchme ${KMACHINE}
if [ $? -ne 0 ]; then
- echo "ERROR. Could not apply updates for ${KMACHINE}"
+ echo "ERROR. Could not apply patches for ${KMACHINE}."
+ echo " Patch failures can be resolved in the devshell (bitbake -c devshell ${PN})"
exit 1
fi
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 e1fc0a3..b560059 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 guilt-native"
-SRCREV = "c82d67d0cf17bc3b499f19667690c56bd00d3ddc"
+SRCREV = "6e92eca3bd30d73222dfeaae6d2d1d9764a5a3f8"
PR = "r12"
PV = "0.1+git${SRCPV}"
More information about the Openembedded-commits
mailing list