diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-10-03 20:44:15 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-10-04 19:05:27 +0200 |
| commit | 3cb668d5b5272ab5d763a11264c28aee3fa1849a (patch) | |
| tree | 41651d4d92abbf1fff918dfe80ebadcc939ab7b5 /board | |
| parent | d755067b7c497cc76cac57f88e79e34be592009e (diff) | |
configs: fix build of calao_usb_a9g20_lpw_defconfig
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 0eba4759fab9d093afacac77a0ac31f1f0b3cceb
("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>
Diffstat (limited to 'board')
| -rw-r--r-- | board/calao/usb-a9g20-lpw/patches/at91bootstrap/0001-usb-a9g20-lpw.patch (renamed from board/calao/usb-a9g20-lpw/at91bootstrap-1.16-usb-a9g20-lpw.patch) | 0 | ||||
| -rw-r--r-- | board/calao/usb-a9g20-lpw/patches/barebox/0001-usb-a9g20-lpw.patch (renamed from board/calao/usb-a9g20-lpw/barebox-2012.07.0-usb-a9g20-lpw.patch) | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/board/calao/usb-a9g20-lpw/at91bootstrap-1.16-usb-a9g20-lpw.patch b/board/calao/usb-a9g20-lpw/patches/at91bootstrap/0001-usb-a9g20-lpw.patch index 06a89edd6..06a89edd6 100644 --- a/board/calao/usb-a9g20-lpw/at91bootstrap-1.16-usb-a9g20-lpw.patch +++ b/board/calao/usb-a9g20-lpw/patches/at91bootstrap/0001-usb-a9g20-lpw.patch diff --git a/board/calao/usb-a9g20-lpw/barebox-2012.07.0-usb-a9g20-lpw.patch b/board/calao/usb-a9g20-lpw/patches/barebox/0001-usb-a9g20-lpw.patch index cea8bb8c0..cea8bb8c0 100644 --- a/board/calao/usb-a9g20-lpw/barebox-2012.07.0-usb-a9g20-lpw.patch +++ b/board/calao/usb-a9g20-lpw/patches/barebox/0001-usb-a9g20-lpw.patch |