nvidia430: add dkms support

kernel/drivers/module-nvidia-current/pspec.xml

@@ -176,6 +176,7 @@
         </BuildFlags>
         <Conflicts>
             <Package>module-nvidia-current</Package>
+            <Package>nvidia430-dkms</Package>
             <Package>nvidia390-dkms</Package>
         </Conflicts>
     </Package>

kernel/drivers/module-nvidia390/pspec.xml

@@ -153,6 +153,7 @@
         </BuildFlags>
         <Conflicts>
             <Package>module-nvidia390</Package>
+            <Package>nvidia430-dkms</Package>
             <Package>nvidia-current-dkms</Package>
         </Conflicts>
     </Package>

kernel/drivers/module-nvidia430/actions.py

@@ -41,6 +41,13 @@ def setup():
     shelltools.echo("ld.so.conf", nvlibdir)
     shelltools.echo("XvMCConfig", "%s/libXvMCNVIDIA.so" % nvlibdir)
 
+    # dkms    
+    shelltools.copytree("kernel", "kernel-dkms")
+    shelltools.unlink("kernel-dkms/dkms.conf")
+    shelltools.move("dkms.conf", "kernel-dkms/")
+    pisitools.dosed("kernel-dkms/Makefile", "CC \?= cc", "CC = /usr/bin/cc")
+    pisitools.dosed("kernel-dkms/dkms.conf", "%VERSION%", version)
+
 def build():
     # We don't need kernel module for emul32 build
     if get.buildTYPE() == 'emul32':
@@ -84,13 +91,15 @@ def install():
         #pisitools.dobin("nvidia-settings")
         #pisitools.doman("nvidia-settings.1.gz")
 
+        # dkms
+        pisitools.insinto("/usr/src/nvidia-%s" % version, "kernel-dkms/*")
 
     ###  Libraries
     
     # 32-bit libraries
     if get.buildTYPE() == 'emul32':
         pisitools.dolib("32/libGL.so.%s" % version, nvlibdir)
-		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)
         pisitools.dosym("libGL.so.%s" % version, "%s/libGL.so.1" % nvlibdir)
         pisitools.dosym("libGL.so.%s" % version, "%s/libGL.so" % nvlibdir)
     
@@ -143,7 +152,7 @@ def install():
     else:
         # OpenGl library
         pisitools.dolib("libGL.so.%s" % version, nvlibdir)
-		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)
         pisitools.dosym("libGL.so.%s" % version, "%s/libGL.so.1" % nvlibdir)
         pisitools.dosym("libGL.so.%s" % version, "%s/libGL.so" % nvlibdir)
         

kernel/drivers/module-nvidia430/comar/package-emul32.py

@@ -1,25 +0,0 @@
-#!/usr/bin/python
-
-import os
-
-driver_dir_name = "nvidia-current"
-libdir = "/usr/lib32/%s" % driver_dir_name
-datadir = "/usr/share/%s" % driver_dir_name
-
-def postInstall(fromVersion, fromRelease, toVersion, toRelease):
-    os.system(" /usr/sbin/alternatives \
-                --install   /usr/lib32/libGL.so.1.2.0               libGL-32bit                  %(libdir)s/libGL.so.1.2.0     50 \
-                --slave     /usr/lib32/xorg/modules/volatile        xorg-modules-volatile-32bit  %(libdir)s/modules"
-                % {"libdir": libdir, "datadir": datadir})
-#                --slave     /etc/ld.so.conf.d/10-nvidia-32bit.conf  nvidia-ldsoconf-32bit        %(datadir)s/32bit-ld.so.conf"
-
-    # If this driver is in use, refresh links after installation.
-    if os.readlink("/etc/alternatives/libGL-32bit") == "%s/libGL.so.1.2.0" % libdir:
-        os.system("/usr/sbin/alternatives --set libGL-32bit %s/libGL.so.1.2.0" % libdir)
-        os.system("/sbin/ldconfig -X")
-
-def preRemove():
-    # FIXME This is not needed when upgrading package; but pisi does not
-    #       provide a way to learn operation type.
-    #os.system("/usr/sbin/alternatives --remove libGL-32bit %s/libGL.so.1.2.0" % libdir)
-    pass

kernel/drivers/module-nvidia430/comar/package.py

@@ -1,26 +0,0 @@
-#!/usr/bin/python
-
-import os
-
-driver_dir_name = "nvidia-current"
-libdir = "/usr/lib/%s" % driver_dir_name
-datadir = "/usr/share/%s" % driver_dir_name
-
-def postInstall(fromVersion, fromRelease, toVersion, toRelease):
-    os.system(" /usr/sbin/alternatives \
-                --install   /usr/lib/libGL.so.1.2.0                 libGL                   %(libdir)s/libGL.so.1.2.0     50 \
-                --slave     /usr/lib/xorg/modules/volatile          xorg-modules-volatile   %(libdir)s/modules"
-                % {"libdir": libdir, "datadir": datadir})
-#                --slave     /etc/X11/XvMCConfig                     XvMCConfig              %(datadir)s/XvMCConfig \
-#                --slave     /etc/ld.so.conf.d/10-nvidia.conf        nvidia-ldsoconf         %(datadir)s/ld.so.conf"
-
-    # If this driver is in use, refresh links after installation.
-    if os.readlink("/etc/alternatives/libGL") == "%s/libGL.so.1.2.0" % libdir:
-        os.system("/usr/sbin/alternatives --set libGL %s/libGL.so.1.2.0" % libdir)
-        os.system("/sbin/ldconfig -X")
-
-def preRemove():
-    # FIXME This is not needed when upgrading package; but pisi does not
-    #       provide a way to learn operation type.
-    #os.system("/usr/sbin/alternatives --remove libGL %s/libGL.so.1.2.0" % libdir)
-    pass

