meta-raspberrypi: CM3 U-Boot patch does not apply on Hardknott branch


U-Boot patch for CM3 does not apply on hardknott.

Steps to reproduce the issue:

  1. Set Machine to CM3
  2. Build image depending on uboot

Describe the results you received: Error that hunk 2 patch does not apply.

ERROR: u-boot-1_2021.01-r0 do_patch: Command Error: 'quilt --quiltrc /bsp/tmp/work/raspberrypi_cm3-poky-linux-gnueabi/u-boot/1_2021.01-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0  Output:
stdout: Applying patch 0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch
patching file drivers/core/device.c
Hunk #1 succeeded at 456 (offset 81 lines).
Hunk #2 FAILED at 418.
1 out of 2 hunks FAILED -- rejects in file drivers/core/device.c
Patch 0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch does not apply (enforce with -f)

Describe the results you expected: Patch should apply and no error should be throwb.

Additional information you deem important (e.g. issue happens only occasionally): The error occurs for me trying to build an swupdate-image (meta-swupdate)

Additional details (revisions used, host distro, etc.): Host is a nspawn container based on Debian 10 (stable)

About this issue

  • Original URL
  • State: closed
  • Created 3 years ago
  • Comments: 22 (1 by maintainers)

Most upvoted comments

Ok, as it is not an issue with the patch I’ve opened a new issue #897