[xorg-x11-drv-nvidia/el7] Remove prelink
by Nicolas Chauvet
commit 5eb47090179b00a583cc4236b4d543b0ac2d396b
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Feb 24 16:03:07 2017 +0000
Remove prelink
xorg-x11-drv-nvidia.spec | 10 ----------
1 file changed, 10 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index d0054c8..e2848a6 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -361,10 +361,6 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
install -pm 0644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.conf
%endif
-#Avoid prelink to mess with nvidia libs - rfbz#3258
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d
-touch $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/nvidia-%{_lib}.conf
-
#Install the initscript
tar jxf nvidia-persistenced-init.tar.bz2
%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
@@ -407,11 +403,6 @@ if [ "$1" -eq "1" ]; then
fi
fi
-%pre libs
-if [ -d %{_sysconfdir}/prelink.conf.d ]; then
-echo "-b %{_nvidia_libdir}" > %{_sysconfdir}/prelink.conf.d/nvidia-%{_lib}.conf
-fi
-
%post
/sbin/ldconfig
if [ "$1" -eq "1" ]; then
@@ -569,7 +560,6 @@ fi ||:
%dir %{_nvidia_libdir}
%dir %{_nvidia_libdir}/tls
%endif
-%ghost %{_sysconfdir}/prelink.conf.d/nvidia-%{_lib}.conf
%{_nvidia_libdir}/alternate-install-present
%{_nvidia_libdir}/*.so.*
%if 0%{?rhel}
6 years, 10 months
[xorg-x11-drv-nvidia/el7] RHEL 6 desktop-file-utils commands are more limited
by Nicolas Chauvet
commit 2e89ed6cc1d66a8934753cace3ab6cdf0dd6b8e9
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Feb 24 10:43:00 2017 +0000
RHEL 6 desktop-file-utils commands are more limited
xorg-x11-drv-nvidia.spec | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 81b9598..d0054c8 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -330,13 +330,11 @@ touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
# Comment Xorg abi override
#install -pm 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
-# Desktop entry for nvidia-settings
+# Fix desktop file and validate
+sed -i -e 's|__UTILS_PATH__/||g' -e 's|__PIXMAP_PATH__/||g' nvidia-settings.desktop
+sed -i -e 's|nvidia-settings.png|nvidia-settings|g' nvidia-settings.desktop
desktop-file-install --vendor "" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
-%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
- --set-icon=nvidia-settings \
- --set-key=Exec --set-value=nvidia-settings \
-%endif
nvidia-settings.desktop
%if 0%{?rhel} < 8 || 0%{?fedora} <= 24
6 years, 10 months
[xorg-x11-drv-nvidia/el7] build requires libappstream-glib doesn't need a isa
by Nicolas Chauvet
commit 1298f8673bd34b7e33fb80581bc639aeed3f82cc
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Feb 24 10:37:06 2017 +0000
build requires libappstream-glib doesn't need a isa
xorg-x11-drv-nvidia.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index e3d2f82..81b9598 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -54,7 +54,7 @@ Requires(postun): systemd
%if 0%{?fedora} >= 25
# AppStream metadata generation
BuildRequires: python2
-BuildRequires: libappstream-glib%{?_isa} >= 0.6.3
+BuildRequires: libappstream-glib >= 0.6.3
%endif
Requires(post): ldconfig
6 years, 10 months
[xorg-x11-drv-nvidia/el7] RHEL 6 does not have the same read-only modprobe directory available as in RHEL 7+/Fedora
by Nicolas Chauvet
commit eccfe79ead305b563023c8bd94fdf52fd1aa56d4
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Feb 24 10:22:15 2017 +0000
RHEL 6 does not have the same read-only modprobe directory available as in RHEL 7+/Fedora
xorg-x11-drv-nvidia.spec | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 95b5367..e3d2f82 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -9,6 +9,12 @@
%global _glvnd_libdir %{_libdir}/libglvnd
%endif
+%if 0%{?rhel} == 6
+%global _modprobe_d %{_sysconfdir}/modprobe.d/
+%else
+%global _modprobe_d %{_prefix}/lib/modprobe.d/
+%endif
+
%global debug_package %{nil}
%global __strip /bin/true
@@ -280,8 +286,8 @@ echo -e "%{_nvidia_libdir} \n%{_glvnd_libdir} \n" > $RPM_BUILD_ROOT%{_sysconfdir
%endif
#Blacklist nouveau (since F-11)
-install -m 0755 -d $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
-install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
+install -m 0755 -d $RPM_BUILD_ROOT%{_modprobe_d}/
+install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_modprobe_d}/
# Install binaries
install -m 0755 -d $RPM_BUILD_ROOT%{_bindir}
@@ -518,7 +524,7 @@ fi ||:
%endif
# Comment Xorg abi override
#%%config %%{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf
-%config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf
+%config(noreplace) %{_modprobe_d}/blacklist-nouveau.conf
%config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf
%config %{_sysconfdir}/xdg/autostart/nvidia-settings.desktop
%{_bindir}/nvidia-bug-report.sh
6 years, 10 months
[xorg-x11-drv-nvidia/el7] reorder spec file
by Nicolas Chauvet
commit c2195b250f82f68d920c24404b5922d75a9be8ad
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Feb 20 13:08:14 2017 +0000
reorder spec file
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 e833e03..95b5367 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -232,6 +232,12 @@ ln -s libEGL_nvidia.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/libEGL_nvidia
ln -s libGLESv2_nvidia.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/libGLESv2_nvidia.so.2
ln -s libGLX_nvidia.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/libGLX_nvidia.so.0
+%if 0%{?rhel} > 6 || 0%{?fedora} <= 24
+#Workaround for cuda availability - rfbz#2916
+ln -fs %{_nvidia_libdir}/libcuda.so.1 $RPM_BUILD_ROOT%{_libdir}/libcuda.so.1
+ln -fs %{_nvidia_libdir}/libcuda.so $RPM_BUILD_ROOT%{_libdir}/libcuda.so
+%endif
+
%ifarch x86_64 i686
# OpenCL config
install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors/
@@ -332,12 +338,6 @@ desktop-file-install --vendor "" \
ln -fs ../../%{_nvidia_serie}/xorg $RPM_BUILD_ROOT%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version}
%endif
-%if 0%{?rhel} > 6 || 0%{?fedora} <= 24
-#Workaround for cuda availability - rfbz#2916
-ln -fs %{_nvidia_libdir}/libcuda.so.1 $RPM_BUILD_ROOT%{_libdir}/libcuda.so.1
-ln -fs %{_nvidia_libdir}/libcuda.so $RPM_BUILD_ROOT%{_libdir}/libcuda.so
-%endif
-
#Alternate-install-present is checked by the nvidia .run
install -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_nvidia_libdir}
6 years, 10 months
[xorg-x11-drv-nvidia/el7] reorder spec file
by Nicolas Chauvet
commit 6c3801cc4a5f37c659f81566af8f3be1db157731
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Feb 20 13:01:49 2017 +0000
reorder spec file
xorg-x11-drv-nvidia.spec | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 3760fb4..e833e03 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -212,18 +212,6 @@ cd nvidiapkg
rm -f nvidia-installer*
-install -m 0755 -d $RPM_BUILD_ROOT%{_bindir}
-
-%if 0%{?rhel} > 6 || 0%{?fedora} <= 24
-# ld.so.conf.d file
-install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
-echo -e "%{_nvidia_libdir} \n%{_glvnd_libdir} \n" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
-%endif
-
-#Blacklist nouveau (since F-11)
-install -m 0755 -d $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
-install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
-
# GLVND
rm libGL.so*
rm libEGL.so*
@@ -279,7 +267,18 @@ install -p -m 0755 libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_nvidia_xorgdir}
install -p -m 0755 libglx.so.%{version} $RPM_BUILD_ROOT%{_nvidia_xorgdir}
install -p -m 0755 nvidia_drv.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/
+# ld.so.conf.d file
+%if 0%{?rhel} > 6 || 0%{?fedora} <= 24
+install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+echo -e "%{_nvidia_libdir} \n%{_glvnd_libdir} \n" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
+%endif
+
+#Blacklist nouveau (since F-11)
+install -m 0755 -d $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
+install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
+
# Install binaries
+install -m 0755 -d $RPM_BUILD_ROOT%{_bindir}
install -p -m 0755 nvidia-{bug-report.sh,debugdump,smi,cuda-mps-control,cuda-mps-server,xconfig,settings,persistenced,modprobe} \
$RPM_BUILD_ROOT%{_bindir}
6 years, 10 months
[xorg-x11-drv-nvidia/el7] Change buildroot macro
by Nicolas Chauvet
commit 4c40f354e6b8c948e041b8817900d1cdfa6a80d2
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Feb 20 13:29:04 2017 +0000
Change buildroot macro
xorg-x11-drv-nvidia.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 065c54f..3760fb4 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -388,7 +388,7 @@ install -D -p -m 0644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nvi
%if 0%{?fedora} >= 25
# install AppData and add modalias provides
mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata/
-install -pm 0644 %{SOURCE12} %{buildroot}%{_datadir}/appdata/
+install -pm 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/appdata/
fn=$RPM_BUILD_ROOT%{_datadir}/appdata/xorg-x11-drv-nvidia.metainfo.xml
%{SOURCE13} README.txt "NVIDIA GEFORCE GPUS" | xargs appstream-util add-provide ${fn} modalias
%{SOURCE13} README.txt "NVIDIA QUADRO GPUS" | xargs appstream-util add-provide ${fn} modalias
6 years, 10 months
[xorg-x11-drv-nvidia/el7] fix directory ownership
by Nicolas Chauvet
commit 5978b53e63f9e4552eefc363d93877a2c2b2a75d
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Feb 24 10:08:29 2017 +0000
fix directory ownership
xorg-x11-drv-nvidia.spec | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 823d194..065c54f 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -1,11 +1,12 @@
-%global _nvidia_serie nvidia
+%global _nvidia_serie nvidia
%if 0%{?fedora} >= 25
-%global _nvidia_libdir %{_libdir}
-%global _nvidia_xorgdir %{_libdir}/%{_nvidia_serie}/xorg
+%global _nvidia_libdir %{_libdir}
+%global _nvidia_serie_libdir %{_libdir}/%{_nvidia_serie}
+%global _nvidia_xorgdir %{_libdir}/%{_nvidia_serie}/xorg
%else
-%global _nvidia_libdir %{_libdir}/%{_nvidia_serie}
-%global _nvidia_xorgdir %{_nvidia_libdir}/xorg
-%global _glvnd_libdir %{_libdir}/libglvnd
+%global _nvidia_libdir %{_libdir}/%{_nvidia_serie}
+%global _nvidia_xorgdir %{_nvidia_libdir}/xorg
+%global _glvnd_libdir %{_libdir}/libglvnd
%endif
%global debug_package %{nil}
@@ -525,8 +526,10 @@ fi ||:
%{_bindir}/nvidia-settings
%{_bindir}/nvidia-xconfig
# Xorg libs that do not need to be multilib
-%dir %{_nvidia_xorgdir}
-%{_nvidia_xorgdir}/*.so*
+%if 0%{?fedora} >= 25
+%{_nvidia_serie_libdir}
+%endif
+%{_nvidia_xorgdir}
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
%if 0%{?rhel} < 8 || 0%{?fedora} <= 24
%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version}
6 years, 10 months
[xorg-x11-drv-nvidia/el7] Typo
by Nicolas Chauvet
commit 831a6863ae2d94c5643ebece157391f26c8fefd8
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Feb 16 10:53:20 2017 +0100
Typo
xorg-x11-drv-nvidia.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 8721ce9..823d194 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -163,7 +163,7 @@ Requires: libglvnd-opengl%{?_isa} >= 0.2
Requires: mesa-libEGL%{?_isa} >= 13.0.3-3
Requires: mesa-libGL%{?_isa} >= 13.0.3-3
Requires: mesa-libGLES%{?_isa} >= 13.0.3-3
-# Boolean dependencies are now yet allowed in fedora, only for testing
+# Boolean dependencies are not yet allowed in fedora, only for testing
%if 0%{?fedora} >= 26
%ifarch x86_64
Requires: (%{name}-libs(x86-32) = %{?epoch}:%{version}-%{release} if libGL(x86-32))
6 years, 10 months
[xorg-x11-drv-nvidia/el7] Update changelog
by Nicolas Chauvet
commit 4ca4b023bde2bacf36e1b132fa06d58f0e19d35e
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Feb 16 10:07:07 2017 +0100
Update changelog
xorg-x11-drv-nvidia.spec | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 6f7885b..8721ce9 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -14,7 +14,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 375.39
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -649,6 +649,11 @@ fi ||:
%{_nvidia_libdir}/libGLX_nvidia.so
%changelog
+* Thu Feb 16 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 1:375.39-2
+- Avoid xorg dir symlink on fedora 25+
+- Drop GFXPAYLOAD and video=vesa:off
+- Implement cuda-libs (for steam)
+
* Tue Feb 14 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:375.39-1
- Update to 375.39 release
6 years, 10 months