Created attachment 2769 [details] The failed patch file After applied the below patch, bitbake cannot apply these patches in my app layer. For example, there is a kernel patch in meta-app/recipes-kernel/linux-yocto/linux-yocto, I add the file in linux-yocto_%.bbappend file. bitbake yocto-linux will fail with "do patch error". If I revert the patch, the build is okay. commit a03c100e813b1b5041bfc17c97f5bd4e72b795ad Author: Bruce Ashfield <bruce.ashfield@windriver.com> Date: Mon Aug 31 15:55:33 2015 -0400 patching: only validate user supplied patches by default Previously the patching tools would consider both system and user supplied patches in the same manner .. they are simply a series of patches to be applied to a branch, and that the scripts should determine where in the series to start (based on what is already on the branch). This detection was causing a few problems: - time consuming - starting in the middle of a series when intermediate patches were merged to a branch. To solve both the performance and start detection, we instead simply note the transition from system (i.e. already defined features and series) and user/recipe supplied patches. When the transition is noted, the system will start pushing ALL patches without doing autoresume detection. Control in keeping the series up to date is passed to the user, and consistent behaviour/performance is achieved. Signed-off-by: Bruce Ashfield bruce.ashfield@windriver.com
Below is the error message: (1/3) 0001-staging-iio-hmc5843-Set-iio-name-property-in-sysfs.patch [INFO]: check of .kernel-meta/patches/standard/beaglebone/links/linux-yocto/0001-staging-iio-hmc5843-Set-iio-name-property-in-sysfs.patch with "git am" did not pass, trying reduced context. [INFO]: Context reduced git-am of .kernel-meta/patches/standard/beaglebone/links/linux-yocto/0001-staging-iio-hmc5843-Set-iio-name-property-in-sysfs.patch with "git am" did not work, trying "apply". error: patch failed: drivers/staging/iio/magnetometer/hmc5843_core.c:592 error: drivers/staging/iio/magnetometer/hmc5843_core.c: patch does not apply [ERROR]: Application of .kernel-meta/patches/standard/beaglebone/links/linux-yocto/0001-staging-iio-hmc5843-Set-iio-name-property-in-sysfs.patch failed. Patch needs to be refreshed. Sample resolution script: .git/rebase-apply/resolve_rejects ERROR. could not update git tree
(In reply to comment #1) > Below is the error message: > (1/3) 0001-staging-iio-hmc5843-Set-iio-name-property-in-sysfs.patch > [INFO]: check of > .kernel-meta/patches/standard/beaglebone/links/linux-yocto/0001-staging-iio- > hmc5843-Set-iio-name-property-in-sysfs.patch with "git am" did not pass, > trying reduced context. > [INFO]: Context reduced git-am of > .kernel-meta/patches/standard/beaglebone/links/linux-yocto/0001-staging-iio- > hmc5843-Set-iio-name-property-in-sysfs.patch with "git am" did not work, > trying "apply". > error: patch failed: drivers/staging/iio/magnetometer/hmc5843_core.c:592 > error: drivers/staging/iio/magnetometer/hmc5843_core.c: patch does not apply > [ERROR]: Application of > .kernel-meta/patches/standard/beaglebone/links/linux-yocto/0001-staging-iio- > hmc5843-Set-iio-name-property-in-sysfs.paotch failed. > Patch needs to be refreshed. Sample resolution script: > .git/rebase-apply/resolve_rejects > ERROR. could not update git tree I don't see a problem. That patch is being rejected by git .. it *won't* apply to the tree. If this was working previously, it was somehow either being skipped, or working by luck. The change that I made has nothing to do with the actual application of the patch, it simply shortcuts already integrated patches. What kernel tree are you trying to apply this to ? Without that information, I can't say more at the moment.
I cannot reproduce this issue now. We can close it
verified as not a bug