diff mbox series

[1/1] package/freescale-imx/imx-kobs: update the patches to be applied with fuzz 0

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

Commit Message

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

Due to this change, imx-kobs fails to build with output:

    Applying 0001-Fix-musl-build.patch using patch:
    patching file src/mtd.c
    Hunk #1 FAILED at 31.
    1 out of 1 hunk FAILED -- saving rejects to file src/mtd.c.rej

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

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch | 3 +++
 1 file changed, 3 insertions(+)

Comments

'Abel Vesa' via Amarula Linux July 2, 2024, 7:56 a.m. UTC | #1 
On 02/07/2024 09:44, 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, imx-kobs fails to build with output:
> 
>      Applying 0001-Fix-musl-build.patch using patch:
>      patching file src/mtd.c
>      Hunk #1 FAILED at 31.
>      1 out of 1 hunk FAILED -- saving rejects to file src/mtd.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.

  Regards,
  Arnout

> ---
>   package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch | 3 +++
>   1 file changed, 3 insertions(+)
> 
> diff --git a/package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch b/package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch
> index ce123de9cc49..373b34ffce0b 100644
> --- a/package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch
> +++ b/package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch
> @@ -1,6 +1,8 @@
>   [PATCH] Fix musl build
>   
>   Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
> +[Dario: make the patch to be applied with fuzz factor 0]
> +Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>   ---
>    src/mtd.c | 1 +
>    src/mtd.h | 5 +++++
> @@ -17,6 +19,7 @@ index 1edc441..6d2264c 100644
>   +#include <stddef.h>
>    #include <sys/types.h>
>    #include <sys/ioctl.h>
> + #include <sys/utsname.h>
>    
>   diff --git a/src/mtd.h b/src/mtd.h
>   index bd21add..debfc84 100644

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/freescale-imx/imx-kobs/0001-Fix-musl-build.patch b/package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch
index ce123de9cc49..373b34ffce0b 100644
--- a/package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch
+++ b/package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch
@@ -1,6 +1,8 @@ 
 [PATCH] Fix musl build
 
 Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 ---
  src/mtd.c | 1 +
  src/mtd.h | 5 +++++
@@ -17,6 +19,7 @@  index 1edc441..6d2264c 100644
 +#include <stddef.h>
  #include <sys/types.h>
  #include <sys/ioctl.h>
+ #include <sys/utsname.h>
  
 diff --git a/src/mtd.h b/src/mtd.h
 index bd21add..debfc84 100644