On 26.11.18 14:01, Antony Pavlov wrote:
On Mon, 26 Nov 2018 10:18:05 +0100
Oleksij Rempel <o.rempel@xxxxxxxxxxxxxx> wrote:
Hi!
I can't apply this patch.
Here is 'git am' log:
Applying: MIPS: port all mach* to multiimage
.git/rebase-apply/patch:1291: trailing whitespace.
pbl-dtb-$(CONFIG_BOARD_8DEVICES_LIMA) += qca4531-8devices-lima.dtb.o
.git/rebase-apply/patch:1292: trailing whitespace.
pbl-dtb-$(CONFIG_BOARD_BLACK_SWIFT) += black-swift.dtb.o
.git/rebase-apply/patch:1294: trailing whitespace.
pbl-dtb-$(CONFIG_BOARD_DPTECHNICS_DPT_MODULE) += ar9331-dptechnics-dpt-module.dtb.o
.git/rebase-apply/patch:1298: trailing whitespace.
pbl-dtb-$(CONFIG_BOARD_TPLINK_MR3020) += tplink-mr3020.dtb.o
.git/rebase-apply/patch:1299: trailing whitespace.
pbl-dtb-$(CONFIG_BOARD_TPLINK_WDR4300) += ar9344-tl-wdr4300-v1.7.dtb.o
error: patch failed: images/Makefile:53
error: images/Makefile: patch does not apply
Patch failed at 0001 MIPS: port all mach* to multiimage
hint: Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
I pushed it to my github,
https://github.com/olerem/barebox/tree/v2018.11.0/board/ath79-multiimage-20181126.1
My patches + missing Sachas patches. It compiles and works at least on
boards I was able to test.
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
