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

Merge pull request #8425 from IdrisKalp/master

Browse Source 
nvidia fix
This commit is contained in:
Idris Kalp
2020-04-14 18:59:14 +03:00
committed by GitHub
parent 25b217e8b9 ea8c57ae8b
commit c9c5bf8391
3 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/drivers/module-nvidia340/actions.py
+4 -3
View File
@@ -31,6 +31,7 @@ def setup():
shelltools.move("tmp/.manifest", ".") shelltools.move("tmp/.manifest", ".")
shelltools.system("patch -p1 < kernel-5.5.patch") shelltools.system("patch -p1 < kernel-5.5.patch")
shelltools.system("patch -p1 < kernel-5.6.patch") shelltools.system("patch -p1 < kernel-5.6.patch")
shelltools.system("patch -p1 < unfuck-340.108-build-fix.patch")
# Our libc is TLS enabled so use TLS library # Our libc is TLS enabled so use TLS library
@@ -93,9 +94,9 @@ def install():
# pisitools.dosym("libGL.so.%s" % version, "%s/libGL.so.1.2.0" % nvlibdir) # pisitools.dosym("libGL.so.%s" % version, "%s/libGL.so.1.2.0" % nvlibdir)
# OpenCL # OpenCL
pisitools.dolib("libOpenCL.so.1.0.0", 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.0", "%s/libOpenCL.so.1.0" % libdir)
pisitools.dosym("libOpenCL.so.1.0", "%s/libOpenCL.so.1" % libdir) #pisitools.dosym("libOpenCL.so.1.0", "%s/libOpenCL.so.1" % libdir)
pisitools.dolib("libnvidia-opencl.so.%s" % version, libdir) pisitools.dolib("libnvidia-opencl.so.%s" % version, libdir)
pisitools.dosym("libnvidia-opencl.so.%s" % version, "%s/libnvidia-opencl.so.1" % libdir) pisitools.dosym("libnvidia-opencl.so.%s" % version, "%s/libnvidia-opencl.so.1" % libdir)
kernel/drivers/module-nvidia340/pspec.xml
+2
View File
@@ -50,6 +50,7 @@
<Dependency>libXext</Dependency> <Dependency>libXext</Dependency>
<Dependency>xorg-server</Dependency> <Dependency>xorg-server</Dependency>
<Dependency>libX11</Dependency> <Dependency>libX11</Dependency>
<Dependency>opencl-icd</Dependency>
<AnyDependency> <AnyDependency>
<Dependency version="current">module-nvidia340</Dependency> <Dependency version="current">module-nvidia340</Dependency>
<Dependency>nvidia340-dkms</Dependency> <Dependency>nvidia340-dkms</Dependency>
@@ -84,6 +85,7 @@
<Dependency>zlib-32bit</Dependency> <Dependency>zlib-32bit</Dependency>
<Dependency>libX11-32bit</Dependency> <Dependency>libX11-32bit</Dependency>
<Dependency>libXext-32bit</Dependency> <Dependency>libXext-32bit</Dependency>
<Dependency>opencl-icd-32bit</Dependency>
<Dependency release="current">xorg-video-nvidia340</Dependency> <Dependency release="current">xorg-video-nvidia340</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Conflicts> <Conflicts>
kernel/drivers/module-nvidia430/files/mageia/NVIDIA-Linux-x86_64-430.64-kernel-5.5.patch
+1 -12
View File
@@ -383,15 +383,4 @@ diff -Nurp a/kernel/nvidia-drm/nvidia-drm-utils.h b/kernel/nvidia-drm/nvidia-drm
+#include "nv-drm.h" +#include "nv-drm.h"
#include "nvkms-kapi.h" #include "nvkms-kapi.h"
struct NvKmsKapiConnectorInfo* struct NvKmsKapiConnectorInfo*
diff -Nurp a/.manifest b/.manifest
--- a/.manifest 2019-10-27 13:55:51.000000000 +0200
+++ b/.manifest 2020-02-09 23:07:31.144465574 +0200
@@ -37,6 +37,7 @@ kernel/nvidia/nv-rsync.c 0644 KERNEL_MOD
kernel/nvidia/nv-msi.c 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman
kernel/conftest.sh 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman
kernel/common/inc/nv.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman
+kernel/common/inc/nv-drm.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman
kernel/common/inc/nv-pgprot.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman
kernel/common/inc/nv-mm.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman
kernel/common/inc/nv-timer.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman