[1/1] package/nvidia-driver: update the patches to be applied with fuzz 0
diff mbox series

Message ID 20240704184456.2970034-1-dario.binacchi@amarulasolutions.com
State New
Headers show
Series
  • [1/1] package/nvidia-driver: update the patches to be applied with fuzz 0
Related show

Commit Message

Dario Binacchi July 4, 2024, 6:44 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, nvidia-driver fails to build with output:

    Applying 0001-use-LDFLAGS.patch using patch:
    patching file kernel/nvidia/nvidia.Kbuild
    Hunk #1 FAILED at 87.
    1 out of 1 hunk FAILED -- saving rejects to file kernel/nvidia/nvidia.Kbuild.rej
    patching file kernel/nvidia-modeset/nvidia-modeset.Kbuild
    Hunk #1 FAILED at 70.
    1 out of 1 hunk FAILED -- saving rejects to file kernel/nvidia-modeset/nvidia-modeset.Kbuild.rej

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

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

Comments

'Julien Olivain' via Amarula Linux July 9, 2024, 9:42 a.m. UTC | #1 
On Thu,  4 Jul 2024 20:44:56 +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, nvidia-driver fails to build with output:
> 
>     Applying 0001-use-LDFLAGS.patch using patch:
>     patching file kernel/nvidia/nvidia.Kbuild
>     Hunk #1 FAILED at 87.
>     1 out of 1 hunk FAILED -- saving rejects to file kernel/nvidia/nvidia.Kbuild.rej
>     patching file kernel/nvidia-modeset/nvidia-modeset.Kbuild
>     Hunk #1 FAILED at 70.
>     1 out of 1 hunk FAILED -- saving rejects to file kernel/nvidia-modeset/nvidia-modeset.Kbuild.rej
> 
> This commit refreshes the package patch on the current package version.
> 
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> ---
>  package/nvidia-driver/0001-use-LDFLAGS.patch | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)

Applied to master, thanks.

Thomas

Patch
diff mbox series 

diff --git a/package/nvidia-driver/0001-use-LDFLAGS.patch b/package/nvidia-driver/0001-use-LDFLAGS.patch
index 7b7df8098832..9ce237f9595e 100644
--- a/package/nvidia-driver/0001-use-LDFLAGS.patch
+++ b/package/nvidia-driver/0001-use-LDFLAGS.patch
@@ -17,6 +17,8 @@  Add use of $(LDFLAGS) when doing the link, as the kernel provides the
 proper emulation in those.
 
 Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 
 ---
 Issue reported upstream:
@@ -25,8 +27,8 @@  Issue reported upstream:
 diff -durN nvidia-driver-370.23.orig/kernel/nvidia/nvidia.Kbuild nvidia-driver-370.23/kernel/nvidia/nvidia.Kbuild
 --- nvidia-driver-370.23.orig/kernel/nvidia/nvidia.Kbuild	2016-08-09 01:57:50.000000000 +0200
 +++ nvidia-driver-370.23/kernel/nvidia/nvidia.Kbuild	2016-08-20 12:25:02.780233423 +0200
-@@ -87,7 +87,7 @@
- always += $(NVIDIA_INTERFACE)
+@@ -93,7 +93,7 @@
+ always-y += $(NVIDIA_INTERFACE)
  
  $(obj)/$(NVIDIA_INTERFACE): $(addprefix $(obj)/,$(NVIDIA_OBJECTS))
 -	$(LD) -r -o $@ $^
@@ -37,8 +39,8 @@  diff -durN nvidia-driver-370.23.orig/kernel/nvidia/nvidia.Kbuild nvidia-driver-3
 diff -durN nvidia-driver-370.23.orig/kernel/nvidia-modeset/nvidia-modeset.Kbuild nvidia-driver-370.23/kernel/nvidia-modeset/nvidia-modeset.Kbuild
 --- nvidia-driver-370.23.orig/kernel/nvidia-modeset/nvidia-modeset.Kbuild	2016-08-09 01:43:19.000000000 +0200
 +++ nvidia-driver-370.23/kernel/nvidia-modeset/nvidia-modeset.Kbuild	2016-08-20 12:25:39.596772662 +0200
-@@ -70,7 +70,7 @@
- always += $(NVIDIA_MODESET_INTERFACE)
+@@ -75,7 +75,7 @@
+ always-y += $(NVIDIA_MODESET_INTERFACE)
  
  $(obj)/$(NVIDIA_MODESET_INTERFACE): $(addprefix $(obj)/,$(NVIDIA_MODESET_OBJECTS))
 -	$(LD) -r -o $@ $^