[Buildroot] [PATCH 1/1] package/dahdi-tools: update the patches to be applied with fuzz 0

[Buildroot] [PATCH 1/1] package/dahdi-tools: update the patches to be applied with fuzz 0

[Dario Binacchi]

Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0") reduced the fuzz factor.

Due to this change, dahdi-tools fails to build with output:

    Applying 0002-no-perl-manpages.patch using patch:
    patching file xpp/Makefile.am
    Hunk #2 FAILED at 58.
    Hunk #3 succeeded at 149 (offset 3 lines).
    1 out of 3 hunks FAILED -- saving rejects to file xpp/Makefile.am.rej

This commit refreshes the package patch on the current package version.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 package/dahdi-tools/0002-no-perl-manpages.patch | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/dahdi-tools/0002-no-perl-manpages.patch b/package/dahdi-tools/0002-no-perl-manpages.patch
index dae1b6c3c0f8..5f24c8199487 100644
--- a/package/dahdi-tools/0002-no-perl-manpages.patch
+++ b/package/dahdi-tools/0002-no-perl-manpages.patch
@@ -6,6 +6,8 @@ so the install step fails.
 Just disable them.
 
 Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 
 diff -durN dahdi-tools-2.11.0.orig/xpp/Makefile.am dahdi-tools-2.11.0/xpp/Makefile.am
 --- dahdi-tools-2.11.0.orig/xpp/Makefile.am	2015-12-22 21:19:12.000000000 +0100
@@ -25,8 +27,8 @@ diff -durN dahdi-tools-2.11.0.orig/xpp/Makefile.am dahdi-tools-2.11.0/xpp/Makefi
 -man_MANS		+= $(perl_mans)
  CLEANFILES		= $(perl_checks) $(perl_mans)
  
- if	PBX_USB
-@@ -147,8 +145,6 @@
+ dracutconfdir = @prefix@/lib/dracut/dracut.conf.d
+@@ -150,8 +148,6 @@
  		astribank_allow.8 \
  		astribank_is_starting.8
  
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/dahdi-tools: update the patches to be applied with fuzz 0

[Thomas Petazzoni via buildroot]

On Sat,  6 Jul 2024 15:57:31 +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, dahdi-tools fails to build with output:
> 
>     Applying 0002-no-perl-manpages.patch using patch:
>     patching file xpp/Makefile.am
>     Hunk #2 FAILED at 58.
>     Hunk #3 succeeded at 149 (offset 3 lines).
>     1 out of 3 hunks FAILED -- saving rejects to file xpp/Makefile.am.rej
> 
> This commit refreshes the package patch on the current package version.
> 
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> ---
>  package/dahdi-tools/0002-no-perl-manpages.patch | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)

Applied to master, thanks.

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