diff mbox series

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

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

Commit Message

Dario Binacchi July 3, 2024, 7:24 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, memstat fails to build with output:

    Applying 0001-PATH_MAX.patch using patch:
    patching file memstat.c
    Hunk #1 FAILED at 19.
    1 out of 1 hunk FAILED -- saving rejects to file memstat.c.rej

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

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 package/memstat/0001-PATH_MAX.patch | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

'Abel Vesa' via Amarula Linux July 3, 2024, 8:22 p.m. UTC | #1 
Hello Dario,

Le 03/07/2024 à 21:24, Dario Binacchi a écrit :
> Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum
> fuzz factor to 0") reduced the fuzz factor.
> 
> Due to this change, memstat fails to build with output:
> 
>     Applying 0001-PATH_MAX.patch using patch:
>     patching file memstat.c
>     Hunk #1 FAILED at 19.
>     1 out of 1 hunk FAILED -- saving rejects to file memstat.c.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.

Best regards,
Romain


> ---
>  package/memstat/0001-PATH_MAX.patch | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/package/memstat/0001-PATH_MAX.patch b/package/memstat/0001-PATH_MAX.patch
> index 0c3617a61b52..14ca6a0078e2 100644
> --- a/package/memstat/0001-PATH_MAX.patch
> +++ b/package/memstat/0001-PATH_MAX.patch
> @@ -1,6 +1,8 @@
>  Add missing #include for PATH_MAX
>  
>  Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
> +[Dario: make the patch to be applied with fuzz factor 0]
> +Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>  
>  --- memstat-0.8.org/memstat.c	2009-06-08 14:38:05.000000000 +0200
>  +++ memstat-0.8/memstat.c	2014-09-12 03:55:43.096035374 +0200
> @@ -11,4 +13,4 @@ Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
>  +#include <limits.h>
>   
>   /* blacklist devices that just map physical memory */
> - char *blacklist[] = { "/dev/mem",
> + char *blacklist[] = {

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/memstat/0001-PATH_MAX.patch b/package/memstat/0001-PATH_MAX.patch
index 0c3617a61b52..14ca6a0078e2 100644
--- a/package/memstat/0001-PATH_MAX.patch
+++ b/package/memstat/0001-PATH_MAX.patch
@@ -1,6 +1,8 @@ 
 Add missing #include for PATH_MAX
 
 Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 
 --- memstat-0.8.org/memstat.c	2009-06-08 14:38:05.000000000 +0200
 +++ memstat-0.8/memstat.c	2014-09-12 03:55:43.096035374 +0200
@@ -11,4 +13,4 @@  Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
 +#include <limits.h>
  
  /* blacklist devices that just map physical memory */
- char *blacklist[] = { "/dev/mem",
+ char *blacklist[] = {