Re: [Buildroot] [PATCH 1/1] package/sunxi-mali-utgard-driver: fix patch fuzz

[Thomas Petazzoni via buildroot <buildroot@buildroot.org>]

Hello,

+Arnout in Cc.

On Thu, 11 Jul 2024 09:05:25 +0200
Dario Binacchi <dario.binacchi@amarulasolutions.com> wrote:

> Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum
> fuzz factor to 0") reduced the fuzz factor.
> 
> Due to this change, sunxi-mali-utgard-driver fails to build with output:
> 
>     - r6p2:
> 
>         Applying 0018-mali-support-building-against-4.20.patch using series:
> 	patching file src/devicedrv/mali/linux/mali_kernel_linux.c
> 	Hunk #1 succeeded at 1125 (offset 193 lines).
> 	patching file src/devicedrv/mali/linux/mali_kernel_linux.h
> 	Hunk #1 FAILED at 16.
> 	Hunk #2 succeeded at 33 (offset 5 lines).
> 	1 out of 2 hunks FAILED -- saving rejects to file src/devicedrv/mali/linux/mali_kernel_linux.h.rej
> 
>     -r8p1:
> 
> 	Applying r6p2/0013-mali-support-building-against-4.15.patch using series:
> 	patching file src/devicedrv/mali/common/mali_control_timer.c
> 	patching file src/devicedrv/mali/common/mali_group.c
> 	Hunk #2 FAILED at 1768.
> 	1 out of 2 hunks FAILED -- saving rejects to file src/devicedrv/mali/common/mali_group.c.rej
> 	patching file src/devicedrv/mali/common/mali_osk_types.h
> 	patching file src/devicedrv/mali/linux/mali_memory_os_alloc.c
> 	Hunk #1 succeeded at 202 (offset -2 lines).
> 	patching file src/devicedrv/mali/linux/mali_osk_timers.c
> 
> 	Applying 0020-mali-support-building-against-4.17.patch using series:
> 	patching file src/devicedrv/mali/linux/mali_memory.c
> 	Hunk #1 FAILED at 57.
> 	1 out of 1 hunk FAILED -- saving rejects to file src/devicedrv/mali/linux/mali_memory.c.rej
> 
> This commit fixes the driver patches on the current package version.
> 
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> ---
>  ...he-patches-to-be-applied-with-fuzz-0.patch | 317 ++++++++++++++++++
>  1 file changed, 317 insertions(+)
>  create mode 100644 package/sunxi-mali-utgard-driver/0002-Update-the-patches-to-be-applied-with-fuzz-0.patch

Thanks for the patch, but I'm not entirely sure that's how we want to
fix this issue. Indeed, apply-patches is used in quite a lot of
packages to apply patches from Debian. Do we want to fix all those
patches, like you did for the sunxi-mali-utgard-driver? I'm not sure.

So in the end, I'm wondering if apply-patches.sh shouldn't take an
argument that specifies whether we accept fuzz or not. We shouldn't
accept fuzz for patches provided by Buildroot itself, but perhaps we
should keep accepting fuzz for patches that are not part of Buildroot.

Arnout, since you accepted the patch changing the apply-patches.sh
behavior, what is your opinion on this?

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot