[Buildroot] [PATCH v2] support/scripts/apply-patches.sh: do not blindly remove *.orig files
Peter Korsgaard
peter at korsgaard.com
Wed Oct 7 06:02:45 UTC 2020
>>>>> "Yann" == Yann E MORIN <yann.morin.1998 at free.fr> writes:
> Peter, All,
> On 2020-10-06 22:46 +0200, Peter Korsgaard spake thusly:
>> apply-patches currently blindly removes *.orig / .*.orig files as GNU patch
>> by default writes these as backup files when patches only apply with fuzz.
>>
>> This is unfortunate as package sources may contain files ending in .orig as
>> well, breaking the build. Luckily GNU patch can be told to not write these
>> backup files using the --no-backup-if-mismatch option, so used that instead
>> of the .orig removal step.
>>
>> --no-backup-if-mismatch is supported since GNU patch 2.3.8 (1997-06-17) and
>> busybox patch if built with CONFIG_DESKTOP, but E.G. isn't supported by the
>> BSD patch, so add logic to dependencies.sh to error out if patch doesn't
>> support the flag.
>>
>> Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
> Applied to master, thanks.
> However, does that make sense to also use --no-backup-if-mismatch in our
> LIBTOOL_PATCH_HOOK ?
We don't do any cleanup after that, but yes - I indeed think it makes
sense to ensure patch don't write out ltmain.sh.orig files.
I'll send a patch.
--
Bye, Peter Korsgaard
More information about the buildroot
mailing list