| Summary: | do_patch fails in linux-yocto-rt_4.1 if MACHINE is set qemuarm | ||
|---|---|---|---|
| Product: | [Yocto Project Subprojects] Kernel | Reporter: | Kotaro Hashimoto <hasimoto.kotaro> |
| Component: | kernel-configuration | Assignee: | Bruce Ashfield <bruce.ashfield> |
| Status: | VERIFIED FIXED | QA Contact: | Bogdan Alexandru Voiculescu <bogdanx.a.voiculescu> |
| Severity: | normal | ||
| Priority: | Medium+ | CC: | alejandro.franco, bogdanx.a.voiculescu, yp.kernel.watcher, yp.watcher |
| Version: | unspecified | ||
| Target Milestone: | 1.9 M3 | ||
| Hardware: | x86 | ||
| OS: | x86_64 | ||
| Whiteboard: | |||
| OS type for building Yocto: | --- | Type of Regression: | --- |
| Verified: | Documentation change: | Don't know | |
|
Description
Kotaro Hashimoto
2015-08-07 05:43:37 UTC
I can confirm I reproduced this on Archlinux: 4.1.4-1-ARCH #1 SMP PREEMPT Mon Aug 3 21:30:37 UTC 2015 x86_64 GNU/Linux ------------------------ ERROR: Function failed: do_patch (log file is located at /bld/poky/build/tmp/work/qemuarm-poky-linux-gnueabi/linux-yocto-rt/4.1.2+gitAUTOINC+45393dd54f_fe1ee44348-r0/temp/log.do_patch.21584) ERROR: Logfile of failure stored in: /bld/poky/build/tmp/work/qemuarm-poky-linux-gnueabi/linux-yocto-rt/4.1.2+gitAUTOINC+45393dd54f_fe1ee44348-r0/temp/log.do_patch.21584 Log data follows: | DEBUG: Executing shell function do_patch | [INFO] validating against known patches (qemuarm-preempt-rt-meta) error: patch failed: arch/arm/mach-versatile/core.c:22 (\)(43 %)) | error: arch/arm/mach-versatile/core.c: patch does not apply | ERROR. could not update git tree | WARNING: /bld/poky/build/tmp/work/qemuarm-poky-linux-gnueabi/linux-yocto-rt/4.1.2+gitAUTOINC+45393dd54f_fe1ee44348-r0/temp/run.do_patch.21584:1 exit 1 from | patchme qemuarm | ERROR: Function failed: do_patch (log file is located at /bld/poky/build/tmp/work/qemuarm-poky-linux-gnueabi/linux-yocto-rt/4.1.2+gitAUTOINC+45393dd54f_fe1ee44348-r0/temp/log.do_patch.21584) ERROR: Task 44 (/bld/poky/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb, do_patch) failed with exit code '1' ------------------------ My mistake on this, I dropped branches in the 4.1 kernel on purpose and missed updating this BSP. Will fix shortly. As of 31th Aug, the do_patch() problem seems to have been resolved, but still having do_compile() error because the necessary patch below is not yet integrated. https://kernel.googlesource.com/pub/scm/linux/kernel/git/rt/linux-rt-devel/+/linux-4.1.y-rt-patches/patches/pid.h-include-atomic.h.patch The current recipe linux-yocto-rt_4.1.bb below points not the latest kernel "Merge tag 'v4.1.6' into standard/base 59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e". http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb?id=b0db6c2a7fb98287fa112d23399aad8831397209 Should be "Merge branch 'standard/base' into standard/preempt-rt c7415097d6cadffe1f6935204fd593d0d028c057" --- linux-yocto-rt_4.1.bb 2015-08-31 11:42:05.176124411 +0900 +++ linux-yocto-rt_4.1.bb 2015-08-31 11:42:31.664123883 +0900 @@ -2,7 +2,7 @@ require recipes-kernel/linux/linux-yocto.inc -SRCREV_machine ?= "59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e" +SRCREV_machine ?= "c7415097d6cadffe1f6935204fd593d0d028c057" SRCREV_meta ?= "429f9e2ff0649b8c9341345622545d874d5e303a" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ (In reply to comment #3) > As of 31th Aug, the do_patch() problem seems to have been resolved, but > still having do_compile() error because the necessary patch below is not yet > integrated. > > https://kernel.googlesource.com/pub/scm/linux/kernel/git/rt/linux-rt-devel/+/ > linux-4.1.y-rt-patches/patches/pid.h-include-atomic.h.patch > > > The current recipe linux-yocto-rt_4.1.bb below points not the latest kernel > "Merge tag 'v4.1.6' into standard/base > 59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e". > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-kernel/ > linux/linux-yocto-rt_4.1.bb?id=b0db6c2a7fb98287fa112d23399aad8831397209 > > Should be "Merge branch 'standard/base' into standard/preempt-rt > c7415097d6cadffe1f6935204fd593d0d028c057" > > > > --- linux-yocto-rt_4.1.bb 2015-08-31 11:42:05.176124411 +0900 > +++ linux-yocto-rt_4.1.bb 2015-08-31 11:42:31.664123883 +0900 > @@ -2,7 +2,7 @@ > > require recipes-kernel/linux/linux-yocto.inc > > -SRCREV_machine ?= "59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e" > +SRCREV_machine ?= "c7415097d6cadffe1f6935204fd593d0d028c057" > SRCREV_meta ?= "429f9e2ff0649b8c9341345622545d874d5e303a" > > SRC_URI = > "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH}; > name=machine \ That patch is integrated .. but my SRCREV updates are still pending. There's nothing to do here but wait. We've confirmed that the build error has been resolved. Poky: 28th Sep. master latest (5a51fb28dbdfcae8ceb503a5290532dd38aeb09f). set Verified per Kotaro Hashimoto comment |