mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

linux-yocto: fix unapplied patch error message

Browse Source 
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>
This commit is contained in:
Bruce Ashfield
2012-09-04 08:40:33 -04:00
committed by Richard Purdie
parent 1e196e66cd
commit 611f16a8d8
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/kernel-yocto.bbclass
+2 -1
View File
@@ -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