Bug 4938

Summary: bitbake build failed when apply patch with cli "yocto-kernel patch add"
Product: [Build System, Metadata & Runtime] BitBake Reporter: Ning Zhang <ning.zhang>
Component: bitbakeAssignee: Richard Purdie <richard.purdie>
Status: VERIFIED FIXED QA Contact:
Severity: normal    
Priority: Undecided CC: bruce.ashfield, ke.zou, poky.bs.watcher, poky.watcher, razvanx.ionescu, yi.zhao
Version: 1.5   
Target Milestone: ---   
Hardware: x86   
OS: Multiple   
Whiteboard:
OS type for building Yocto: --- Type of Regression: ---
Verified: Documentation change: Don't know
Attachments:
Description Flags
detail error log none

Description Ning Zhang 2013-07-29 02:25:52 UTC 
Created attachment 1375 [details]
detail error log

poky: master:67864ca79da08df752487a3a4e1a975546da123d

Reference test case link: https://wiki.yoctoproject.org/wiki/Transcript:_Using_the_Yocto_BSP_tools_to_manage_kernel_patches_and_config_items

My steps:
1. Create a new bsp with cli "yocto-bsp create myqemux86 qemu"
2. modify bblayers.conf and local.conf, to added myqemux86 info
3. Download the patch from above website add input "yocto-kernel patch add myqemux86 ~/Yocto-testmod.patch" to add it.
4. added some configurations: "yocto-kernel config add myqemux86 CONFIG_MISC_DEVICES=y CONFIG_YOCTO_TESTMOD=y CONFIG_FTRACE_SYSCALLS=y CONFIG_SCHED_TRACER=y CONFIG_IRQSOFF_TRACER=y CONFIG_PREEMPT_TRACER=y"
5. bitbake core-image-sato.


I got below error:

ERROR: Function failed: do_patch (log file is located at /home/yocto/20130726/tmp/work/myqemux86-poky-linux/linux-yocto/3.8.13+gitAUTOINC+8ef9136539_f20047520a-r4.2.8/temp/log.do_patch.7145)
ERROR: Logfile of failure stored in: /home/yocto/20130726/tmp/work/myqemux86-poky-linux/linux-yocto/3.8.13+gitAUTOINC+8ef9136539_f20047520a-r4.2.8/temp/log.do_patch.7145
Log data follows:
| DEBUG: Executing shell function do_patch
| Branch meta-temp set up to track remote branch meta from origin.
| Unstaged changes after reset:
| M	.gitignore
| Deleted branch meta-temp (was 37fdb0c).
| [INFO] validating against known patches  (myqemux86-standard-meta)
Branch standard/common-pc/myqemux86 set up to track remote branch standard/common-pc/base from origin.
Uncommited changes detected. Refresh first.###########] (|)(102 %))
| [ERROR] unable to complete push
| pending patches are:
| links/files/Yocto-testmod.patch
| ERROR. could not update git tree
| ERROR. Could not apply patches for myqemux86.
|        Patch failures can be resolved in the devshell (bitbake -c devshell linux-yocto)
| ERROR: Function failed: do_patch (log file is located at /home/yocto/20130726/tmp/work/myqemux86-poky-linux/linux-yocto/3.8.13+gitAUTOINC+8ef9136539_f20047520a-r4.2.8/temp/log.do_patch.7145)
ERROR: Task 950 (/home/yocto/poky/meta/recipes-kernel/linux/linux-yocto_3.8.bb, do_patch) failed with exit code '1'
NOTE: Tasks Summary: Attempted 5316 tasks of which 5311 didn't need to be rerun and 1 failed.
No currently running tasks (5316 of 5354)
Comment 1 Bruce Ashfield 2013-07-29 12:56:31 UTC 
This is already fixed in via:



Author: Bruce Ashfield <bruce.ashfield@windriver.com>
Date:   Wed Jul 24 00:32:33 2013 -0400

    linux-yocto/3.8: revert .gitignore: do not ignore meta directory
    
    We made a change to allow meta branch/directory changes to be visible
    when working with the kernel tree. But without associated tool changes
    .gitignore is different between branches and hence causes errors when
    changing branches and processing the tree.
    
    The tools changes are not ready yet, so to avoid patching issues,
    temporarily reverting the change.
    
    (From OE-Core rev: f7e66abf279781d7c0cc1fb3c32c93c15a83c52c)
    
    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>
Comment 2 Razvan Ionescu 2013-10-04 08:15:24 UTC 
Verified with: dora:a02280f99f05b1c21de2a78de9222a2f62a0dabc (1.5 M5 RC6)

Patch applied successfully. Bitbake run w/o issues.