8395 2015-09-25 01:26:29 +0000 bitbake linux-yocto failed with "do_patch" after applied a kern-tool patch 2016-02-17 02:58:49 +0000 1 1 7 Build System, Metadata & Runtime OE-Core Scripts and Tools unspecified x86 Multiple VERIFIED NOTABUG Medium normal 2.1 1 sdliyong sdliyong bogdanx.a.voiculescu bruce.ashfield ross.burton bogdanx.a.voiculescu --- --- Don't know oldest_to_newest 54654 0 2769 sdliyong 2015-09-25 01:26:29 +0000 Created attachment 2769 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 54655 1 sdliyong 2015-09-25 01:29:40 +0000 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 54659 2 bruce.ashfield 2015-09-25 04:11:11 +0000 (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. 55203 3 sdliyong 2015-10-13 01:02:42 +0000 I cannot reproduce this issue now. We can close it 56503 4 bogdanx.a.voiculescu 2015-11-17 10:14:01 +0000 verified as not a bug 2769 2015-09-25 01:26:29 +0000 2015-09-25 01:26:29 +0000 The failed patch file 0001-staging-iio-hmc5843-Set-iio-name-property-in-sysfs.patch application/octet-stream 1179 sdliyong RnJvbSA4ZDA5ZjQ4YWRmZDI4MjE1N2Y2YWZjOTRkMjUwMmI0NDE1NmNiMTJmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJlayBCZWxpc2tvIDxtYXJla0Bnb2xkZWxpY28uY29tPgpE YXRlOiBTYXQsIDI4IEZlYiAyMDE1IDIxOjU0OjQyICswMTAwClN1YmplY3Q6IFtQQVRDSF0gc3Rh Z2luZzogaWlvOiBobWM1ODQzOiBTZXQgaWlvIG5hbWUgcHJvcGVydHkgaW4gc3lzZnMKCldpdGhv dXQgdGhpcyBjaGFuZ2UgZmlsZSBuYW1lIGZvciBobWM1ODQzIGlzIGVtcHR5IGluCi9zeXMvYnVz L2lpby9kZXZpY2VzL2lpb1w6ZGV2aWNlKi9uYW1lCgpXaXRoIHRoaXMgY2hhbmdlIG5hbWUgaXMg cmVwb3J0ZWQgY29ycmVjdGx5OgpjYXQgL3N5cy9idXMvaWlvL2RldmljZXMvaWlvXDpkZXZpY2Uq L25hbWUKaG1jNTg0MwoKU2lnbmVkLW9mZi1ieTogTWFyZWsgQmVsaXNrbyA8bWFyZWtAZ29sZGVs aWNvLmNvbT4KU2lnbmVkLW9mZi1ieTogSm9uYXRoYW4gQ2FtZXJvbiA8amljMjNAa2VybmVsLm9y Zz4KLS0tCiBkcml2ZXJzL3N0YWdpbmcvaWlvL21hZ25ldG9tZXRlci9obWM1ODQzX2NvcmUuYyB8 IDEgKwogMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9zdGFnaW5nL2lpby9tYWduZXRvbWV0ZXIvaG1jNTg0M19jb3JlLmMgYi9kcml2ZXJzL3N0YWdp bmcvaWlvL21hZ25ldG9tZXRlci9obWM1ODQzX2NvcmUuYwppbmRleCBmZDE3MWQ4Li45MGNjMThi IDEwMDY0NAotLS0gYS9kcml2ZXJzL3N0YWdpbmcvaWlvL21hZ25ldG9tZXRlci9obWM1ODQzX2Nv cmUuYworKysgYi9kcml2ZXJzL3N0YWdpbmcvaWlvL21hZ25ldG9tZXRlci9obWM1ODQzX2NvcmUu YwpAQCAtNTkyLDYgKzU5Miw3IEBAIGludCBobWM1ODQzX2NvbW1vbl9wcm9iZShzdHJ1Y3QgZGV2 aWNlICpkZXYsIHN0cnVjdCByZWdtYXAgKnJlZ21hcCwKIAltdXRleF9pbml0KCZkYXRhLT5sb2Nr KTsKIAogCWluZGlvX2Rldi0+ZGV2LnBhcmVudCA9IGRldjsKKwlpbmRpb19kZXYtPm5hbWUgPSBk ZXYtPmRyaXZlci0+bmFtZTsKIAlpbmRpb19kZXYtPmluZm8gPSAmaG1jNTg0M19pbmZvOwogCWlu ZGlvX2Rldi0+bW9kZXMgPSBJTkRJT19ESVJFQ1RfTU9ERTsKIAlpbmRpb19kZXYtPmNoYW5uZWxz ID0gZGF0YS0+dmFyaWFudC0+Y2hhbm5lbHM7Ci0tIAoyLjEuMAoK