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

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

    Applying 0001-add-haserl_lualib.inc.patch using patch:
    patching file src/haserl_lualib.inc
    patching file src/Makefile.in
    Hunk #1 succeeded at 86 (offset 54 lines).
    Hunk #2 FAILED at 514.
    1 out of 2 hunks FAILED -- saving rejects to file src/Makefile.in.rej

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

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 package/haserl/0001-add-haserl_lualib.inc.patch | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/package/haserl/0001-add-haserl_lualib.inc.patch b/package/haserl/0001-add-haserl_lualib.inc.patch
index f9e2a95e4236..31a11e9512ff 100644
--- a/package/haserl/0001-add-haserl_lualib.inc.patch
+++ b/package/haserl/0001-add-haserl_lualib.inc.patch
@@ -7,6 +7,8 @@ Re-add .inc file from 0.9.33 so we don't need host-lua.
 
 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 ---
  src/Makefile.in       |    3 -
  src/haserl_lualib.inc |   97 ++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -130,7 +132,7 @@ Index: haserl-0.9.29/src/Makefile.in
 ===================================================================
 --- haserl-0.9.29.orig/src/Makefile.in
 +++ haserl-0.9.29/src/Makefile.in
-@@ -32,7 +32,6 @@
+@@ -86,7 +86,6 @@
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -138,9 +140,9 @@ Index: haserl-0.9.29/src/Makefile.in
  @INCLUDE_LUASHELL_TRUE@@USE_LUA_TRUE@am__append_1 = h_lua.c h_lua.h
  @INCLUDE_LUACSHELL_TRUE@@USE_LUA_TRUE@am__append_2 = h_luac.c h_luac.h
  bin_PROGRAMS = haserl$(EXEEXT)
-@@ -515,7 +514,7 @@
- @USE_LUA_TRUE@	$(CC_FOR_BUILD) $(CFLAGS) $(LDFLAGS) $(lua2c_LDFLAGS) \
- @USE_LUA_TRUE@		-o $@ $^ $(LIBS)
+@@ -812,7 +811,7 @@
+ @USE_LUA_TRUE@	$(CC_FOR_BUILD) $(CFLAGS) $(LUA_CFLAGS) $(LDFLAGS) $(lua2c_LDFLAGS) \
+ @USE_LUA_TRUE@		-o $@ $^ $(LIBS) $(LUA_LIBS)
  
 -@USE_LUA_TRUE@haserl_lualib.inc : haserl_lualib.lua lua2c
 +@USE_LUA_TRUE@haserl_lualib.inc :
-- 
2.43.0

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

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

[Thomas Petazzoni via buildroot]

On Sun,  7 Jul 2024 11:06:29 +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, haserl fails to build with output:
> 
>     Applying 0001-add-haserl_lualib.inc.patch using patch:
>     patching file src/haserl_lualib.inc
>     patching file src/Makefile.in
>     Hunk #1 succeeded at 86 (offset 54 lines).
>     Hunk #2 FAILED at 514.
>     1 out of 2 hunks FAILED -- saving rejects to file src/Makefile.in.rej
> 
> This commit refreshes the package patch on the current package version.
> 
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> ---
>  package/haserl/0001-add-haserl_lualib.inc.patch | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 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