pool/x11-tools
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 44152 from home:sndirsch:branches:X11:Utilities

Browse Source 
Copy from home:sndirsch:branches:X11:Utilities/x11-tools via accept of submit request 44152 revision 2.
Request was accepted with message:
Looks good. Thanks.

OBS-URL: https://build.opensuse.org/request/show/44152
OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/x11-tools?expand=0&rev=5
This commit is contained in:
Stefan Dirsch 2010-07-29 04:52:23 +00:00 committed by Git OBS Bridge
parent 66416f42ca
commit 46b54b9b76
4 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nvidia-post-install Normal file
View File

@ -0,0 +1,10 @@
#!/bin/sh
echo "blacklist nouveau" > /etc/modprobe.d/nvidia.conf
# recreate initrd without KMS, if the use of KMS is enabled in initrd
if grep -q NO_KMS_IN_INITRD=\"no\" /etc/sysconfig/kernel; then
sed -i 's/NO_KMS_IN_INITRD.*/NO_KMS_IN_INITRD="yes"/g' /etc/sysconfig/kernel
mkinitrd
fi

3
nvidia-post-uninstall Normal file
View File

@ -0,0 +1,3 @@
#!/bin/sh
rm /etc/modprobe.d/nvidia.conf

6
x11-tools.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jul 29 06:44:57 CEST 2010 - sndirsch@suse.de
- added distribution hook scripts for nvidia-installer to disable
nouveau module and remove it from initrd if required
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 1 19:06:04 CEST 2009 - sndirsch@suse.de Tue Sep 1 19:06:04 CEST 2009 - sndirsch@suse.de

10
x11-tools.spec
View File

@ -37,6 +37,8 @@ Source31: xim
Source32: xim.template Source32: xim.template
Source33: none Source33: none
Source34: sysconfig.language-%{name} Source34: sysconfig.language-%{name}
Source35: nvidia-post-install
Source36: nvidia-post-uninstall
BuildArch: noarch BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -68,6 +70,11 @@ mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates/
install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var/adm/fillup-templates/ install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var/adm/fillup-templates/
install -m 755 $RPM_SOURCE_DIR/switch2nv $RPM_BUILD_ROOT/usr/bin install -m 755 $RPM_SOURCE_DIR/switch2nv $RPM_BUILD_ROOT/usr/bin
install -m 755 $RPM_SOURCE_DIR/switch2nvidia $RPM_BUILD_ROOT/usr/bin install -m 755 $RPM_SOURCE_DIR/switch2nvidia $RPM_BUILD_ROOT/usr/bin
mkdir -p $RPM_BUILD_ROOT/usr/lib/nvidia
install -m 755 $RPM_SOURCE_DIR/nvidia-post-install \
$RPM_BUILD_ROOT/usr/lib/nvidia
install -m 755 $RPM_SOURCE_DIR/nvidia-post-uninstall \
$RPM_BUILD_ROOT/usr/lib/nvidia
%post %post
%{fillup_only -an language} %{fillup_only -an language}
@ -75,11 +82,14 @@ install -m 755 $RPM_SOURCE_DIR/switch2nvidia $RPM_BUILD_ROOT/usr/bin
%files %files
%defattr(-, root, root) %defattr(-, root, root)
%dir /etc/X11/xim.d %dir /etc/X11/xim.d
%dir /usr/lib/nvidia
/usr/bin/xf86debug /usr/bin/xf86debug
/usr/bin/wmlist /usr/bin/wmlist
/usr/bin/kroot /usr/bin/kroot
/usr/bin/switch2nv /usr/bin/switch2nv
/usr/bin/switch2nvidia /usr/bin/switch2nvidia
/usr/lib/nvidia/nvidia-post-install
/usr/lib/nvidia/nvidia-post-uninstall
/etc/X11/xim /etc/X11/xim
/etc/X11/xim.d/* /etc/X11/xim.d/*
/etc/skel/.xim.template /etc/skel/.xim.template