kernel/drivers/module-nvidia430/files/dkms.conf

@@ -0,0 +1,19 @@
+PACKAGE_NAME="nvidia"
+PACKAGE_VERSION="%VERSION%"
+AUTOINSTALL="yes"
+
+# By default, DKMS will add KERNELRELEASE to the make command line; however,
+# this will cause the kernel module build to infer that it was invoked via
+# Kbuild directly instead of DKMS. The dkms(8) manual page recommends quoting
+# the 'make' command name to suppress this behavior.
+MAKE[0]="'make' -j5 NV_EXCLUDE_BUILD_MODULES='' KERNEL_UNAME=${kernelver} modules"
+
+# The list of kernel modules was generated by nvidia-installer at runtime.
+BUILT_MODULE_NAME[0]="nvidia"
+DEST_MODULE_LOCATION[0]="/extra"
+BUILT_MODULE_NAME[1]="nvidia-uvm"
+DEST_MODULE_LOCATION[1]="/extra"
+BUILT_MODULE_NAME[2]="nvidia-modeset"
+DEST_MODULE_LOCATION[2]="/extra"
+BUILT_MODULE_NAME[3]="nvidia-drm"
+DEST_MODULE_LOCATION[3]="/extra"

kernel/drivers/module-nvidia430/files/xorg.conf

@@ -0,0 +1,8 @@
+Section "OutputClass"
+    Identifier "nvidia"
+    MatchDriver "nvidia-drm"
+    Driver "nvidia"
+    Option "AllowEmptyInitialConfiguration"
+    ModulePath "/usr/lib/nvidia/xorg"
+    ModulePath "/usr/lib/xorg/modules"
+EndSection

kernel/drivers/module-nvidia430/pspec.xml

@@ -19,7 +19,7 @@
             <Dependency>gtk3-devel</Dependency>
         </BuildDependencies>
         <AdditionalFiles>
-<!--             <AdditionalFile owner="root" permission="0644" target="header-fix.patch">header-fix.patch</AdditionalFile> -->
+            <AdditionalFile owner="root" permission="0644" target="dkms.conf">dkms.conf</AdditionalFile>
         </AdditionalFiles>
     </Source>
 
@@ -41,6 +41,9 @@
         <BuildFlags>
             <Flag>noDelta</Flag>
         </BuildFlags>
+        <Conflicts>
+            <Package>nvidia430-dkms</Package>
+        </Conflicts>
     </Package>
 
     <!--<Package>
@@ -110,7 +113,10 @@
             <Dependency>xorg-server</Dependency>
             <Dependency>opencl-icd</Dependency>
             <Dependency>vulkan</Dependency>         
+            <AnyDependency>
                 <Dependency version="current">module-nvidia430</Dependency>
+                <Dependency>nvidia430-dkms</Dependency>
+            </AnyDependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="data">/etc/OpenCL</Path>
@@ -121,9 +127,6 @@
             <Path fileType="doc">/usr/share/doc</Path>
             <Path fileType="man">/usr/share/man</Path>
         </Files>
-        <Provides>
-            <COMAR script="package.py">System.Package</COMAR>
-        </Provides>
         <BuildFlags>
             <Flag>noDelta</Flag>
         </BuildFlags>
@@ -157,15 +160,44 @@
             <Path fileType="library">/usr/lib32</Path>
             <Path fileType="library">/usr/share/nvidia430/32bit-ld.so.conf</Path>
         </Files>
-        <Provides>
-            <COMAR script="package-emul32.py">System.Package</COMAR>
-        </Provides>
         <BuildFlags>
             <Flag>noDelta</Flag>
         </BuildFlags>
     </Package>
 
+    <Package>
+        <Name>nvidia430-dkms</Name>
+        <IsA>driver</IsA>
+        <Summary>NVIDIA driver sources for linux</Summary>
+        <RuntimeDependencies>
+            <Dependency>dkms</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="config">/etc/modprobe.d/nvidia430-dkms.conf</Path>
+            <Path fileType="data">/usr/src/nvidia*</Path>
+        </Files>
+        <AdditionalFiles>
+            <AdditionalFile owner="root" permission="0644" target="/etc/modprobe.d/nvidia430-dkms.conf">modprobe.conf</AdditionalFile>
+            <AdditionalFile owner="root" permission="0644" target="/usr/share/X11/xorg.conf.d/10-nvidia-drm-outputclass.conf">xorg.conf</AdditionalFile>
+        </AdditionalFiles>
+        <BuildFlags>
+            <Flag>noDelta</Flag>
+        </BuildFlags>
+        <Conflicts>
+            <Package>module-nvidia430</Package>
+            <Package>nvidia-current-dkms</Package>
+            <Package>nvidia390-dkms</Package>
+        </Conflicts>
+    </Package>
+
     <History>
+        <Update release="2">
+            <Date>2020-01-09</Date>
+            <Version>430.64</Version>
+            <Comment>Add dkms support</Comment>
+            <Name>Marcin Bojara</Name>
+            <Email>marcin.bojara@gmail.com</Email>
+        </Update>
         <Update release="1">
             <Date>2019-11-03</Date>
             <Version>430.64</Version>