Merge pull request #7385 from marcin-/master

nvidia: set version in dkms.conf
2020-01-08 17:58:36 +01:00
parent 2485c264f7 8b23f01012
commit d3081d8980
3 changed files with 6 additions and 2 deletions
@@ -31,7 +31,9 @@ def setup():
    
    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
@@ -1,5 +1,5 @@
 PACKAGE_NAME="nvidia"
-PACKAGE_VERSION="440.44"
+PACKAGE_VERSION="%VERSION%"
 AUTOINSTALL="yes"

 # By default, DKMS will add KERNELRELEASE to the make command line; however,
@@ -12,6 +12,9 @@
        <Summary>NVIDIA drivers for GeForce 6xxx and newer GPUs</Summary>
        <Description>NVIDIA graphics drivers provide optimized 2D/3D performance.</Description>
        <Archive sha1sum="fb412c254b9a9f42b7837691368aa883df7c23f1" type="binary">http://http.download.nvidia.com/XFree86/Linux-x86_64/440.44/NVIDIA-Linux-x86_64-440.44.run</Archive>
+        <AdditionalFiles>
+            <AdditionalFile owner="root" permission="0644" target="dkms.conf">dkms.conf</AdditionalFile>
+        </AdditionalFiles>
        <BuildDependencies>
            <Dependency version="5.4.6">kernel-module-headers</Dependency>
            <Dependency>libX11-devel</Dependency>
@@ -164,7 +167,6 @@
        </Files>
        <AdditionalFiles>
            <AdditionalFile owner="root" permission="0644" target="/etc/modprobe.d/nvidia-current-dkms.conf">modprobe.conf</AdditionalFile>
-            <AdditionalFile owner="root" permission="0644" target="/usr/src/nvidia-440.44/dkms.conf">dkms.conf</AdditionalFile>
            <AdditionalFile owner="root" permission="0644" target="/usr/share/X11/xorg.conf.d/10-nvidia-drm-outputclass.conf">xorg.conf</AdditionalFile>
        </AdditionalFiles>
        <BuildFlags>