rpms/nvidia-kmod/devel nvidia-kmod.spec,1.139,1.140
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30047
Modified Files:
nvidia-kmod.spec
Log Message:
Bump
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- nvidia-kmod.spec 11 Nov 2013 21:25:20 -0000 1.139
+++ nvidia-kmod.spec 11 Nov 2013 21:26:13 -0000 1.140
@@ -9,7 +9,7 @@
Epoch: 1
Version: 331.20
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -89,7 +89,7 @@
%changelog
-* Mon Nov 11 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.20-2
+* Mon Nov 11 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.20-3
- Add nvidia-uvm
- Fix build directory layout - rfbz#2907
11 years
rpms/nvidia-kmod/devel nvidia-kmod.spec,1.138,1.139
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29941
Modified Files:
nvidia-kmod.spec
Log Message:
Fix build
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- nvidia-kmod.spec 11 Nov 2013 16:00:23 -0000 1.138
+++ nvidia-kmod.spec 11 Nov 2013 21:25:20 -0000 1.139
@@ -64,10 +64,12 @@
%build
for kernel_version in %{?kernel_versions}; do
pushd _kmod_build_${kernel_version%%___*}/kernel/
- make %{?_smp_mflags} KERNEL_UNAME="${kernel_version%%___*}" module
+ make %{?_smp_mflags} IGNORE_CC_MISMATCH=1 KERNEL_UNAME="${kernel_version%%___*}" \
+ SYSSRC="${kernel_version##*___}" module
popd
pushd _kmod_build_${kernel_version%%___*}/kernel/uvm
- make %{?_smp_mflags} KERNEL_UNAME="${kernel_version%%___*}" module
+ make %{?_smp_mflags} IGNORE_CC_MISMATCH=1 KERNEL_UNAME="${kernel_version%%___*}" \
+ SYSSRC="${kernel_version##*___}" module
popd
done
11 years
rpms/nvidia-kmod/F-19 nvidia-kmod.spec,1.150,1.151
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14317
Modified Files:
nvidia-kmod.spec
Log Message:
Attempt to fix cross-kernel build
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-19/nvidia-kmod.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- nvidia-kmod.spec 11 Nov 2013 17:44:09 -0000 1.150
+++ nvidia-kmod.spec 11 Nov 2013 18:11:41 -0000 1.151
@@ -64,10 +64,12 @@
%build
for kernel_version in %{?kernel_versions}; do
pushd _kmod_build_${kernel_version%%___*}/kernel/
- make %{?_smp_mflags} IGNORE_CC_MISMATCH=1 KERNEL_UNAME="${kernel_version%%___*}" module
+ make %{?_smp_mflags} IGNORE_CC_MISMATCH=1 KERNEL_UNAME="${kernel_version%%___*}" \
+ SYSSRC="${kernel_version##*___}" module
popd
pushd _kmod_build_${kernel_version%%___*}/kernel/uvm
- make %{?_smp_mflags} IGNORE_CC_MISMATCH=1 KERNEL_UNAME="${kernel_version%%___*}" module
+ make %{?_smp_mflags} IGNORE_CC_MISMATCH=1 KERNEL_UNAME="${kernel_version%%___*}" \
+ SYSSRC="${kernel_version##*___}" module
popd
done
11 years
rpms/nvidia-kmod/F-19 nvidia-kmod.spec,1.149,1.150
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13489
Modified Files:
nvidia-kmod.spec
Log Message:
Fix build
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-19/nvidia-kmod.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- nvidia-kmod.spec 11 Nov 2013 17:17:26 -0000 1.149
+++ nvidia-kmod.spec 11 Nov 2013 17:44:09 -0000 1.150
@@ -64,10 +64,10 @@
%build
for kernel_version in %{?kernel_versions}; do
pushd _kmod_build_${kernel_version%%___*}/kernel/
- make %{?_smp_mflags} KERNEL_UNAME="${kernel_version%%___*}" module
+ make %{?_smp_mflags} IGNORE_CC_MISMATCH=1 KERNEL_UNAME="${kernel_version%%___*}" module
popd
pushd _kmod_build_${kernel_version%%___*}/kernel/uvm
- make %{?_smp_mflags} KERNEL_UNAME="${kernel_version%%___*}" module
+ make %{?_smp_mflags} IGNORE_CC_MISMATCH=1 KERNEL_UNAME="${kernel_version%%___*}" module
popd
done
11 years
rpms/nvidia-kmod/F-19 nvidia-kmod.spec, 1.148, 1.149 3.11_kernel.patch, 1.3, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12845/F-19
Modified Files:
nvidia-kmod.spec
Removed Files:
3.11_kernel.patch
Log Message:
Update to latest
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-19/nvidia-kmod.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- nvidia-kmod.spec 11 Nov 2013 16:57:48 -0000 1.148
+++ nvidia-kmod.spec 11 Nov 2013 17:17:26 -0000 1.149
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels akmod
+#global buildforkernels akmod
Name: nvidia-kmod
Epoch: 1
--- 3.11_kernel.patch DELETED ---
11 years
rpms/nvidia-kmod/F-19 nvidia-kmod.spec, 1.147, 1.148 sources, 1.59, 1.60 .cvsignore, 1.57, 1.58
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12353
Modified Files:
nvidia-kmod.spec sources .cvsignore
Log Message:
Update to latest
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-19/nvidia-kmod.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- nvidia-kmod.spec 6 Nov 2013 10:24:32 -0000 1.147
+++ nvidia-kmod.spec 11 Nov 2013 16:57:48 -0000 1.148
@@ -3,11 +3,11 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels current
+%global buildforkernels akmod
Name: nvidia-kmod
Epoch: 1
-Version: 325.15
+Version: 331.20
# Taken over by kmodtool
Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
@@ -17,11 +17,15 @@
# Source is created from these files:
#ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run
#ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run
+#ftp://download.nvidia.com/XFree86/Linux-32bit-ARM/%{version}/NVIDIA-Linux-armv7l-gnueabihf-%{version}.run
+#sh %{SOURCE0} --extract-only --target nvidiapkg-i686
+#sh %{SOURCE1} --extract-only --target nvidiapkg-x86_64
+#sh %{SOURCE4} --extract-only --target nvidiapkg-armv7hl
+#tar -cJf nvidia-kmod-data-%{version}.tar.xz nvidiapkg-*/LICENSE nvidiapkg-*/kernel
-Source0: nvidia-kmod-data-%{version}.tar.xz
+Source0: nvidia-kmod-data-%{version}.tar.xz
Source11: nvidia-kmodtool-excludekernel-filterfile
-Patch0: 3.11_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,12 +49,12 @@
%setup -q -c -T -a 0
# patch loop
-for arch in x86_64 i686 armv7hl
-do
-pushd nvidiapkg-${arch}
-%patch0 -p1
-popd
-done
+#for arch in x86_64 i686 armv7hl
+#do
+#pushd nvidiapkg-${arch}
+#patch0 -p1
+#popd
+#done
for kernel_version in %{?kernel_versions} ; do
@@ -60,7 +64,10 @@
%build
for kernel_version in %{?kernel_versions}; do
pushd _kmod_build_${kernel_version%%___*}/kernel/
- make %{?_smp_mflags} SYSSRC="${kernel_version##*___}" module
+ make %{?_smp_mflags} KERNEL_UNAME="${kernel_version%%___*}" module
+ popd
+ pushd _kmod_build_${kernel_version%%___*}/kernel/uvm
+ make %{?_smp_mflags} KERNEL_UNAME="${kernel_version%%___*}" module
popd
done
@@ -68,7 +75,9 @@
%install
rm -rf $RPM_BUILD_ROOT
for kernel_version in %{?kernel_versions}; do
- install -D -m 0755 _kmod_build_${kernel_version%%___*}/kernel/nvidia.ko $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/nvidia.ko
+ mkdir -p $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
+ install -D -m 0755 _kmod_build_${kernel_version%%___*}/kernel/{,uvm}/nvidia*.ko \
+ $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
done
%{?akmod_install}
@@ -78,99 +87,59 @@
%changelog
-* Wed Nov 06 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:325.15-2
-- use nvidia fix for get_num_physpages
-
-* Mon Nov 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:325.15-1.7
-- Rebuilt for kernel
-
-* Mon Nov 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:325.15-1.6
-- Rebuilt for kernel
-
-* Tue Oct 22 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:325.15-1.5
-- Rebuilt for kernel
-
-* Mon Oct 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:325.15-1.4
-- Rebuilt for kernel
-
-* Fri Oct 11 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:325.15-1.3
-- Rebuilt for kernel
-
-* Fri Oct 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:325.15-1.2
-- Rebuilt for kernel
-
-* Tue Oct 01 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:325.15-1.1
-- Rebuilt for current
+* Mon Nov 11 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.20-2
+- Add nvidia-uvm
+- Fix build directory layout - rfbz#2907
-* Sun Sep 29 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:325.15-1
-- Update to 325.15
+* Thu Nov 07 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:331.20-1
+- Update to 331.20 release
-* Sun Sep 29 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-3.1
-- Rebuilt for kernel
-
-* Tue Sep 17 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:319.32-3
-- patch for 3.11 kernel
-
-* Fri Aug 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-2.6
-- Rebuilt for kernel
+* Wed Nov 06 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:325.15-4
+- use nvidia fix for get_num_physpages
-* Thu Aug 22 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-2.5
-- Rebuilt for kernel
+* Mon Sep 16 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:325.15-3
+- patch for 3.12 git kernel
-* Fri Aug 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-2.4
-- Rebuilt for kernel
+* Tue Aug 06 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:325.15-2
+- rebuild for akmod as pae marco is broken
-* Tue Aug 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-2.3
-- Rebuilt for kernel
+* Tue Aug 06 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:325.15-1
+- Update to 325.15 release
+- redo kernel patch
-* Thu Aug 08 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-2.2
-- Rebuilt for kernel
+* Sun Jul 21 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:325.08-4
+- redo kernel patch
-* Tue Jul 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-2.1
-- Rebuilt for kernel
+* Tue Jul 16 2013 leigh scott <leigh123linux(a)googlemail.com> - 1:325.08-3
+- add better patch for 3.10 and 3.11 git kernels
-* Fri Jul 26 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:319.32-2
-- patch for 3.10 kernel
+* Mon Jul 08 2013 leigh scott <leigh123linux(a)googlemail.com> - 1:325.08-2
+- build for current
-* Fri Jul 26 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-1.1
-- Rebuilt for kernel
+* Sun Jul 07 2013 leigh scott <leigh123linux(a)googlemail.com> - 1:325.08-1
+- Update to 325.08
-* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-1
+* Fri Jun 28 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-1
- Update to 319.32
- Add support for armv7hl
-* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.23-1.7
-- Rebuilt for kernel
-
-* Sat Jul 06 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.23-1.6
-- Rebuilt for kernel
-
-* Sun Jun 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.23-1.5
-- Rebuilt for kernel
+* Fri May 31 2013 leigh scott <leigh123linux(a)googlemail.com> - 1:319.23-3
+- Patch for 3.10 kernel
-* Sat Jun 29 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.23-1.4
-- Rebuilt for kernel
-
-* Fri Jun 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.23-1.3
-- Rebuilt for current f19 kernel
-
-* Wed Jun 12 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.23-1.2
-- Rebuilt for current f19 kernel
-
-* Wed Jun 12 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.23-1.1
-- Rebuilt for kernel
+* Thu May 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.23-2
+- Build for akmods
* Thu May 23 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:319.23-1
- Update to 319.23
-* Tue May 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.17-1.1
-- Rebuilt for kernel
-
* Sat May 11 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:319.17-1
- Update to 319.17
+* Wed May 01 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.12-1
+- Update to 319.12
+
* Mon Apr 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:313.30-2
-- Build for akmod
+- Build for kernel akmods
* Thu Apr 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:313.30-1
- Update to 313.30
@@ -357,7 +326,7 @@
* Fri Jun 18 2010 Vallimar de Morieve <vallimar(a)gmail.com> - 1:256.35-1
- update to 256.35
-* Thu Jun 17 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:195.36.31-1
+* Thu Jun 17 2010 Nicolas Chaubvet <kwizart(a)gmail.com> - 1:195.36.31-1
- Update to 195.36.31
- Fix acpi_walk_namespace call with kernel 2.6.33 and later.
http://bugs.gentoo.org/show_bug.cgi?id=301318
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-19/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources 29 Sep 2013 23:32:56 -0000 1.59
+++ sources 11 Nov 2013 16:57:48 -0000 1.60
@@ -1 +1 @@
-c075f748ce929098c317704151ef7fc8 nvidia-kmod-data-325.15.tar.xz
+55ff14e616146f9d6828a6594bb159d5 nvidia-kmod-data-331.20.tar.xz
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-19/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore 13 Jul 2013 15:28:17 -0000 1.57
+++ .cvsignore 11 Nov 2013 16:57:48 -0000 1.58
@@ -1 +1 @@
-nvidia-kmod-data-319.32.tar.xz
+nvidia-kmod-data-331.20.tar.xz
11 years
rpms/xorg-x11-drv-nvidia/F-19 00-avoid-glamor.conf, NONE, 1.1 alternate-install-present, NONE, 1.1 .cvsignore, 1.57, 1.58 sources, 1.59, 1.60 xorg-x11-drv-nvidia.spec, 1.112, 1.113
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11319/F-19
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia.spec
Added Files:
00-avoid-glamor.conf alternate-install-present
Log Message:
Update to latest
--- NEW FILE 00-avoid-glamor.conf ---
#This file is provided by xorg-x11-drv-nvidia
#Do not edit
Section "Module"
Disable "glamoregl"
EndSection
--- NEW FILE alternate-install-present ---
This file is provided by RPMFusion project
Please look for documentation at http://rpmfusion.org/Howto/nVidia
To uninstall the package, use the following command:
$ sudo yum remove xorg-x11-drv-nvidia\* kmod-nvidia\*
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore 13 Jul 2013 15:21:44 -0000 1.57
+++ .cvsignore 11 Nov 2013 16:45:35 -0000 1.58
@@ -1,3 +1,3 @@
-NVIDIA-Linux-armv7l-gnueabihf-319.32.run
-NVIDIA-Linux-x86-319.32.run
-NVIDIA-Linux-x86_64-319.32.run
+NVIDIA-Linux-x86_64-331.20.run
+NVIDIA-Linux-x86-331.20.run
+NVIDIA-Linux-armv7l-gnueabihf-331.20.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources 29 Sep 2013 23:00:02 -0000 1.59
+++ sources 11 Nov 2013 16:45:36 -0000 1.60
@@ -1,3 +1,3 @@
-686e8d2293a8349c1b18bff1024c12a4 NVIDIA-Linux-armv7l-gnueabihf-325.15.run
-528fc538584de6446384b9cec3099d6c NVIDIA-Linux-x86-325.15.run
-323c3ef74f607aef63d602c7f297ce86 NVIDIA-Linux-x86_64-325.15.run
+7d10ca5e2bbb3c470a2e3366b5a33a32 NVIDIA-Linux-x86_64-331.20.run
+801aa04a087891690f1cac09575b2ba9 NVIDIA-Linux-x86-331.20.run
+2459508dca8cd7313a901a1c9cb321cb NVIDIA-Linux-armv7l-gnueabihf-331.20.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- xorg-x11-drv-nvidia.spec 2 Oct 2013 15:53:30 -0000 1.112
+++ xorg-x11-drv-nvidia.spec 11 Nov 2013 16:45:36 -0000 1.113
@@ -7,8 +7,8 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 325.15
-Release: 2%{?dist}
+Version: 331.20
+Release: 3%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -19,7 +19,9 @@
Source4: ftp://download.nvidia.com/XFree86/Linux-32bit-ARM/%{version}/NVIDIA-Linux...
Source2: 00-nvidia.conf
Source3: nvidia-xorg.conf
+Source5: 00-avoid-glamor.conf
Source6: blacklist-nouveau.conf
+Source7: alternate-install-present
BuildRequires: desktop-file-utils
%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
@@ -216,6 +218,7 @@
#Install static driver dependant configuration files
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+install -pm 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
@@ -232,6 +235,13 @@
#Workaround for self made xorg.conf using a Files section.
ln -fs ../../%{_nvidia_serie}/xorg $RPM_BUILD_ROOT%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version}
+#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
+
+#Alternate-install-present is checked by the nvidia .run
+install -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_nvidia_libdir}
+
#Install the initscript
tar jxf nvidia-persistenced-init.tar.bz2
%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
@@ -246,7 +256,7 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/nvidia
-%pre
+%pretrans
if [ "$1" -eq "1" ]; then
if [ -x %{_bindir}/nvidia-uninstall ]; then
%{_bindir}/nvidia-uninstall -s && rm -f %{_bindir}/nvidia-uninstall &>/dev/null || :
@@ -315,6 +325,8 @@
ISGRUB1=""
if [[ -f /boot/grub/grub.conf && ! -f /boot/grub2/grub.cfg ]] ; then
ISGRUB1="--grub"
+ else
+ sed -i -e 's|GRUB_GFXPAYLOAD_LINUX=text||g' /etc/default/grub
fi
if [ -x /sbin/grubby ] ; then
DIST=`rpm -E %%{?dist}`
@@ -364,6 +376,7 @@
%endif
%dir %{_sysconfdir}/nvidia
%config %{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
+%config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
%config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf
%config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf
%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
@@ -375,7 +388,8 @@
%{_bindir}/nvidia-cuda-mps-control
%{_bindir}/nvidia-cuda-mps-server
%{_bindir}/nvidia-persistenced
-%{_bindir}/nvidia-modprobe
+#nvidia-modprobe is setuid root to allow users to load the module in
+%attr(4755, root, root) %{_bindir}/nvidia-modprobe
%{_bindir}/nvidia-settings
%{_bindir}/nvidia-xconfig
# Xorg libs that do not need to be multilib
@@ -397,14 +411,16 @@
%defattr(-,root,root,-)
%dir %{_nvidia_libdir}
%config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
+%{_nvidia_libdir}/alternate-install-present
%{_nvidia_libdir}/*.so.*
%ifarch x86_64 i686
%dir %{_nvidia_libdir}/tls
-%{_nvidia_libdir}/tls/*.so*
+%{_nvidia_libdir}/tls/*.so.*
%exclude %{_libdir}/vdpau/libvdpau.*
-%{_libdir}/vdpau/libvdpau_nvidia.so*
+%{_libdir}/vdpau/libvdpau_nvidia.so.*
%exclude %{_libdir}/vdpau/libvdpau_trace.so*
%endif
+%{_libdir}/libcuda.so.1
%files devel
%defattr(-,root,root,-)
@@ -414,16 +430,41 @@
%{_nvidia_libdir}/libnvidia-compiler.so
%{_nvidia_libdir}/libnvidia-encode.so
%endif
+%ifarch i686
+%{_nvidia_libdir}/libEGL.so
+%{_nvidia_libdir}/libGLESv1_CM.so
+%{_nvidia_libdir}/libGLESv2.so
+%{_nvidia_libdir}/libnvidia-eglcore.so
+%{_nvidia_libdir}/libnvidia-glsi.so
+%endif
%{_nvidia_libdir}/libcuda.so
%{_nvidia_libdir}/libGL.so
%{_nvidia_libdir}/libnvidia-glcore.so
+%{_nvidia_libdir}/libnvidia-fbc.so
%{_nvidia_libdir}/libnvidia-ifr.so
%{_nvidia_libdir}/libnvcuvid.so
%{_nvidia_libdir}/libnvidia-ml.so
%{_nvidia_libdir}/libnvidia-opencl.so
-%{_nvidia_libdir}/libnvidia-vgxcfg.so
+%{_nvidia_libdir}/tls/libnvidia-tls.so
+%{_libdir}/libcuda.so
+%{_libdir}/vdpau/libvdpau_nvidia.so
%changelog
+* Mon Nov 11 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.20-3
+- move nvidia-uninstall to %%pretrans
+- Setuid root for nvidia-modprobe to allow text users to load modules
+- Disable GRUB_GFXPAYLOAD_LINUX=text in grub2 when uninstalling
+- Workaround for cuda availability - rfbz#2916
+- Add alternate-install-present in -libs to prevent .run to overwrite us
+
+* Thu Nov 07 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:331.20-2
+- remove conflicts xorg-x11-glamor
+- disable glamor module
+
+* Thu Nov 07 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:331.20-1
+- Update to 331.20
+- add conflicts xorg-x11-glamor
+
* Wed Oct 02 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:325.15-2
- Avoid to exclude libcuda.so in devel
- Drop desktop-file-install options not supported on EL6
11 years
rpms/xorg-x11-drv-nvidia/devel alternate-install-present, NONE, 1.1 xorg-x11-drv-nvidia.spec, 1.121, 1.122
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9930/devel
Modified Files:
xorg-x11-drv-nvidia.spec
Added Files:
alternate-install-present
Log Message:
Add few fixes
--- NEW FILE alternate-install-present ---
This file is provided by RPMFusion project
Please look for documentation at http://rpmfusion.org/Howto/nVidia
To uninstall the package, use the following command:
$ sudo yum remove xorg-x11-drv-nvidia\* kmod-nvidia\*
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- xorg-x11-drv-nvidia.spec 7 Nov 2013 14:09:54 -0000 1.121
+++ xorg-x11-drv-nvidia.spec 11 Nov 2013 16:27:39 -0000 1.122
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 331.20
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -21,6 +21,7 @@
Source3: nvidia-xorg.conf
Source5: 00-avoid-glamor.conf
Source6: blacklist-nouveau.conf
+Source7: alternate-install-present
BuildRequires: desktop-file-utils
%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
@@ -234,6 +235,13 @@
#Workaround for self made xorg.conf using a Files section.
ln -fs ../../%{_nvidia_serie}/xorg $RPM_BUILD_ROOT%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version}
+#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
+
+#Alternate-install-present is checked by the nvidia .run
+install -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_nvidia_libdir}
+
#Install the initscript
tar jxf nvidia-persistenced-init.tar.bz2
%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
@@ -248,7 +256,7 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/nvidia
-%pre
+%pretrans
if [ "$1" -eq "1" ]; then
if [ -x %{_bindir}/nvidia-uninstall ]; then
%{_bindir}/nvidia-uninstall -s && rm -f %{_bindir}/nvidia-uninstall &>/dev/null || :
@@ -317,6 +325,8 @@
ISGRUB1=""
if [[ -f /boot/grub/grub.conf && ! -f /boot/grub2/grub.cfg ]] ; then
ISGRUB1="--grub"
+ else
+ sed -i -e 's|GRUB_GFXPAYLOAD_LINUX=text||g' /etc/default/grub
fi
if [ -x /sbin/grubby ] ; then
DIST=`rpm -E %%{?dist}`
@@ -378,7 +388,8 @@
%{_bindir}/nvidia-cuda-mps-control
%{_bindir}/nvidia-cuda-mps-server
%{_bindir}/nvidia-persistenced
-%{_bindir}/nvidia-modprobe
+#nvidia-modprobe is setuid root to allow users to load the module in
+%attr(4755, root, root) %{_bindir}/nvidia-modprobe
%{_bindir}/nvidia-settings
%{_bindir}/nvidia-xconfig
# Xorg libs that do not need to be multilib
@@ -400,6 +411,7 @@
%defattr(-,root,root,-)
%dir %{_nvidia_libdir}
%config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
+%{_nvidia_libdir}/alternate-install-present
%{_nvidia_libdir}/*.so.*
%ifarch x86_64 i686
%dir %{_nvidia_libdir}/tls
@@ -408,6 +420,7 @@
%{_libdir}/vdpau/libvdpau_nvidia.so.*
%exclude %{_libdir}/vdpau/libvdpau_trace.so*
%endif
+%{_libdir}/libcuda.so.1
%files devel
%defattr(-,root,root,-)
@@ -433,9 +446,17 @@
%{_nvidia_libdir}/libnvidia-ml.so
%{_nvidia_libdir}/libnvidia-opencl.so
%{_nvidia_libdir}/tls/libnvidia-tls.so
+%{_libdir}/libcuda.so
%{_libdir}/vdpau/libvdpau_nvidia.so
%changelog
+* Mon Nov 11 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.20-3
+- move nvidia-uninstall to %%pretrans
+- Setuid root for nvidia-modprobe to allow text users to load modules
+- Disable GRUB_GFXPAYLOAD_LINUX=text in grub2 when uninstalling
+- Workaround for cuda availability - rfbz#2916
+- Add alternate-install-present in -libs to prevent .run to overwrite us
+
* Thu Nov 07 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:331.20-2
- remove conflicts xorg-x11-glamor
- disable glamor module
11 years
rpms/nvidia-kmod/devel nvidia-kmod.spec,1.137,1.138
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9612
Modified Files:
nvidia-kmod.spec
Log Message:
Add akmod back
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- nvidia-kmod.spec 11 Nov 2013 15:59:26 -0000 1.137
+++ nvidia-kmod.spec 11 Nov 2013 16:00:23 -0000 1.138
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-#global buildforkernels akmod
+%global buildforkernels akmod
Name: nvidia-kmod
Epoch: 1
11 years
rpms/nvidia-kmod/devel nvidia-kmod.spec,1.136,1.137
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9531
Modified Files:
nvidia-kmod.spec
Log Message:
Add uvm support and attempt to fix build directory layout
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- nvidia-kmod.spec 7 Nov 2013 01:18:06 -0000 1.136
+++ nvidia-kmod.spec 11 Nov 2013 15:59:26 -0000 1.137
@@ -3,13 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels akmod
+#global buildforkernels akmod
Name: nvidia-kmod
Epoch: 1
Version: 331.20
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -18,6 +18,10 @@
#ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run
#ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run
#ftp://download.nvidia.com/XFree86/Linux-32bit-ARM/%{version}/NVIDIA-Linux-armv7l-gnueabihf-%{version}.run
+#sh %{SOURCE0} --extract-only --target nvidiapkg-i686
+#sh %{SOURCE1} --extract-only --target nvidiapkg-x86_64
+#sh %{SOURCE4} --extract-only --target nvidiapkg-armv7hl
+#tar -cJf nvidia-kmod-data-%{version}.tar.xz nvidiapkg-*/LICENSE nvidiapkg-*/kernel
Source0: nvidia-kmod-data-%{version}.tar.xz
@@ -60,7 +64,10 @@
%build
for kernel_version in %{?kernel_versions}; do
pushd _kmod_build_${kernel_version%%___*}/kernel/
- make %{?_smp_mflags} SYSSRC="${kernel_version##*___}" module
+ make %{?_smp_mflags} KERNEL_UNAME="${kernel_version%%___*}" module
+ popd
+ pushd _kmod_build_${kernel_version%%___*}/kernel/uvm
+ make %{?_smp_mflags} KERNEL_UNAME="${kernel_version%%___*}" module
popd
done
@@ -68,7 +75,9 @@
%install
rm -rf $RPM_BUILD_ROOT
for kernel_version in %{?kernel_versions}; do
- install -D -m 0755 _kmod_build_${kernel_version%%___*}/kernel/nvidia.ko $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/nvidia.ko
+ mkdir -p $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
+ install -D -m 0755 _kmod_build_${kernel_version%%___*}/kernel/{,uvm}/nvidia*.ko \
+ $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
done
%{?akmod_install}
@@ -78,6 +87,10 @@
%changelog
+* Mon Nov 11 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.20-2
+- Add nvidia-uvm
+- Fix build directory layout - rfbz#2907
+
* Thu Nov 07 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:331.20-1
- Update to 331.20 release
11 years