Skip to content

Commit c879645

Browse files
passgattpetazzoni
authored andcommitted
package/nvidia-driver: update the patches to be applied with fuzz 0
Commit 8f88a64 ("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 <[email protected]> Signed-off-by: Thomas Petazzoni <[email protected]>
1 parent a7e270b commit c879645

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

package/nvidia-driver/0001-use-LDFLAGS.patch

+6-4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ Add use of $(LDFLAGS) when doing the link, as the kernel provides the
1717
proper emulation in those.
1818

1919
Signed-off-by: "Yann E. MORIN" <[email protected]>
20+
[Dario: make the patch to be applied with fuzz factor 0]
21+
Signed-off-by: Dario Binacchi <[email protected]>
2022

2123
---
2224
Issue reported upstream:
@@ -25,8 +27,8 @@ Issue reported upstream:
2527
diff -durN nvidia-driver-370.23.orig/kernel/nvidia/nvidia.Kbuild nvidia-driver-370.23/kernel/nvidia/nvidia.Kbuild
2628
--- nvidia-driver-370.23.orig/kernel/nvidia/nvidia.Kbuild 2016-08-09 01:57:50.000000000 +0200
2729
+++ nvidia-driver-370.23/kernel/nvidia/nvidia.Kbuild 2016-08-20 12:25:02.780233423 +0200
28-
@@ -87,7 +87,7 @@
29-
always += $(NVIDIA_INTERFACE)
30+
@@ -93,7 +93,7 @@
31+
always-y += $(NVIDIA_INTERFACE)
3032

3133
$(obj)/$(NVIDIA_INTERFACE): $(addprefix $(obj)/,$(NVIDIA_OBJECTS))
3234
- $(LD) -r -o $@ $^
@@ -37,8 +39,8 @@ diff -durN nvidia-driver-370.23.orig/kernel/nvidia/nvidia.Kbuild nvidia-driver-3
3739
diff -durN nvidia-driver-370.23.orig/kernel/nvidia-modeset/nvidia-modeset.Kbuild nvidia-driver-370.23/kernel/nvidia-modeset/nvidia-modeset.Kbuild
3840
--- nvidia-driver-370.23.orig/kernel/nvidia-modeset/nvidia-modeset.Kbuild 2016-08-09 01:43:19.000000000 +0200
3941
+++ nvidia-driver-370.23/kernel/nvidia-modeset/nvidia-modeset.Kbuild 2016-08-20 12:25:39.596772662 +0200
40-
@@ -70,7 +70,7 @@
41-
always += $(NVIDIA_MODESET_INTERFACE)
42+
@@ -75,7 +75,7 @@
43+
always-y += $(NVIDIA_MODESET_INTERFACE)
4244

4345
$(obj)/$(NVIDIA_MODESET_INTERFACE): $(addprefix $(obj)/,$(NVIDIA_MODESET_OBJECTS))
4446
- $(LD) -r -o $@ $^

0 commit comments

Comments
 (0)