Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

module-nvidia-current:versin bump

Browse Source
This commit is contained in:
alihanozturk
2016-03-05 11:54:06 +02:00
parent 39180badc8
commit 9a1d7870db
4 changed files with 141 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/drivers/module-nvidia-current/actions.py
+55 -19
View File
@@ -27,8 +27,8 @@ def setup():
shelltools.move("tmp/*", ".")
# Our libc is TLS enabled so use TLS library
shelltools.unlink("*-tls.so*")
shelltools.move("tls/*", ".")
#shelltools.unlink("*-tls.so*")
#shelltools.move("tls/*", ".")
# xorg-server provides libwfb.so
shelltools.unlink("libnvidia-wfb.so.*")
@@ -53,26 +53,49 @@ def install():
if not get.buildTYPE() == 'emul32':
# Kernel driver
pisitools.insinto("/lib/modules/%s/extra/nvidia" % KDIR,
pisitools.insinto("/lib/modules/%s/extra" % KDIR,
"kernel/nvidia.ko")
pisitools.insinto("/lib/modules/%s/extra/nvidia" % KDIR,
pisitools.insinto("/lib/modules/%s/extra" % KDIR,
"kernel/nvidia-uvm.ko")
pisitools.insinto("/lib/modules/%s/extra" % KDIR,
"kernel/nvidia-modeset.ko")
# Command line tools and their man pages
pisitools.dobin("nvidia-smi")
pisitools.doman("nvidia-smi.1.gz")
pisitools.dobin("nvidia-debugdump")
pisitools.dobin("nvidia-xconfig")
pisitools.doman("nvidia-xconfig.1.gz")
pisitools.dobin("nvidia-bug-report.sh")
pisitools.dobin("nvidia-cuda-mps-server")
pisitools.dobin("nvidia-cuda-mps-control")
pisitools.doman("nvidia-cuda-mps-control.1.gz")
pisitools.dobin("nvidia-modprobe")
pisitools.doman("nvidia-modprobe.1.gz")
pisitools.dobin("nvidia-persistenced")
pisitools.doman("nvidia-persistenced.1.gz")
pisitools.dobin("nvidia-settings")
pisitools.doman("nvidia-settings.1.gz")
### Libraries
# OpenGl library
pisitools.dolib("libGL.so.%s" % version, nvlibdir)
pisitools.dosym("libGL.so.%s" % version, "%s/libGL.so.1.2.0" % nvlibdir)
pisitools.dolib("libGL.so.%s" % version, libdir)
pisitools.dolib("libEGL.so.1", nvlibdir)
pisitools.dolib("libEGL_nvidia.so.%s" % version, libdir)
pisitools.dolib("libGLESv1_CM_nvidia.so.%s" % version, libdir)
pisitools.dolib("libGLESv2_nvidia.so.%s" % version, libdir)
# OpenCL
pisitools.insinto("/etc/OpenCL/vendors", "nvidia.icd")
pisitools.dolib("libnvidia-compiler.so.%s" % version, libdir)
pisitools.dosym("libnvidia-compiler.so.%s" % version, "%s/libnvidia-compiler.so.1" % libdir)
pisitools.dolib("libOpenCL.so.1.0.0", libdir)
pisitools.dosym("libOpenCL.so.1.0.0", "%s/libOpenCL.so.1.0" % libdir)
pisitools.dosym("libOpenCL.so.1.0", "%s/libOpenCL.so.1" % libdir)
@@ -99,8 +122,7 @@ def install():
pisitools.dolib("libnvidia-cfg.so.%s" % version, libdir)
pisitools.dosym("libnvidia-cfg.so.%s" % version, "%s/libnvidia-cfg.so.1" % libdir)
pisitools.dolib("libnvidia-compiler.so.%s" % version, libdir)
pisitools.dosym("libnvidia-compiler.so.%s" % version, "%s/libnvidia-compiler.so.1" % libdir)
# OpenGL core library and others
for lib in ("glcore", "tls", "encode", "fbc", "glsi", "ifr", "eglcore"):
@@ -108,22 +130,40 @@ def install():
pisitools.dosym("libnvidia-%s.so.%s" % (lib, version), "%s/libnvidia-%s.so.1" %(libdir, lib))
# VDPAU driver
pisitools.dolib("libvdpau_nvidia.so.%s" % version, "%s/vdpau" % nvlibdir)
pisitools.dosym("../nvidia-current/vdpau/libvdpau_nvidia.so.%s" % version, "%s/vdpau/libvdpau_nvidia.so.1" % nvlibdir.strip(driver_dir_name))
pisitools.dolib("libvdpau_nvidia.so.%s" % version, "%s/vdpau" % libdir)
pisitools.dosym("libvdpau_nvidia.so.%s" % version, "%s/libvdpau_nvidia.so" % libdir)
# nvidia-tls library
pisitools.dolib("libnvidia-tls.so.%s" % version, libdir)
pisitools.dolib("tls/libnvidia-tls.so.%s" % version, "%s/tls" % libdir)
# X modules
pisitools.dolib("nvidia_drv.so", "%s/modules/drivers" % nvlibdir)
pisitools.dosym("%s/modules/drivers/nvidia_drv.so" % nvlibdir, "%s/modules/drivers/nvidia_drv.so" % xorglibdir)
pisitools.dolib("libglx.so.%s" % version, "%s/modules/extensions" % nvlibdir)
pisitools.dosym("libglx.so.%s" % version, "%s/modules/extensions/libglx.so" % nvlibdir)
pisitools.dolib("nvidia_drv.so", "%s/modules/drivers" % xorglibdir)
pisitools.dolib("libglx.so.%s" % version, "%s/modules/extensions" % xorglibdir)
pisitools.dosym("libglx.so.%s" % version, "%s/modules/extensions/libglx.so.1" % xorglibdir)
pisitools.dolib("libGLX_nvidia.so.%s" % version, libdir)
pisitools.dosym("libGLX_nvidia.so.%s" % version, "%s/libGLX_indirect.so.0" % libdir)
# PTX JIT Compiler (Parallel Thread Execution (PTX) is a pseudo-assembly language for CUDA)
pisitools.dolib("libnvidia-ptxjitcompiler.so.%s" % version, libdir)
# Fat (multiarchitecture) binary loader
pisitools.dolib("libnvidia-fatbinaryloader.so.%s" % version, libdir)
pisitools.insinto("/usr/share/X11/xorg.conf.d", "nvidia-drm-outputclass.conf")
pisitools.insinto("/usr/share/nvidia", "nvidia-application-profiles-361.28-rc")
pisitools.insinto("/usr/share/nvidia", "nvidia-application-profiles-361.28-key-documentation")
pisitools.insinto("/usr/share/pixmaps", "nvidia-settings.png")
pisitools.dolib("libnvidia-gtk2.so.%s" % version, libdir)
pisitools.dolib("libnvidia-gtk3.so.%s" % version, libdir)
# Exit time for emul32 build
if get.buildTYPE() == 'emul32':
pisitools.insinto(datadir, "ld.so.conf", "32bit-ld.so.conf")
return
pisitools.insinto("/etc/OpenCL/vendors", "nvidia.icd")
pisitools.insinto(datadir, "ld.so.conf")
pisitools.insinto(datadir, "XvMCConfig")
@@ -137,7 +177,3 @@ def install():
# we have seperate packages for each of them. Nvidia provides tarballs for
# these binaries. Don't forget to update these package with each NVIDIA
# driver update.
# Nvidia-bug-report
# Comes with our own nvidia-xcfonig package
# pisitools.dobin("nvidia-bug-report.sh")
kernel/drivers/module-nvidia-current/files/modprobe.conf
+5 -8
View File
@@ -1,8 +1,5 @@
# Blacklist by default since nvidia* modules have the same aliases
blacklist nvidia-current
# Fail if nouveau loaded
install nvidia-current if /bin/grep -qw "^nouveau" /proc/modules; then /bin/false; else /sbin/modprobe -i nvidia-current $CMDLINE_OPTS; fi
# Load the right module when requested with the name "nvidia"
install nvidia M=$(/bin/readlink /etc/alternatives/libGL | /usr/bin/cut -d/ -f4 | /bin/grep nvidia) && /sbin/modprobe $M $CMDLINE_OPTS
blacklist nouveau
blacklist lbm-nouveau
options nouveau modeset=0
alias nouveau off
alias lbm-nouveau off
kernel/drivers/module-nvidia-current/files/nvidia-settings.desktop
+9
View File
@@ -0,0 +1,9 @@
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=NVIDIA X Server Settings
Comment=Configure NVIDIA X Server Settings
Exec=/usr/bin/nvidia-settings
Icon=/usr/share/pixmaps/nvidia-settings.png
Categories=Application;Settings;
kernel/drivers/module-nvidia-current/pspec.xml
+72 -4
View File
@@ -11,11 +11,13 @@
<License>NVIDIA</License>
<Summary>NVIDIA drivers for GeForce 6xxx and newer GPUs</Summary>
<Description>NVIDIA graphics drivers provide optimized 2D/3D performance.</Description>
<Archive sha1sum="2018e6b2729990ef380eee2b4e0154d6f3988ca6" type="binary">ftp://download.nvidia.com/XFree86/Linux-x86/358.16/NVIDIA-Linux-x86-358.16.run</Archive>
<Archive sha1sum="e12c1a1c395708efd313d13c29c8d8a2117c9109" type="binary">ftp://download.nvidia.com/XFree86/Linux-x86_64/358.16/NVIDIA-Linux-x86_64-358.16.run</Archive>
<Archive sha1sum="aa7057262cf34d53c87e2caf231301d5a499b13b" type="binary">ftp://download.nvidia.com/XFree86/Linux-x86/361.28/NVIDIA-Linux-x86-361.28.run</Archive>
<Archive sha1sum="b2cd218732d0a1eae1f290b1c38138f1080eb39c" type="binary">ftp://download.nvidia.com/XFree86/Linux-x86_64/361.28/NVIDIA-Linux-x86_64-361.28.run</Archive>
<BuildDependencies>
<Dependency version="4.4.1">kernel-module-headers</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>gtk2-devel</Dependency>
<Dependency>gtk3-devel</Dependency>
</BuildDependencies>
</Source>
@@ -25,6 +27,7 @@
<Summary>Kernel module for current NVIDIA graphics driver releases</Summary>
<RuntimeDependencies>
<Dependency version="4.4.1">kernel</Dependency>
<Dependency version="current">module-nvidia-current-userspace</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library" permanent="true">/lib/modules</Path>
@@ -33,6 +36,62 @@
<Flag>noDelta</Flag>
</BuildFlags>
</Package>
<Package>
<Name>module-nvidia-current-userspace</Name>
<IsA>data</IsA>
<Summary>Modprobe rules for nvidia-current kernel driver</Summary>
<Files>
<Path fileType="data">/etc/modprobe.d</Path>
</Files>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/etc/modprobe.d/blacklist-nouveau.conf">modprobe.conf</AdditionalFile>
</AdditionalFiles>
</Package>
<Package>
<Name>nvidia-settings</Name>
<IsA>app:gui</IsA>
<PartOf>hardware.graphics</PartOf>
<Summary>Settings for nvidia-current kernel driver</Summary>
<RuntimeDependencies>
<Dependency>atk</Dependency>
<Dependency>gtk2</Dependency>
<Dependency>gtk3</Dependency>
<Dependency>cairo</Dependency>
<Dependency>glib2</Dependency>
<Dependency>pango</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libXext</Dependency>
<Dependency>gdk-pixbuf</Dependency>
<Dependency version="current">module-nvidia-current</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/nvidia-settings</Path>
<Path fileType="man">/usr/share/man/man1/nvidia-settings.1</Path>
<Path fileType="library">/usr/lib/libnvidia-gtk*</Path>
<Path fileType="data">/usr/share/applications</Path>
<Path fileType="data">/usr/share/pixmaps</Path>
<Path fileType="data">/usr/share/nvidia</Path>
</Files>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/usr/share/applications/nvidia-settings.desktop">nvidia-settings.desktop</AdditionalFile>
</AdditionalFiles>
</Package>
<Package>
<Name>nvidia-xconfig</Name>
<IsA>app:console</IsA>
<PartOf>hardware.graphics</PartOf>
<Summary>Xconfig file for nvidia-current kernel driver</Summary>
<RuntimeDependencies>
<Dependency version="current">module-nvidia-current</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/nvidia-xconfig</Path>
<Path fileType="man">/usr/share/man/man1/nvidia-xconfig.1</Path>
</Files>
</Package>
<Package>
<Name>xorg-video-nvidia-current</Name>
@@ -49,7 +108,8 @@
<Path fileType="data">/etc/OpenCL</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="data">/usr/share</Path>
<Path fileType="data">/usr/share/X11</Path>
<Path fileType="data">/usr/share/nvidia-current</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="man">/usr/share/man</Path>
</Files>
@@ -72,6 +132,7 @@
<RuntimeDependencies>
<Dependency>zlib-32bit</Dependency>
<Dependency>mesa-32bit</Dependency>
<Dependency>glibc-32bit</Dependency>
<Dependency>libX11-32bit</Dependency>
<Dependency>libXext-32bit</Dependency>
<Dependency release="current">xorg-video-nvidia-current</Dependency>
@@ -89,6 +150,13 @@
</Package>
<History>
<Update release="53">
<Date>2016-02-25</Date>
<Version>361.28</Version>
<Comment>Version bump</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="52">
<Date>2016-02-04</Date>
<Version>358.16</Version>
@@ -461,4 +529,4 @@
<Email>marcin@pisilinux.org</Email>
</Update>
</History>
</PISI>
</PISI>