Re: [PATCH v5] u-boot: Deprecate BUILD_DEPENDS in favor of DEBIAN_BUILD_DEPENDS

[Jan Kiszka <jan.kiszka@siemens.com>]

On 05.11.20 15:29, Baurzhan Ismagulov wrote:
> On Wed, Nov 04, 2020 at 10:47:42AM +0100, Jan Kiszka wrote:
>> Aligns this recipe with deb_debianize. Provide a compat path along with
>> a warning to ease migration.
> 
> Hmm, git am 13.txt failed for me:
> 
> Applying: u-boot: Deprecate BUILD_DEPENDS in favor of DEBIAN_BUILD_DEPENDS
> error: corrupt patch at line 35
> Patch failed at 0001 u-boot: Deprecate BUILD_DEPENDS in favor of DEBIAN_BUILD_DEPENDS
> 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".
> 
> patch -p1 <13.txt failed as well:
> 
> patching file RECIPE-API-CHANGELOG.md
> patching file meta/recipes-bsp/u-boot/files/debian/control.tmpl
> patch: **** malformed patch at line 183: diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc
> 
> I've rebased v4 and applied to next as below. After a quick check, all changes
> seem to be in, but you might want to check as well.
> 

Thanks for fixing up! I rebased locally, and that went smoothly.

Apparently, I have local tooling issue with routing out my patches.

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux