Problem with U-Boot patching - dunfell

I have encountered a problem during image build for Raspberry Pi 3 with using Mender meta layer in revision dunfell-v2020.10. The error output is following:

ERROR: u-boot-1_2020.01-r0 do_patch: Command Error: ‘quilt --quiltrc /home/user//build-mini/tmp/raspberrypi/raspberrypi3-glibc/work/raspberrypi3-oe-linux-gnueabi/u-boot/1_2020.01-r0/recipe-sysroot-native/etc/quiltrc push’ exited with 0 Output:
Applying patch 0001-configs-rpi-enable-mender-requirements.patch
patching file configs/rpi_0_w_defconfig
patching file configs/rpi_2_defconfig
patching file configs/rpi_3_32b_defconfig
Hunk #2 FAILED at 44.
1 out of 2 hunks FAILED – rejects in file configs/rpi_3_32b_defconfig
patching file configs/rpi_3_b_plus_defconfig
patching file configs/rpi_3_defconfig
patching file configs/rpi_4_32b_defconfig
patching file configs/rpi_4_defconfig
patching file configs/rpi_arm64_defconfig
patching file configs/rpi_defconfig
patching file env/Kconfig
patching file include/configs/rpi.h
Patch 0001-configs-rpi-enable-mender-requirements.patch does not apply (enforce with -f)

I found similar issue : Raspberry Pi 3 build fails on warrior, but it looks like the problem still remaining for the dunfell branch.

Does anyone was facing with that issue?

I am not able to reproduce this. Do you have any additional layers in your environment that might modify the rpi_3_32b_defconfig file in U-Boot ?

Sorry for late response. You’re right - I omitted one layer in my buildchain that was modifying U-Boot stuff also.

Thanks for hint.

1 Like