Bug 10674

*** Bug 10673 has been marked as a duplicate of this bug. ***

This issue still exist in 2.1.3 rc1 build.
Git rev: krogoth/fe7fb002216f7886d49942333ea6d8592339bb05

Patch sent to review:

https://lists.yoctoproject.org/pipermail/poky/2017-June/011022.html

(In reply to comment #2)
> This issue still exist in 2.1.3 rc1 build.
> Git rev: krogoth/fe7fb002216f7886d49942333ea6d8592339bb05

Yi, the only stable branch not containing poky path 720ae184031db33049f9be6326f9735224183492 was morty (2.2.x) and comment 3 provides the appropriate fix. krogoth, 2.1.x, the branch you are reporting the problem, does have the patch the line [1] so I believe something else is raising this issue. I will test again in both stable branches and let you know my findings.

http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/scripts/lib/bsp/kernel.py?h=krogoth#n336

I have tested on Krogoth  (2.1.x) and it is failing because the patch being introduced into the kernel does now apply:

| (1/1) yocto-testmod.patch
| [INFO]: check of .kernel-meta/patches/standard/arm-versatile-926ejs/links/files/yocto-testmod.patch with "git am" did not pass, trying reduced context.
| [INFO]: Context reduced git-am of .kernel-meta/patches/standard/arm-versatile-926ejs/links/files/yocto-testmod.patch with "git am" did not work, trying "apply".
| error: patch failed: drivers/misc/Kconfig:392
| error: drivers/misc/Kconfig: patch does not apply
| Context reduced to (1/1) to apply fragment at 39
| [ERROR]: Application of .kernel-meta/patches/standard/arm-versatile-926ejs/links/files/yocto-testmod.patch failed.
|          Patch needs to be refreshed. Sample resolution script:
|              .git/rebase-apply/resolve_rejects
| ERROR. could not update git tree
| WARNING: /home/lsandov1/poky-testing/poky-linux-yocto-yocto-kernel/build-krogoth/tmp/work/myqemuarm-poky-linux-gnueabi/linux-yocto/4.4.26+gitAUTOINC+c3f8900923_dbf351c65c-r0.4/temp/run.do_patch.35153:1 exit 1 from 'patchme myqemuarm'
| ERROR: Function failed: do_patch (log file is located at /home/lsandov1/poky-testing/poky-linux-yocto-yocto-kernel/build-krogoth/tmp/work/myqemuarm-poky-linux-gnueabi/linux-yocto/4.4.26+gitAUTOINC+c3f8900923_dbf351c65c-r0.4/temp/log.do_patch.35153)
ERROR: Task 3 (/home/lsandov1/poky-testing/poky-linux-yocto-yocto-kernel/meta/recipes-kernel/linux/linux-yocto_4.4.bb, do_patch) failed with exit code '1'
NOTE: Tasks Summary: Attempted 360 tasks of which 322 didn't need to be rerun and 1 failed.
Waiting for 0 running tasks to finish:

Summary: 1 task failed:
  /home/lsandov1/poky-testing/poky-linux-yocto-yocto-kernel/meta/recipes-kernel/linux/linux-yocto_4.4.bb, do_patch
Summary: There was 1 ERROR message shown, returning a non-zero exit code.
lsandov1@yctb05:~/poky-testing/poky-linux-yocto-yocto-kernel/build-krogoth>


I will test it with a patch that can be merged all the time so I am able to reproduce the issue.


In the other, I test it on morty with patch on comment 3 applied and the error log is different but at the end, it is a patching error:

Initialising tasks: 100% |######################################################################################################################################################################################################| Time: 0:00:00
Checking sstate mirror object availability: 100% |##############################################################################################################################################################################| Time: 0:00:04
NOTE: Executing SetScene Tasks
NOTE: Executing RunQueue Tasks
ERROR: linux-yocto-4.8.18+gitAUTOINC+c84532b647_f25e3a184b-r0.4 do_kernel_version_sanity_check: Package Version (4.8.18+gitAUTOINC+c84532b647_f25e3a184b) does not match of kernel being built (4.8.24). Please update the PV variable to match the kernel source.
ERROR: linux-yocto-4.8.18+gitAUTOINC+c84532b647_f25e3a184b-r0.4 do_kernel_version_sanity_check: Function failed: do_kernel_version_sanity_check (log file is located at /home/lsandov1/poky-testing/poky-linux-yocto-yocto-kernel/build-morty/tmp/work/myqemuarm-poky-linux-gnueabi/linux-yocto/4.8.18+gitAUTOINC+c84532b647_f25e3a184b-r0.4/temp/log.do_kernel_version_sanity_check.596)
ERROR: Logfile of failure stored in: /home/lsandov1/poky-testing/poky-linux-yocto-yocto-kernel/build-morty/tmp/work/myqemuarm-poky-linux-gnueabi/linux-yocto/4.8.18+gitAUTOINC+c84532b647_f25e3a184b-r0.4/temp/log.do_kernel_version_sanity_check.596
ERROR: Task (/home/lsandov1/poky-testing/poky-linux-yocto-yocto-kernel/meta/recipes-kernel/linux/linux-yocto_4.8.bb:do_kernel_version_sanity_check) failed with exit code '1'
ERROR: linux-yocto-4.8.18+gitAUTOINC+c84532b647_f25e3a184b-r0.4 do_patch: Function failed: do_patch (log file is located at /home/lsandov1/poky-testing/poky-linux-yocto-yocto-kernel/build-morty/tmp/work/myqemuarm-poky-linux-gnueabi/linux-yocto/4.8.18+gitAUTOINC+c84532b647_f25e3a184b-r0.4/temp/log.do_patch.595)
ERROR: Logfile of failure stored in: /home/lsandov1/poky-testing/poky-linux-yocto-yocto-kernel/build-morty/tmp/work/myqemuarm-poky-linux-gnueabi/linux-yocto/4.8.18+gitAUTOINC+c84532b647_f25e3a184b-r0.4/temp/log.do_patch.595
Log data follows:
| DEBUG: Executing shell function do_patch
| (1/1) yocto-testmod.patch
| [INFO]: check of .kernel-meta//patches//./yocto-testmod.patch with "git am" did not pass, trying reduced context.
| [INFO]: Context reduced git-am of .kernel-meta//patches//./yocto-testmod.patch with "git am" did not work, trying "apply".
| error: patch failed: drivers/misc/Kconfig:392
| error: drivers/misc/Kconfig: patch does not apply
| Context reduced to (1/1) to apply fragment at 38
| [ERROR]: Application of .kernel-meta//patches//./yocto-testmod.patch failed.
|          Patch needs to be refreshed. Sample resolution script:
|              .git/rebase-apply/resolve_rejects
| WARNING: /home/lsandov1/poky-testing/poky-linux-yocto-yocto-kernel/build-morty/tmp/work/myqemuarm-poky-linux-gnueabi/linux-yocto/4.8.18+gitAUTOINC+c84532b647_f25e3a184b-r0.4/temp/run.do_patch.595:1 exit 1 from 'kgit-s2q --gen -v --patches .kernel-meta/'
| ERROR: Function failed: do_patch (log file is located at /home/lsandov1/poky-testing/poky-linux-yocto-yocto-kernel/build-morty/tmp/work/myqemuarm-poky-linux-gnueabi/linux-yocto/4.8.18+gitAUTOINC+c84532b647_f25e3a184b-r0.4/temp/log.do_patch.595)
ERROR: Task (/home/lsandov1/poky-testing/poky-linux-yocto-yocto-kernel/meta/recipes-kernel/linux/linux-yocto_4.8.bb:do_patch) failed with exit code '1'
NOTE: Tasks Summary: Attempted 384 tasks of which 334 didn't need to be rerun and 2 failed.

Summary: 2 tasks failed:
  /home/lsandov1/poky-testing/poky-linux-yocto-yocto-kernel/meta/recipes-kernel/linux/linux-yocto_4.8.bb:do_kernel_version_sanity_check
  /home/lsandov1/poky-testing/poky-linux-yocto-yocto-kernel/meta/recipes-kernel/linux/linux-yocto_4.8.bb:do_patch
Summary: There were 3 ERROR messages shown, returning a non-zero exit code.


Will work on both issues.

Created attachment 3817 [details]
Char driver that can be used as  a (safe) patch example

Yi,

can you retest it with the patch I included? That is a driver that gets patched in its own directory (drivers/char/dummy) so avoiding any patching issues. With it, I did not observe what you reported.

I tested on morty and krogoth branches, both giving the same results.

(In reply to comment #7)
> Yi,
> 
> can you retest it with the patch I included? That is a driver that gets
> patched in its own directory (drivers/char/dummy) so avoiding any patching
> issues. With it, I did not observe what you reported.
> 
> I tested on morty and krogoth branches, both giving the same results.

Hi Leonardo,

Currently I only did a rough test with your patch on krogoth branch due to time limitation. bitbake linux-yocto worked fine with this patch. Next I will try to build an image to see if this kernel module works on the runtime system. I will give you the final result tomorrow.

Hi Leonardo,

Although there is no error for patching, the dummy driver isn't built even if I set CONFIG_YOCTO_DUMMY=y.

In lod.do_patch:
###############################
   mark <-- qemu-ppc32-standard.scc
      branch ===> standard/qemuppc/myqemuppc
   mark --> myqemuppc.scc
   mark --> myqemuppc-user-patches.scc
         patch yocto-testmod.patch (.kernel-meta/patches/standard/qemuppc/myqemuppc/series)
   mark <-- myqemuppc-user-patches.scc
   mark <-- myqemuppc.scc
   mark <-- myqemuppc-standard.scc
(1/1) yocto-testmod.patch
[INFO]: check of .kernel-meta/patches/standard/qemuppc/myqemuppc/links/files/yocto-testmod.patch with "git am" did not pass, trying reduced context.
[INFO]: Context reduced git-am of .kernel-meta/patches/standard/qemuppc/myqemuppc/links/files/yocto-testmod.patch with "git am" did not work, trying "apply".
/buildarea/jenkins-yocto/workspace/Yocto2.1-yocto-bsp_create_qemu_bsp/build_1/tmp/work-shared/myqemuppc/kernel-source/.git/rebase-apply/patch:11: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
   mark --> patch_marker.scc
   mark <-- patch_marker.scc
#########################################

But there is no any message for building this driver in log.do_compile

I attached the log.do_patch and log.do_compile

Created attachment 3825 [details]
log.do_patch

Created attachment 3826 [details]
log.do_compile

Questions answered

(In reply to comment #9)
> Hi Leonardo,

Hi Yi

> 
> Although there is no error for patching, the dummy driver isn't built even
> if I set CONFIG_YOCTO_DUMMY=y.

ok, so the patching issue is gone which is the reported problem.

> 
> In lod.do_patch:
> ###############################
>    mark <-- qemu-ppc32-standard.scc
>       branch ===> standard/qemuppc/myqemuppc
>    mark --> myqemuppc.scc
>    mark --> myqemuppc-user-patches.scc
>          patch yocto-testmod.patch
> (.kernel-meta/patches/standard/qemuppc/myqemuppc/series)
>    mark <-- myqemuppc-user-patches.scc
>    mark <-- myqemuppc.scc
>    mark <-- myqemuppc-standard.scc
> (1/1) yocto-testmod.patch
> [INFO]: check of
> .kernel-meta/patches/standard/qemuppc/myqemuppc/links/files/yocto-testmod.
> patch with "git am" did not pass, trying reduced context.

yocto-testmod is the patch that cannot be applied, so make sure you are using the one I provided.


> [INFO]: Context reduced git-am of
> .kernel-meta/patches/standard/qemuppc/myqemuppc/links/files/yocto-testmod.
> patch with "git am" did not work, trying "apply".
> /buildarea/jenkins-yocto/workspace/Yocto2.1-yocto-bsp_create_qemu_bsp/
> build_1/tmp/work-shared/myqemuppc/kernel-source/.git/rebase-apply/patch:11:
> new blank line at EOF.
> +
> warning: 1 line adds whitespace errors.
>    mark --> patch_marker.scc
>    mark <-- patch_marker.scc
> #########################################
> 
> But there is no any message for building this driver in log.do_compile
> 
> I attached the log.do_patch and log.do_compile

before looking into this problem (it could be another one, not related to the patch problem), please use the patch I provided, so the log would look like

   mark --> myqemuarm-user-patches.scc
         patch 0001-dummy-char-example-driver.patch (.kernel-meta/patches/standard/arm-versatile-926ejs/series)
   mark <-- myqemuarm-user-patches.scc

(In reply to comment #13)
> (In reply to comment #9)
> > Hi Leonardo,
> 
> Hi Yi
> 
> > 
> > Although there is no error for patching, the dummy driver isn't built even
> > if I set CONFIG_YOCTO_DUMMY=y.
> 
> ok, so the patching issue is gone which is the reported problem.
> 
> > 
> > In lod.do_patch:
> > ###############################
> >    mark <-- qemu-ppc32-standard.scc
> >       branch ===> standard/qemuppc/myqemuppc
> >    mark --> myqemuppc.scc
> >    mark --> myqemuppc-user-patches.scc
> >          patch yocto-testmod.patch
> > (.kernel-meta/patches/standard/qemuppc/myqemuppc/series)
> >    mark <-- myqemuppc-user-patches.scc
> >    mark <-- myqemuppc.scc
> >    mark <-- myqemuppc-standard.scc
> > (1/1) yocto-testmod.patch
> > [INFO]: check of
> > .kernel-meta/patches/standard/qemuppc/myqemuppc/links/files/yocto-testmod.
> > patch with "git am" did not pass, trying reduced context.
> 
> yocto-testmod is the patch that cannot be applied, so make sure you are
> using the one I provided.
> 
> 
> > [INFO]: Context reduced git-am of
> > .kernel-meta/patches/standard/qemuppc/myqemuppc/links/files/yocto-testmod.
> > patch with "git am" did not work, trying "apply".
> > /buildarea/jenkins-yocto/workspace/Yocto2.1-yocto-bsp_create_qemu_bsp/
> > build_1/tmp/work-shared/myqemuppc/kernel-source/.git/rebase-apply/patch:11:
> > new blank line at EOF.
> > +
> > warning: 1 line adds whitespace errors.
> >    mark --> patch_marker.scc
> >    mark <-- patch_marker.scc
> > #########################################
> > 
> > But there is no any message for building this driver in log.do_compile
> > 
> > I attached the log.do_patch and log.do_compile
> 
> before looking into this problem (it could be another one, not related to
> the patch problem), please use the patch I provided, so the log would look
> like
> 
>    mark --> myqemuarm-user-patches.scc
>          patch 0001-dummy-char-example-driver.patch
> (.kernel-meta/patches/standard/arm-versatile-926ejs/series)
>    mark <-- myqemuarm-user-patches.scc

Hi Leonardo,

I just renamed your patch to yocto-testmod.patch in order to run my original test script.

Yi

It appears the question has been answered.

Yi,

Can you test using meta layer [1]?

lets focus on the patch issue and if this is solve we can resolve this bug. Again, I am **NOT** seeing a problem when patching the kernel, to demonstrate it, use [1] then compile the kernel and open a devshell (of course, for the myqemuarm machine). For the compilation issue, raise another bug if necessary.


yctb05:~/poky-testing/poky-linux-yocto-yocto-kernel/build/tmp/work-shared/myqemuarm/kernel-source # git whatchanged | head -20
commit f0ddcc469ca743d19ca2011e5ecd8f9acad24342
Author: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Date:   Wed Jun 14 12:10:39 2017 -0700

    dummy: char example driver
    
    Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>

:100644 100644 a043107da2af... 9f81a26831ed... M        drivers/char/Kconfig
:000000 100644 000000000000... d0a63ec096a5... A        drivers/char/dummy/Kconfig
:000000 100644 000000000000... b320d255db44... A        drivers/char/dummy/Makefile
:000000 100644 000000000000... dd055a24496f... A        drivers/char/dummy/dummy.c

[1] https://github.com/lsandoval/meta-myqemuarm

Hi Leonardo,

I re-tested this case with 2.1.3 rc2 build. It works fine. There is no errors in  do_patch and do_compile. Thank you for the great help. I think we can close this bug.

Yi

Hi Leonardo, 

You could mark this bug as FIXED and I will mark it as VERIFIED.

Based on last comment from Yi, resolving it as fixed.

Verified with 2.1.3 rc2 build.
Git rev: krogoth/3cf0e093481ea260d4f41bed24336ea7f0102bde