summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-09-04 12:40:33 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-04 13:46:17 (GMT)
commit611f16a8d84ffd4cb221d851000226411c59302f (patch)
tree176ea90ab4a5ceba1e3ca1d95879e021c3daf7c2
parent1e196e66cd6032f41c587993a782589f9aed0d71 (diff)
downloadpoky-611f16a8d84ffd4cb221d851000226411c59302f.tar.gz
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 (From OE-Core rev: b2b2512cbc4196fa0f814be3677517dab30e5b52) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel-yocto.bbclass3
-rw-r--r--meta/recipes-kernel/kern-tools/kern-tools-native_git.bb2
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() {
97 # executes and modifies the source tree as required 97 # executes and modifies the source tree as required
98 patchme ${KMACHINE} 98 patchme ${KMACHINE}
99 if [ $? -ne 0 ]; then 99 if [ $? -ne 0 ]; then
100 echo "ERROR. Could not apply updates for ${KMACHINE}" 100 echo "ERROR. Could not apply patches for ${KMACHINE}."
101 echo " Patch failures can be resolved in the devshell (bitbake -c devshell ${PN})"
101 exit 1 102 exit 1
102 fi 103 fi
103 104
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
4 4
5DEPENDS = "git-native guilt-native" 5DEPENDS = "git-native guilt-native"
6 6
7SRCREV = "c82d67d0cf17bc3b499f19667690c56bd00d3ddc" 7SRCREV = "6e92eca3bd30d73222dfeaae6d2d1d9764a5a3f8"
8PR = "r12" 8PR = "r12"
9PV = "0.1+git${SRCPV}" 9PV = "0.1+git${SRCPV}"
10 10