Update to latest beta

el9
Nicolas Chauvet 13 years ago
parent d003a00b20
commit 9895306e4a

4
.gitignore vendored

@ -1,2 +1,2 @@
NVIDIA-Linux-x86-295.09.run NVIDIA-Linux-x86_64-295.17.run
NVIDIA-Linux-x86_64-295.09.run NVIDIA-Linux-x86-295.17.run

@ -1,2 +1,2 @@
cd0a20afd4d891adb884b9ad054fa2b6 NVIDIA-Linux-x86-295.09.run c69043648b0d988565b6f4c223784089 NVIDIA-Linux-x86_64-295.17.run
f9829d18aba6765336aed2aa02b92fe0 NVIDIA-Linux-x86_64-295.09.run 453d7585254cb2abb486135828278e43 NVIDIA-Linux-x86-295.17.run

@ -6,7 +6,7 @@
Name: xorg-x11-drv-nvidia Name: xorg-x11-drv-nvidia
Epoch: 1 Epoch: 1
Version: 295.09 Version: 295.17
Release: 1%{?dist} Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@ -138,7 +138,7 @@ This package provides the shared libraries for %{name}.
%setup -q -c -T %setup -q -c -T
sh %{SOURCE0} --extract-only --target nvidiapkg-x86 sh %{SOURCE0} --extract-only --target nvidiapkg-x86
sh %{SOURCE1} --extract-only --target nvidiapkg-x64 sh %{SOURCE1} --extract-only --target nvidiapkg-x64
tar -cjf nvidia-kmod-data-%{version}.tar.bz2 nvidiapkg-*/LICENSE nvidiapkg-*/kernel tar -cJf nvidia-kmod-data-%{version}.tar.xz nvidiapkg-*/LICENSE nvidiapkg-*/kernel
%ifarch %{ix86} %ifarch %{ix86}
ln -s nvidiapkg-x86 nvidiapkg ln -s nvidiapkg-x86 nvidiapkg
@ -255,14 +255,16 @@ rm -rf $RPM_BUILD_ROOT
%post %post
if [ "$1" -eq "1" ]; then if [ "$1" -eq "1" ]; then
# Enable nvidia driver when installing ISGRUB1=""
#%{_sbindir}/nvidia-config-display enable &>/dev/null ||: if [[ -f /boot/grub/grub.conf && ! -f /boot/grub2/grub2.cfg ]] ; then
# Add init script and start it ISGRUB1="--grub"
#/sbin/chkconfig --add nvidia ||: fi
#/etc/init.d/nvidia start &>/dev/null ||:
if [ -x /sbin/grubby ] ; then if [ -x /sbin/grubby ] ; then
GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel` GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
/sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nouveau.modeset=0 rd.driver.blacklist=nouveau' &>/dev/null /sbin/grubby $ISGRUB1 \
--update-kernel=${GRUBBYLASTKERNEL} \
--args='nouveau.modeset=0 rd.driver.blacklist=nouveau' \
&>/dev/null
fi fi
fi || : fi || :
@ -274,15 +276,15 @@ fi || :
%preun %preun
if [ "$1" -eq "0" ]; then if [ "$1" -eq "0" ]; then
# Disable driver on final removal ISGRUB1=""
#test -f %{_sbindir}/nvidia-config-display && %{_sbindir}/nvidia-config-display disable &>/dev/null if [[ -f /boot/grub/grub.conf && ! -f /boot/grub2/grub2.cfg ]] ; then
#%{_initrddir}/nvidia stop &>/dev/null ISGRUB1="--grub"
#/sbin/chkconfig --del nvidia &>/dev/null fi
#Clear grub option to disable nouveau for all kernels
if [ -x /sbin/grubby ] ; then if [ -x /sbin/grubby ] ; then
KERNELS=`ls /boot/vmlinuz-*%{?dist}.$(uname -m)*` KERNELS=`ls /boot/vmlinuz-*%{?dist}.$(uname -m)*`
for kernel in ${KERNELS} ; do for kernel in ${KERNELS} ; do
/sbin/grubby --update-kernel=${kernel} \ /sbin/grubby $ISGRUB1 \
--update-kernel=${kernel} \
--remove-args='nouveau.modeset=0 rdblacklist=nouveau rd.driver.blacklist=nouveau nomodeset' &>/dev/null --remove-args='nouveau.modeset=0 rdblacklist=nouveau rd.driver.blacklist=nouveau nomodeset' &>/dev/null
done done
fi fi
@ -347,6 +349,11 @@ fi ||:
%changelog %changelog
* Wed Feb 01 2012 Nicolas Chauvet <kwizart@gmail.com> - 1:295.17-1
- Update to 295.17 (beta)
- Fix kernel options when using grub legacy.
- Change nvidia-kmod-data archive to xz compression
* Sat Dec 31 2011 Nicolas Chauvet <kwizart@gmail.com> - 1:295.09-1 * Sat Dec 31 2011 Nicolas Chauvet <kwizart@gmail.com> - 1:295.09-1
- Update to 295.09 (beta) - Update to 295.09 (beta)
- Remove libcuda.so.1 filter - rfbz#2083 - Remove libcuda.so.1 filter - rfbz#2083

Loading…
Cancel
Save