mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-11-27 15:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

configs: fix build of calao_usb_a9g20_lpw_defconfig

Browse Source 
Both the Barebox and AT91Bootstrap patches for the Calao USB A9G20
board are located in the same directory, board/calao/usb-a9g20-lpw/,
with only a prefix making a difference between whether they apply to
Barebox or AT91Bootstrap.

Unfortunately, since commit 0eba4759fa
("packages: apply custom patches using *.patch instead of
<pkg>-*.patch"), the logic to apply custom patches in Barebox and
AT91Bootstrap has been changed from applying <package>-*.patch to
applying *.patch (in order to be consistent with what we do for all
packages in Buildroot).

However, this had the effect of trying to apply both the AT91Bootstrap
and Barebox patches on both packages, which obviously cannot work.

This commit fixes that by moving patches around, and switching to use
BR2_GLOBAL_PATCH_DIR.

Cc: Gregory Hermant <gregory.hermant@calao-systems.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Thomas Petazzoni 2015-10-03 20:44:15 +01:00 committed by Peter Korsgaard
parent d755067b7c
commit 3cb668d5b5
3 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
board/calao/usb-a9g20-lpw/at91bootstrap-1.16-usb-a9g20-lpw.patch → board/calao/usb-a9g20-lpw/patches/at91bootstrap/0001-usb-a9g20-lpw.patch
View File

0
board/calao/usb-a9g20-lpw/barebox-2012.07.0-usb-a9g20-lpw.patch → board/calao/usb-a9g20-lpw/patches/barebox/0001-usb-a9g20-lpw.patch
View File

3
configs/calao_usb_a9g20_lpw_defconfig
View File

@ -1,13 +1,12 @@
BR2_arm=y
BR2_arm926t=y
BR2_GLOBAL_PATCH_DIR="board/calao/usb-a9g20-lpw/patches/"
BR2_PACKAGE_HOST_SAM_BA=y
BR2_TARGET_ROOTFS_UBIFS=y
BR2_TARGET_AT91BOOTSTRAP=y
BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR="board/calao/usb-a9g20-lpw/"
BR2_TARGET_AT91BOOTSTRAP_BOARD="usb_a9g20_lpw"
BR2_TARGET_AT91BOOTSTRAP_NANDFLASH=y
BR2_TARGET_BAREBOX=y
BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR="board/calao/usb-a9g20-lpw/"
BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="usb_a9g20"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y