[packages/xorg-driver-video-nvidia-legacy-390xx] - fix for kernel 6.13 buil system changes
baggins
baggins at pld-linux.org
Thu Jan 23 03:20:51 CET 2025
commit 1c8416f645c1f64cca8c43ef66f38970a841c6ca
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Thu Jan 23 02:33:07 2025 +0100
- fix for kernel 6.13 buil system changes
kernel-6.13.patch | 42 ++++++++++++++++++++++++++++++
xorg-driver-video-nvidia-legacy-390xx.spec | 6 +++--
2 files changed, 46 insertions(+), 2 deletions(-)
---
diff --git a/xorg-driver-video-nvidia-legacy-390xx.spec b/xorg-driver-video-nvidia-legacy-390xx.spec
index ef6551f..c7ef262 100644
--- a/xorg-driver-video-nvidia-legacy-390xx.spec
+++ b/xorg-driver-video-nvidia-legacy-390xx.spec
@@ -63,6 +63,7 @@ Patch10: kernel-6.8.patch
Patch11: kernel-6.10.patch
Patch12: gcc14.patch
Patch13: kernel-6.12.patch
+Patch14: kernel-6.13.patch
URL: https://www.nvidia.com/en-us/drivers/unix/
BuildRequires: rpm-build >= 4.6
BuildRequires: rpmbuild(macros) >= 1.752
@@ -305,8 +306,8 @@ sterownik nVidii dla Xorg/XFree86.\
%define build_kernel_pkg()\
cd kernel\
-%{__make} SYSSRC=%{_kernelsrcdir} clean\
-%{__make} SYSSRC=%{_kernelsrcdir} IGNORE_CC_MISMATCH=1 NV_VERBOSE=1 CC=%{__cc} module\
+%{__make} -j1 SYSSRC=%{_kernelsrcdir} clean\
+%{__make} -j1 SYSSRC=%{_kernelsrcdir} IGNORE_CC_MISMATCH=1 NV_VERBOSE=1 CC=%{__cc} module\
cd ..\
%install_kernel_modules -D installed -m kernel/nvidia,kernel/nvidia-drm,kernel/nvidia-modeset -d misc\
%ifarch %{x8664}\
@@ -344,6 +345,7 @@ rm -rf NVIDIA-Linux-x86*-%{version}*
%patch11 -p1
%patch12 -p1
%patch13 -p1
+%patch14 -p1
echo 'EXTRA_CFLAGS += -Wno-int-conversion' >> kernel/Kbuild
%build
diff --git a/kernel-6.13.patch b/kernel-6.13.patch
new file mode 100644
index 0000000..7bcfb34
--- /dev/null
+++ b/kernel-6.13.patch
@@ -0,0 +1,42 @@
+--- NVIDIA-Linux-x86_64-390.157-no-compat32.orig/kernel/nvidia-modeset/nvidia-modeset.Kbuild
++++ NVIDIA-Linux-x86_64-390.157-no-compat32/kernel/nvidia-modeset/nvidia-modeset.Kbuild
+@@ -40,13 +40,15 @@ NV_KERNEL_MODULE_TARGETS += $(NVIDIA_MODESET_KO)
+ NVIDIA_MODESET_BINARY_OBJECT := $(src)/nvidia-modeset/nv-modeset-kernel.o_binary
+ NVIDIA_MODESET_BINARY_OBJECT_O := nvidia-modeset/nv-modeset-kernel.o
+
+-quiet_cmd_symlink = SYMLINK $@
+-cmd_symlink = ln -sf $< $@
++# Rel. commit 80f289101690 "kbuild: change working directory to external module directory with M=" (Masahiro Yamada, 10 Nov 2024)
++# Ensure `$<` is absolute, since the link target is resolved relative to its path, not from where `ln` is run from.
++quiet_cmd_symlinkabs = SYMLINK $@
++ cmd_symlinkabs = ln -sf $(abspath $<) $@
+
+ targets += $(NVIDIA_MODESET_BINARY_OBJECT_O)
+
+ $(obj)/$(NVIDIA_MODESET_BINARY_OBJECT_O): $(NVIDIA_MODESET_BINARY_OBJECT) FORCE
+- $(call if_changed,symlink)
++ $(call if_changed,symlinkabs)
+
+ nvidia-modeset-y += $(NVIDIA_MODESET_BINARY_OBJECT_O)
+
+--- NVIDIA-Linux-x86_64-390.157-no-compat32.orig/kernel/nvidia/nvidia.Kbuild
++++ NVIDIA-Linux-x86_64-390.157-no-compat32/kernel/nvidia/nvidia.Kbuild
+@@ -40,13 +40,15 @@ NVIDIA_KO = nvidia/nvidia.ko
+ NVIDIA_BINARY_OBJECT := $(src)/nvidia/nv-kernel.o_binary
+ NVIDIA_BINARY_OBJECT_O := nvidia/nv-kernel.o
+
+-quiet_cmd_symlink = SYMLINK $@
+- cmd_symlink = ln -sf $< $@
++# Rel. commit 80f289101690 "kbuild: change working directory to external module directory with M=" (Masahiro Yamada, 10 Nov 2024)
++# Ensure `$<` is absolute, since the link target is resolved relative to its path, not from where `ln` is run from.
++quiet_cmd_symlinkabs = SYMLINK $@
++ cmd_symlinkabs = ln -sf $(abspath $<) $@
+
+ targets += $(NVIDIA_BINARY_OBJECT_O)
+
+ $(obj)/$(NVIDIA_BINARY_OBJECT_O): $(NVIDIA_BINARY_OBJECT) FORCE
+- $(call if_changed,symlink)
++ $(call if_changed,symlinkabs)
+
+ nvidia-y += $(NVIDIA_BINARY_OBJECT_O)
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-nvidia-legacy-390xx.git/commitdiff/1c8416f645c1f64cca8c43ef66f38970a841c6ca
More information about the pld-cvs-commit
mailing list