[nvidia-kmod/el8: 8/9] Revert "Try building without host kmodtool package installed"
by Leigh Scott
commit 870963604b1f99f05eea5b2aba4fb3bb11db4d2d
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Nov 10 12:16:01 2019 +0000
Revert "Try building without host kmodtool package installed"
This reverts commit e1b794a1dfb879d25583efc40e0941e591859d51.
nvidia-kmod.spec | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index cdf98c2..1575127 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -12,7 +12,7 @@ Name: nvidia-kmod
Epoch: 3
Version: 430.40
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
License: Redistributable, no modification permitted
URL: http://www.nvidia.com/
@@ -68,9 +68,6 @@ done
%changelog
-* Thu Oct 10 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 3:430.40-2
-- Try building without host kmodtool installed
-
* Mon Jul 29 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 3:430.40-1
- Update to 430.40 release
4 years, 11 months
[nvidia-kmod/el8] (9 commits) ...Merge branch 'master' into el8
by Leigh Scott
Summary of changes:
7d53469... - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass (*)
951c983... Update to 435.17 beta (*)
92e534d... Update to 435.21 release (*)
4504b7e... Patch for 5.4 pre rc kernel (*)
13088fe... tweak patch (*)
148585f... Update to 440.26 beta (*)
051b1f2... Update to 440.31 release (*)
8709636... Revert "Try building without host kmodtool package installe
f195d1e... Merge branch 'master' into el8
(*) This commit already existed in another branch; no separate mail sent
4 years, 11 months
[xorg-x11-drv-nvidia/el8] (19 commits) ...Enable boolean requires and appdata for el8
by Leigh Scott
Summary of changes:
3f23095... Update to 435.17 beta (*)
4c53fb7... fix file rename and remove f25 conditional (*)
0ba0fee... more clean up (*)
32c6c9a... Use AllowNVIDIAGPUScreens as ServerLayout for optimus (*)
d1e73e8... Disable PrimaryGPU by default (*)
e9d5367... Update changelog (*)
d5bc041... Switch to python3 for appdata (*)
52d317d... Add Vulkan layer for Optimus (*)
aa1dc86... Add Suggests acpica-tools and vulkan-tools (nvidia-bug-repo (*)
efd9769... Complete description (*)
cce3e20... Complete description pt2 (*)
6b3bb33... Update to 435.21 release (*)
1ae9102... Remove 304xx conflicts (*)
788dc3d... Fix conflict with rpmfusion-nonfree-obsolete-packages (*)
0f0e53c... Add runtime PM rules (*)
709453e... Update to 440.26 beta (*)
984c2c8... Fix for compat (*)
bf345ca... Update to 440.31 release (*)
e8457fa... Enable boolean requires and appdata for el8 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 11 months
[xorg-x11-drv-nvidia] Enable boolean requires and appdata for el8
by Leigh Scott
commit e8457fa5aa057d52963c2414eb165f5365786583
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Nov 10 09:49:59 2019 +0000
Enable boolean requires and appdata for el8
xorg-x11-drv-nvidia.spec | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 4eb0d25..c0dbb77 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -52,7 +52,7 @@ Requires(postun): ldconfig
Requires(post): grubby
Requires: which
Requires: nvidia-settings%{?_isa} = %{?epoch}:%{version}
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
# AppStream metadata generation
BuildRequires: python3
BuildRequires: libappstream-glib >= 0.6.3
@@ -110,7 +110,7 @@ Summary: CUDA driver for %{name}
Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version}
Requires: %{name}-cuda-libs%{?_isa} = %{?epoch}:%{version}-%{release}
Requires: nvidia-persistenced%{?_isa} = %{?epoch}:%{version}
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
Suggests: nvidia-modprobe%{?_isa} = %{?epoch}:%{version}
# Boolean dependencies are only fedora
%ifarch x86_64
@@ -155,7 +155,7 @@ Requires: libglvnd-egl%{?_isa} >= 0.2
Requires: libglvnd-gles%{?_isa} >= 0.2
Requires: libglvnd-glx%{?_isa} >= 0.2
Requires: libglvnd-opengl%{?_isa} >= 0.2
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
Requires: egl-wayland%{?_isa} >= 1.0.0
%else
Requires: egl-wayland >= 1.0.0
@@ -163,7 +163,7 @@ Requires: egl-wayland >= 1.0.0
Requires: mesa-libEGL%{?_isa} >= 13.0.3-3
Requires: mesa-libGL%{?_isa} >= 13.0.3-3
Requires: mesa-libGLES%{?_isa} >= 13.0.3-3
-%if 0%{?rhel}
+%if 0%{?rhel} < 8
Requires: vulkan-filesystem
%else
Requires: vulkan-loader%{?_isa}
@@ -324,7 +324,7 @@ cat > %{buildroot}%{rpmmacrodir}/macros.%{name}-kmodsrc<< EOF
%nvidia_kmodsrc_version %{version}
EOF
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
# install AppData and add modalias provides
mkdir -p %{buildroot}%{_datadir}/appdata/
install -pm 0644 %{SOURCE8} %{buildroot}%{_datadir}/appdata/
@@ -408,7 +408,7 @@ fi ||:
%{_udevrulesdir}/10-nvidia.rules
%{_udevrulesdir}/60-nvidia.rules
%{_unitdir}/nvidia-fallback.service
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
%{_datadir}/appdata/%{name}.metainfo.xml
%{_datadir}/pixmaps/%{name}.png
%endif
4 years, 11 months
