diff mbox series

[1/1] package/libnfs: update the patches to be applied with fuzz 0

Message ID 20240702191319.2460210-1-dario.binacchi@amarulasolutions.com
State New
Headers
Series [1/1] package/libnfs: update the patches to be applied with fuzz 0 |

Commit Message

Dario Binacchi July 2, 2024, 7:13 p.m. UTC 
Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0") reduced the fuzz factor.

Due to this change, libnfs fails to build with output:

    Applying 0001-Fix-include-sys-time.h.patch using patch:
    patching file include/nfsc/libnfs.h
    Hunk #1 FAILED at 24.
    1 out of 1 hunk FAILED -- saving rejects to file include/nfsc/libnfs.h.rej

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

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 package/libnfs/0001-Fix-include-sys-time.h.patch | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

'Abel Vesa' via Amarula Linux July 2, 2024, 7:42 p.m. UTC | #1 
On 02/07/2024 21:13, 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, libnfs fails to build with output:
> 
>      Applying 0001-Fix-include-sys-time.h.patch using patch:
>      patching file include/nfsc/libnfs.h
>      Hunk #1 FAILED at 24.
>      1 out of 1 hunk FAILED -- saving rejects to file include/nfsc/libnfs.h.rej
> 
> This commit refreshes the package patch on the current package version.
> 
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

  Applied to master, thanks.

  Regards,
  Arnout

> ---
>   package/libnfs/0001-Fix-include-sys-time.h.patch | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/package/libnfs/0001-Fix-include-sys-time.h.patch b/package/libnfs/0001-Fix-include-sys-time.h.patch
> index c3779f13a262..03193d6d71a1 100644
> --- a/package/libnfs/0001-Fix-include-sys-time.h.patch
> +++ b/package/libnfs/0001-Fix-include-sys-time.h.patch
> @@ -16,6 +16,8 @@ Upstream: https://github.com/sahlberg/libnfs/issues/272
>   Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
>   [Fabrice: update for 5.0.2]
>   Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +[Dario: make the patch to be applied with fuzz factor 0]
> +Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>   ---
>    include/nfsc/libnfs.h | 5 -----
>    1 file changed, 5 deletions(-)
> @@ -24,8 +26,8 @@ diff --git a/include/nfsc/libnfs.h b/include/nfsc/libnfs.h
>   index 09dcf1c..b6db58c 100755
>   --- a/include/nfsc/libnfs.h
>   +++ b/include/nfsc/libnfs.h
> -@@ -24,12 +24,7 @@
> - #define _LIBNFS_H_
> +@@ -28,12 +28,7 @@
> + #endif
>    
>    #include <stdint.h>
>   -#if defined(__ANDROID__) || defined(AROS) || defined(__PPU__) \

To unsubscribe from this group and stop receiving emails from it, send an email to linux-amarula+unsubscribe@amarulasolutions.com.
diff mbox series

Patch

diff --git a/package/libnfs/0001-Fix-include-sys-time.h.patch b/package/libnfs/0001-Fix-include-sys-time.h.patch
index c3779f13a262..03193d6d71a1 100644
--- a/package/libnfs/0001-Fix-include-sys-time.h.patch
+++ b/package/libnfs/0001-Fix-include-sys-time.h.patch
@@ -16,6 +16,8 @@  Upstream: https://github.com/sahlberg/libnfs/issues/272
 Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
 [Fabrice: update for 5.0.2]
 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 ---
  include/nfsc/libnfs.h | 5 -----
  1 file changed, 5 deletions(-)
@@ -24,8 +26,8 @@  diff --git a/include/nfsc/libnfs.h b/include/nfsc/libnfs.h
 index 09dcf1c..b6db58c 100755
 --- a/include/nfsc/libnfs.h
 +++ b/include/nfsc/libnfs.h
-@@ -24,12 +24,7 @@
- #define _LIBNFS_H_
+@@ -28,12 +28,7 @@
+ #endif
  
  #include <stdint.h>
 -#if defined(__ANDROID__) || defined(AROS) || defined(__PPU__) \