[nvidia-settings/el9: 6/6] Merge branch 'master' into el9
by Leigh Scott
commit c2414803277095c057ef1d57210fc3ad977d3c07
Merge: 005d9c8 928f5da
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Apr 18 07:58:14 2024 +0100
Merge branch 'master' into el9
nvidia-settings.spec | 17 ++++++++++++++++-
sources | 2 +-
2 files changed, 17 insertions(+), 2 deletions(-)
---
7 months, 1 week
[nvidia-persistenced/el9: 6/6] Merge branch 'master' into el9
by Leigh Scott
commit 78fbb3e35337878a94aeb23fd253c7080a5deccf
Merge: 80f6101 9749884
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Apr 18 07:54:50 2024 +0100
Merge branch 'master' into el9
nvidia-persistenced.spec | 17 ++++++++++++++++-
sources | 2 +-
2 files changed, 17 insertions(+), 2 deletions(-)
---
7 months, 1 week
[nvidia-open-kmod/el9: 12/13] Update to 550.76 release
by Leigh Scott
commit 7a3202bb601ae5c248ea26fdf601ebfef398a07b
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Apr 17 23:22:39 2024 +0100
Update to 550.76 release
nvidia-open-kmod.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/nvidia-open-kmod.spec b/nvidia-open-kmod.spec
index 945675e..18df8c0 100644
--- a/nvidia-open-kmod.spec
+++ b/nvidia-open-kmod.spec
@@ -10,7 +10,7 @@
Name: nvidia-open-kmod
Epoch: 3
-Version: 550.67
+Version: 550.76
# Taken over by kmodtool
Release: 1%{?dist}
Summary: NVIDIA open display driver kernel module
@@ -77,6 +77,9 @@ done
%changelog
+* Wed Apr 17 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:550.76-1
+- Update to 550.76 release
+
* Wed Mar 20 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:550.67-1
- Update to 550.67 release
diff --git a/sources b/sources
index 8a57985..786bb73 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (open-gpu-kernel-modules-550.67.tar.gz) = e522bf1509061f9e0d8d9b82ac04a5d3fb7db2e299dee6c69ee909ecc8ea1aebb23e025e7485dc29b649bdf873b434c636e2abedb46c618e9d0efdd8013ef992
+SHA512 (open-gpu-kernel-modules-550.76.tar.gz) = 5126d3b8e3f0635b5b044db4faf0d483e70bb43418bbd21325bb175aaca948e19bd81038fbef9118a95387da65ff0ff3d1592fc54c0d6815a2448b32024468ac
7 months, 1 week
[nvidia-open-kmod/el9: 11/13] Update to 550.67 release
by Leigh Scott
commit eb29faa5b33fee7eea3146519f9f29cdb1c2c7bb
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Mar 20 11:59:03 2024 +0000
Update to 550.67 release
gcc14.patch | 17 -----------------
nvidia-open-kmod.spec | 10 +++++-----
sources | 2 +-
3 files changed, 6 insertions(+), 23 deletions(-)
---
diff --git a/nvidia-open-kmod.spec b/nvidia-open-kmod.spec
index b10512b..945675e 100644
--- a/nvidia-open-kmod.spec
+++ b/nvidia-open-kmod.spec
@@ -10,16 +10,15 @@
Name: nvidia-open-kmod
Epoch: 3
-Version: 550.54.14
+Version: 550.67
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: NVIDIA open display driver kernel module
License: GPLv2 and MIT
URL: https://github.com/NVIDIA/open-gpu-kernel-modules
Source0: %{url}/archive/%{version}/open-gpu-kernel-modules-%{version}.tar.gz
Source11: nvidia-open-kmodtool-excludekernel-filterfile
-Patch0: gcc14.patch
ExclusiveArch: x86_64 aarch64
@@ -41,8 +40,6 @@ The nvidia open %{version} display driver kernel module for kernel %{kversion}.
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
%setup -q -c
# patch loop
-ls
-%patch -P0 -p1 -d open-gpu-kernel-modules-%{version}
%if 0%{?_without_nvidia_kmod_patches:1}
# placeholder
%endif
@@ -80,6 +77,9 @@ done
%changelog
+* Wed Mar 20 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:550.67-1
+- Update to 550.67 release
+
* Fri Mar 01 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:550.54.14-2
- Fix gcc14 compile issue (rfbz#6882)
diff --git a/sources b/sources
index b109abd..8a57985 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (open-gpu-kernel-modules-550.54.14.tar.gz) = 68a953405ad47b2f9e19c57d96676cd28d2532895da818e1d234cbd6f0d736f77a737af37900fd5b160fb189e266f3e7a1e523139dd860ba2af287b5c55e2efa
+SHA512 (open-gpu-kernel-modules-550.67.tar.gz) = e522bf1509061f9e0d8d9b82ac04a5d3fb7db2e299dee6c69ee909ecc8ea1aebb23e025e7485dc29b649bdf873b434c636e2abedb46c618e9d0efdd8013ef992
7 months, 1 week
[nvidia-open-kmod/el9: 10/13] Fix gcc14 compile issue (rfbz#6882)
by Leigh Scott
commit 31d01df783caac5c9981456e247a77ad89969af0
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Mar 1 11:07:08 2024 +0000
Fix gcc14 compile issue (rfbz#6882)
gcc14.patch | 17 +++++++++++++++++
nvidia-open-kmod.spec | 8 +++++++-
2 files changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/gcc14.patch b/gcc14.patch
new file mode 100644
index 0000000..19ef22f
--- /dev/null
+++ b/gcc14.patch
@@ -0,0 +1,17 @@
+--- a/kernel-open/conftest.sh
++++ b/kernel-open/conftest.sh
+@@ -5154,8 +5154,13 @@
+ #
+ CODE="
+ #include <drm/drm_gem.h>
++ #if defined(NV_LINUX_IOSYS_MAP_H_PRESENT)
++ typedef struct iosys_map nv_sysio_map_t;
++ #else
++ typedef struct dma_buf_map nv_sysio_map_t;
++ #endif
+ int conftest_drm_gem_object_vmap_has_map_arg(
+- struct drm_gem_object *obj, struct dma_buf_map *map) {
++ struct drm_gem_object *obj, nv_sysio_map_t *map) {
+ return obj->funcs->vmap(obj, map);
+ }"
+
diff --git a/nvidia-open-kmod.spec b/nvidia-open-kmod.spec
index 83bb10f..b10512b 100644
--- a/nvidia-open-kmod.spec
+++ b/nvidia-open-kmod.spec
@@ -12,13 +12,14 @@ Name: nvidia-open-kmod
Epoch: 3
Version: 550.54.14
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA open display driver kernel module
License: GPLv2 and MIT
URL: https://github.com/NVIDIA/open-gpu-kernel-modules
Source0: %{url}/archive/%{version}/open-gpu-kernel-modules-%{version}.tar.gz
Source11: nvidia-open-kmodtool-excludekernel-filterfile
+Patch0: gcc14.patch
ExclusiveArch: x86_64 aarch64
@@ -40,6 +41,8 @@ The nvidia open %{version} display driver kernel module for kernel %{kversion}.
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
%setup -q -c
# patch loop
+ls
+%patch -P0 -p1 -d open-gpu-kernel-modules-%{version}
%if 0%{?_without_nvidia_kmod_patches:1}
# placeholder
%endif
@@ -77,6 +80,9 @@ done
%changelog
+* Fri Mar 01 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:550.54.14-2
+- Fix gcc14 compile issue (rfbz#6882)
+
* Sat Feb 24 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:550.54.14-1
- Update to 550.54.14 release
7 months, 1 week
[nvidia-open-kmod/el9: 9/13] Update to 550.54.14 release
by Leigh Scott
commit da39b588f3d19efcf43332ac1054934c4710167b
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Feb 24 00:49:49 2024 +0000
Update to 550.54.14 release
nvidia-open-kmod.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/nvidia-open-kmod.spec b/nvidia-open-kmod.spec
index e54565f..83bb10f 100644
--- a/nvidia-open-kmod.spec
+++ b/nvidia-open-kmod.spec
@@ -10,9 +10,9 @@
Name: nvidia-open-kmod
Epoch: 3
-Version: 550.40.07
+Version: 550.54.14
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: NVIDIA open display driver kernel module
License: GPLv2 and MIT
URL: https://github.com/NVIDIA/open-gpu-kernel-modules
@@ -77,6 +77,9 @@ done
%changelog
+* Sat Feb 24 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:550.54.14-1
+- Update to 550.54.14 release
+
* Sun Feb 04 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 3:550.40.07-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/sources b/sources
index 1a4e102..b109abd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (open-gpu-kernel-modules-550.40.07.tar.gz) = ad7d69b1fed5d63f12910c40fcf1de2cfabb3233245c28a9ed4ef1f5a7d384e7a6360910a0162052b1802376fd9b7499042f52f41105ebaadfa7d79e60277c49
+SHA512 (open-gpu-kernel-modules-550.54.14.tar.gz) = 68a953405ad47b2f9e19c57d96676cd28d2532895da818e1d234cbd6f0d736f77a737af37900fd5b160fb189e266f3e7a1e523139dd860ba2af287b5c55e2efa
7 months, 1 week