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

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

[Bernd Kuhls]

Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0" reduced the fuzz factor.

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

    Applying 0001-crda-support-python-3-in-utils-key2pub.py.patch using patch:
    patching file Makefile
    Hunk #1 FAILED at 112.
    1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej

Rebase patch to fix the problem, problem was not yet caught by
autobuilders.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 .../crda/0001-crda-support-python-3-in-utils-key2pub.py.patch | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch b/package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch
index f2b9cca2d6..00b5a52ea7 100644
--- a/package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch
+++ b/package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch
@@ -33,6 +33,8 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 Signed-off-by: Peter Seiderer <ps.report@gmx.net>
 [Romain: Use pycryptodomex]
 Signed-off-by: Romain Naour <romain.naour@gmail.com>
+[Bernd: rebased for version 4.15]
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
 ---
  Makefile         |   2 +-
  utils/key2pub.py | 146 ++++++++++++++++++++++++-----------------------
@@ -49,7 +51,7 @@ index a3ead30..8da38d0 100644
 -	$(Q)./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@
 +	$(Q) python utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@
  
- $(LIBREG): regdb.h reglib.h reglib.c
+ $(LIBREG): reglib.c regdb.h reglib.h
  	$(NQ) '  CC  ' $@
 diff --git a/utils/key2pub.py b/utils/key2pub.py
 index 9bb04cd..8a0ba2a 100755
-- 
2.39.2

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

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

[Yann E. MORIN]

Bernd, All,

On 2024-06-29 10:27 +0200, Bernd Kuhls spake thusly:
> Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum
> fuzz factor to 0" reduced the fuzz factor.
> 
> Due to this change, crda fails to build with output:
> 
>     Applying 0001-crda-support-python-3-in-utils-key2pub.py.patch using patch:
>     patching file Makefile
>     Hunk #1 FAILED at 112.
>     1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej
> 
> Rebase patch to fix the problem, problem was not yet caught by
> autobuilders.
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  .../crda/0001-crda-support-python-3-in-utils-key2pub.py.patch | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch b/package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch
> index f2b9cca2d6..00b5a52ea7 100644
> --- a/package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch
> +++ b/package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch
> @@ -33,6 +33,8 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
>  Signed-off-by: Peter Seiderer <ps.report@gmx.net>
>  [Romain: Use pycryptodomex]
>  Signed-off-by: Romain Naour <romain.naour@gmail.com>
> +[Bernd: rebased for version 4.15]
> +Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
>  ---
>   Makefile         |   2 +-
>   utils/key2pub.py | 146 ++++++++++++++++++++++++-----------------------
> @@ -49,7 +51,7 @@ index a3ead30..8da38d0 100644
>  -	$(Q)./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@
>  +	$(Q) python utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@
>   
> - $(LIBREG): regdb.h reglib.h reglib.c
> + $(LIBREG): reglib.c regdb.h reglib.h
>   	$(NQ) '  CC  ' $@
>  diff --git a/utils/key2pub.py b/utils/key2pub.py
>  index 9bb04cd..8a0ba2a 100755
> -- 
> 2.39.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot