[Buildroot] [PATCH 1/1] package/riscv-isa-sim: update the patch to be applied with fuzz 0

[Buildroot] [PATCH 1/1] package/riscv-isa-sim: update the patch to be applied with fuzz 0

[Julien Olivain]

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

Due to this change, host-riscv-isa-sim fail to build with output:

    Applying 0001-riscv-disable-precompiled-headers.patch using patch:
    patching file riscv/riscv.mk.in
    Hunk #1 FAILED at 35.
    1 out of 1 hunk FAILED -- saving rejects to file riscv/riscv.mk.in.rej

This commit rebased the package patch on the package version, bumped in
commit 853b7661bf "package/riscv-isa-sim: bump to git version
00dfa28cd7".

Signed-off-by: Julien Olivain <ju.o@free.fr>
---
 .../0001-riscv-disable-precompiled-headers.patch     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch b/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch
index 461f34e3a10..9ce32e3b768 100644
--- a/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch
+++ b/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch
@@ -1,4 +1,4 @@
-From 980d5143089bf32ef8a6dfdf1bb9e9fe92fa7bf5 Mon Sep 17 00:00:00 2001
+From 12e0257495de41202827fabd5935f2e5a92ae8a6 Mon Sep 17 00:00:00 2001
 From: Julien Olivain <ju.o@free.fr>
 Date: Sun, 9 Jan 2022 13:38:48 +0100
 Subject: [PATCH] riscv: disable precompiled headers
@@ -16,12 +16,12 @@ Signed-off-by: Julien Olivain <ju.o@free.fr>
  1 file changed, 3 deletions(-)
 
 diff --git a/riscv/riscv.mk.in b/riscv/riscv.mk.in
-index 2347ce6..4f56eaf 100644
+index 469c48dc..c61cadaf 100644
 --- a/riscv/riscv.mk.in
 +++ b/riscv/riscv.mk.in
-@@ -35,9 +35,6 @@ riscv_hdrs = \
- 
- riscv_install_hdrs = mmio_plugin.h
+@@ -45,9 +45,6 @@ riscv_install_hdrs = \
+ 	triggers.h \
+ 	vector_unit.h \
  
 -riscv_precompiled_hdrs = \
 -	insn_template.h \
@@ -30,5 +30,5 @@ index 2347ce6..4f56eaf 100644
  	processor.cc \
  	execute.cc \
 -- 
-2.34.1
+2.45.2
 
-- 
2.45.2

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

Re: [Buildroot] [PATCH 1/1] package/riscv-isa-sim: update the patch to be applied with fuzz 0

[Yann E. MORIN]

Julien, All,

On 2024-06-25 16:52 +0200, Julien Olivain spake thusly:
> Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum
> fuzz factor to 0" reduced the fuzz factor.
> 
> Due to this change, host-riscv-isa-sim fail to build with output:
> 
>     Applying 0001-riscv-disable-precompiled-headers.patch using patch:
>     patching file riscv/riscv.mk.in
>     Hunk #1 FAILED at 35.
>     1 out of 1 hunk FAILED -- saving rejects to file riscv/riscv.mk.in.rej
> 
> This commit rebased the package patch on the package version, bumped in
> commit 853b7661bf "package/riscv-isa-sim: bump to git version
> 00dfa28cd7".
> 
> Signed-off-by: Julien Olivain <ju.o@free.fr>

Applied to master, thanks.

While you are at it, could you add an Upstream tag, to state the status
of that patch, please?

Probably, "N/A unfit for upstream" would be what we need. Ideally, an
upstreamable patch would be better. Ideally-ideally, an upstreamed patch
would be awesome. Ideally-ideally-ideally, a backport from upstream
would be wonderful! ;-)

Regards,
Yann E. MORIN.

> ---
>  .../0001-riscv-disable-precompiled-headers.patch     | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch b/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch
> index 461f34e3a10..9ce32e3b768 100644
> --- a/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch
> +++ b/package/riscv-isa-sim/0001-riscv-disable-precompiled-headers.patch
> @@ -1,4 +1,4 @@
> -From 980d5143089bf32ef8a6dfdf1bb9e9fe92fa7bf5 Mon Sep 17 00:00:00 2001
> +From 12e0257495de41202827fabd5935f2e5a92ae8a6 Mon Sep 17 00:00:00 2001
>  From: Julien Olivain <ju.o@free.fr>
>  Date: Sun, 9 Jan 2022 13:38:48 +0100
>  Subject: [PATCH] riscv: disable precompiled headers
> @@ -16,12 +16,12 @@ Signed-off-by: Julien Olivain <ju.o@free.fr>
>   1 file changed, 3 deletions(-)
>  
>  diff --git a/riscv/riscv.mk.in b/riscv/riscv.mk.in
> -index 2347ce6..4f56eaf 100644
> +index 469c48dc..c61cadaf 100644
>  --- a/riscv/riscv.mk.in
>  +++ b/riscv/riscv.mk.in
> -@@ -35,9 +35,6 @@ riscv_hdrs = \
> - 
> - riscv_install_hdrs = mmio_plugin.h
> +@@ -45,9 +45,6 @@ riscv_install_hdrs = \
> + 	triggers.h \
> + 	vector_unit.h \
>   
>  -riscv_precompiled_hdrs = \
>  -	insn_template.h \
> @@ -30,5 +30,5 @@ index 2347ce6..4f56eaf 100644
>   	processor.cc \
>   	execute.cc \
>  -- 
> -2.34.1
> +2.45.2
>  
> -- 
> 2.45.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