[Buildroot] [PATCH v2] support/scripts/apply-patches.sh: do not blindly remove *.orig files

Peter Korsgaard peter at korsgaard.com
Sat Oct 10 20:44:01 UTC 2020


>>>>> "Peter" == Peter Korsgaard <peter at korsgaard.com> writes:

 > 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>

Committed to 2020.02.x, 2020.05.x and 2020.08.x, thanks.

-- 
Bye, Peter Korsgaard


More information about the buildroot mailing list