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

[Buildroot] [PATCH 1/1] package/redis: 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, redis fails to build with output:

    Applying 0002-largefile-conditional-define.patch using patch:
    patching file src/fmacros.h
    Hunk #1 FAILED at 42.
    1 out of 1 hunk FAILED -- saving rejects to file src/fmacros.h.rej

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

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 package/redis/0002-largefile-conditional-define.patch | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/package/redis/0002-largefile-conditional-define.patch b/package/redis/0002-largefile-conditional-define.patch
index 747e0552b379..685a30cc5b72 100644
--- a/package/redis/0002-largefile-conditional-define.patch
+++ b/package/redis/0002-largefile-conditional-define.patch
@@ -12,13 +12,15 @@ Avoids:
   <command-line>:0:0: note: this is the location of the previous definition
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 
 Index: redis-2.6.11/src/fmacros.h
 ===================================================================
 --- redis-2.6.11.orig/src/fmacros.h	2013-03-25 22:09:15.000000000 +0100
 +++ redis-2.6.11/src/fmacros.h	2013-03-25 22:09:40.000000000 +0100
-@@ -42,7 +42,12 @@
- #define _XOPEN_SOURCE
+@@ -55,8 +55,13 @@
+ #define _POSIX_C_SOURCE 199506L
  #endif
  
 +#ifndef _LARGEFILE_SOURCE
@@ -29,4 +31,5 @@ Index: redis-2.6.11/src/fmacros.h
  #define _FILE_OFFSET_BITS 64
 +#endif
  
- #endif
+ /* deprecate unsafe functions
+  *
-- 
2.43.0

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

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

[Titouan Christophe]

Hello Dario and all,

Thank you for fixing the Redis build !

On 7/07/24 14:41, Dario Binacchi wrote:
> Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum
> fuzz factor to 0") reduced the fuzz factor.
>
> Due to this change, redis fails to build with output:
>
>      Applying 0002-largefile-conditional-define.patch using patch:
>      patching file src/fmacros.h
>      Hunk #1 FAILED at 42.
>      1 out of 1 hunk FAILED -- saving rejects to file src/fmacros.h.rej
>
> This commit refreshes the package patch on the current package version.
>
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Tested-by: Titouan Christophe <titouanchristophe@gmail.com>
> ---
>   package/redis/0002-largefile-conditional-define.patch | 9 ++++++---
>   1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/package/redis/0002-largefile-conditional-define.patch b/package/redis/0002-largefile-conditional-define.patch
> index 747e0552b379..685a30cc5b72 100644
> --- a/package/redis/0002-largefile-conditional-define.patch
> +++ b/package/redis/0002-largefile-conditional-define.patch
> @@ -12,13 +12,15 @@ Avoids:
>     <command-line>:0:0: note: this is the location of the previous definition
>   
>   Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> +[Dario: make the patch to be applied with fuzz factor 0]
> +Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>   
>   Index: redis-2.6.11/src/fmacros.h
>   ===================================================================
>   --- redis-2.6.11.orig/src/fmacros.h	2013-03-25 22:09:15.000000000 +0100
>   +++ redis-2.6.11/src/fmacros.h	2013-03-25 22:09:40.000000000 +0100
> -@@ -42,7 +42,12 @@
> - #define _XOPEN_SOURCE
> +@@ -55,8 +55,13 @@
> + #define _POSIX_C_SOURCE 199506L
>    #endif
>    
>   +#ifndef _LARGEFILE_SOURCE
> @@ -29,4 +31,5 @@ Index: redis-2.6.11/src/fmacros.h
>    #define _FILE_OFFSET_BITS 64
>   +#endif
>    
> - #endif
> + /* deprecate unsafe functions
> +  *
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

[Thomas Petazzoni via buildroot]

On Sun,  7 Jul 2024 14:41:10 +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, redis fails to build with output:
> 
>     Applying 0002-largefile-conditional-define.patch using patch:
>     patching file src/fmacros.h
>     Hunk #1 FAILED at 42.
>     1 out of 1 hunk FAILED -- saving rejects to file src/fmacros.h.rej
> 
> This commit refreshes the package patch on the current package version.
> 
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> ---
>  package/redis/0002-largefile-conditional-define.patch | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 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