Merge pull request #8653 from marcin-/master

add comar script for other nvidia drivers

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

@@ -0,0 +1,32 @@
+#!/usr/bin/python
+
+import os
+
+def postInstall(fromVersion, fromRelease, toVersion, toRelease):
+    if os.path.exists("/etc/default/grub"):
+        fileContent = open("/etc/default/grub").readlines()
+        new = []
+        for line in fileContent:
+            line = line.strip()
+            if line.startswith("#GRUB_CMDLINE_LINUX="): line = line[1:]
+            if line.startswith("GRUB_CMDLINE_LINUX="):
+                if not "rd.driver.blacklist=nouveau" in line:
+                    if not line[-2] == '"': line = "%s \"" % line[:-1]
+                    line = "%srd.driver.blacklist=nouveau\"" % line[:-1]
+            new.append(line)
+        with open("/etc/default/grub", "w") as f: f.write("\n".join(new))
+        os.system("grub2-mkconfig -o /boot/grub2/grub.cfg")
+
+def postRemove():
+    if os.path.exists("/etc/default/grub"):
+        fileContent = open("/etc/default/grub").readlines()
+        new = []
+        for line in fileContent:
+            line = line.strip()
+            if line.startswith("GRUB_CMDLINE_LINUX="):
+                if not "rd.driver.blacklist=nouveau" in line: return
+                line = "%s\"" % line[:-1-len("rd.driver.blacklist=nouveau")]
+                if line[-2] == " ": line = "%s\"" % line[:-2]
+            new.append(line)
+        with open("/etc/default/grub", "w") as f: f.write("\n".join(new))
+        os.system("grub2-mkconfig -o /boot/grub2/grub.cfg")

kernel/drivers/module-nvidia340/pspec.xml

@@ -72,6 +72,9 @@
         <BuildFlags>
             <Flag>noDelta</Flag>
         </BuildFlags>
+        <Provides>
+            <COMAR script="package.py">System.Package</COMAR>
+        </Provides>
     </Package>
 
     <Package>
@@ -108,6 +111,7 @@
         <Summary>NVIDIA driver sources for linux</Summary>
         <RuntimeDependencies>
             <Dependency>dkms</Dependency>
+            <Dependency>xorg-video-nvidia340</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc/modprobe.d/nvidia340-dkms.conf</Path>
@@ -125,10 +129,40 @@
             <Package>nvidia-current-dkms</Package>
             <Package>nvidia430-dkms</Package>
             <Package>nvidia390-dkms</Package>
+            <Package>nvidia340</Package>
         </Conflicts>
     </Package>
 
+    <Package>
+        <Name>nvidia340</Name>
+        <IsA>driver</IsA>
+        <Summary>Meata package for nvidia340 drivers</Summary>
+        <RuntimeDependencies>
+            <Dependency>module-nvidia340</Dependency>
+            <Dependency>xorg-video-nvidia340</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="data">/var/tmp/nvidia</Path>
+        </Files>
+        <BuildFlags>
+            <Flag>noDelta</Flag>
+        </BuildFlags>
+        <Conflicts>
+            <Package>nvidia340-dkms</Package>
+        </Conflicts>
+        <AdditionalFiles>
+            <AdditionalFile owner="root" permission="0644" target="/var/tmp/nvidia">nvidia.tmp</AdditionalFile>
+        </AdditionalFiles>
+    </Package>
+
     <History>
+        <Update release="33">
+            <Date>2020-07-05</Date>
+            <Version>340.108</Version>
+            <Comment>Add comar script and meta package</Comment>
+            <Name>Marcin Bojara</Name>
+            <Email>marcin.bojara@gmail.com</Email>
+        </Update>
         <Update release="32">
             <Date>2020-06-01</Date>
             <Version>340.108</Version>

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

@@ -0,0 +1,32 @@
+#!/usr/bin/python
+
+import os
+
+def postInstall(fromVersion, fromRelease, toVersion, toRelease):
+    if os.path.exists("/etc/default/grub"):
+        fileContent = open("/etc/default/grub").readlines()
+        new = []
+        for line in fileContent:
+            line = line.strip()
+            if line.startswith("#GRUB_CMDLINE_LINUX="): line = line[1:]
+            if line.startswith("GRUB_CMDLINE_LINUX="):
+                if not "rd.driver.blacklist=nouveau" in line:
+                    if not line[-2] == '"': line = "%s \"" % line[:-1]
+                    line = "%srd.driver.blacklist=nouveau\"" % line[:-1]
+            new.append(line)
+        with open("/etc/default/grub", "w") as f: f.write("\n".join(new))
+        os.system("grub2-mkconfig -o /boot/grub2/grub.cfg")
+
+def postRemove():
+    if os.path.exists("/etc/default/grub"):
+        fileContent = open("/etc/default/grub").readlines()
+        new = []
+        for line in fileContent:
+            line = line.strip()
+            if line.startswith("GRUB_CMDLINE_LINUX="):
+                if not "rd.driver.blacklist=nouveau" in line: return
+                line = "%s\"" % line[:-1-len("rd.driver.blacklist=nouveau")]
+                if line[-2] == " ": line = "%s\"" % line[:-2]
+            new.append(line)
+        with open("/etc/default/grub", "w") as f: f.write("\n".join(new))
+        os.system("grub2-mkconfig -o /boot/grub2/grub.cfg")

kernel/drivers/module-nvidia390/pspec.xml

@@ -101,6 +101,9 @@
         <BuildFlags>
             <Flag>noDelta</Flag>
         </BuildFlags>
+        <Provides>
+            <COMAR script="package.py">System.Package</COMAR>
+        </Provides>
     </Package>
 
     <Package>
@@ -148,6 +151,7 @@
         <Summary>NVIDIA driver sources for linux</Summary>
         <RuntimeDependencies>
             <Dependency>dkms</Dependency>
+            <Dependency>xorg-video-nvidia390</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc/modprobe.d/nvidia390-dkms.conf</Path>
@@ -165,10 +169,40 @@
             <Package>nvidia340-dkms</Package>
             <Package>nvidia430-dkms</Package>
             <Package>nvidia-current-dkms</Package>
+            <Package>nvidia390</Package>
         </Conflicts>
     </Package>
 
+    <Package>
+        <Name>nvidia390</Name>
+        <IsA>driver</IsA>
+        <Summary>Meata package for nvidia390 drivers</Summary>
+        <RuntimeDependencies>
+            <Dependency>module-nvidia390</Dependency>
+            <Dependency>xorg-video-nvidia390</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="data">/var/tmp/nvidia</Path>
+        </Files>
+        <BuildFlags>
+            <Flag>noDelta</Flag>
+        </BuildFlags>
+        <Conflicts>
+            <Package>nvidia390-dkms</Package>
+        </Conflicts>
+        <AdditionalFiles>
+            <AdditionalFile owner="root" permission="0644" target="/var/tmp/nvidia">nvidia.tmp</AdditionalFile>
+        </AdditionalFiles>
+    </Package>
+
     <History>
+        <Update release="9">
+            <Date>2020-07-05</Date>
+            <Version>390.132</Version>
+            <Comment>Add comar script and meta package</Comment>
+            <Name>Marcin Bojara</Name>
+            <Email>marcin.bojara@gmail.com</Email>
+        </Update>
         <Update release="8">
             <Date>2020-06-01</Date>
             <Version>390.132</Version>

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

@@ -0,0 +1,32 @@
+#!/usr/bin/python
+
+import os
+
+def postInstall(fromVersion, fromRelease, toVersion, toRelease):
+    if os.path.exists("/etc/default/grub"):
+        fileContent = open("/etc/default/grub").readlines()
+        new = []
+        for line in fileContent:
+            line = line.strip()
+            if line.startswith("#GRUB_CMDLINE_LINUX="): line = line[1:]
+            if line.startswith("GRUB_CMDLINE_LINUX="):
+                if not "rd.driver.blacklist=nouveau" in line:
+                    if not line[-2] == '"': line = "%s \"" % line[:-1]
+                    line = "%srd.driver.blacklist=nouveau\"" % line[:-1]
+            new.append(line)
+        with open("/etc/default/grub", "w") as f: f.write("\n".join(new))
+        os.system("grub2-mkconfig -o /boot/grub2/grub.cfg")
+
+def postRemove():
+    if os.path.exists("/etc/default/grub"):
+        fileContent = open("/etc/default/grub").readlines()
+        new = []
+        for line in fileContent:
+            line = line.strip()
+            if line.startswith("GRUB_CMDLINE_LINUX="):
+                if not "rd.driver.blacklist=nouveau" in line: return
+                line = "%s\"" % line[:-1-len("rd.driver.blacklist=nouveau")]
+                if line[-2] == " ": line = "%s\"" % line[:-2]
+            new.append(line)
+        with open("/etc/default/grub", "w") as f: f.write("\n".join(new))
+        os.system("grub2-mkconfig -o /boot/grub2/grub.cfg")

kernel/drivers/module-nvidia430/pspec.xml

@@ -134,6 +134,9 @@
         <BuildFlags>
             <Flag>noDelta</Flag>
         </BuildFlags>
+        <Provides>
+            <COMAR script="package.py">System.Package</COMAR>
+        </Provides>
     </Package>
 
     <Package>
@@ -176,6 +179,7 @@
         <Summary>NVIDIA driver sources for linux</Summary>
         <RuntimeDependencies>
             <Dependency>dkms</Dependency>
+            <Dependency>xorg-video-nvidia430</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc/modprobe.d/nvidia430-dkms.conf</Path>
@@ -193,10 +197,40 @@
             <Package>nvidia-current-dkms</Package>
             <Package>nvidia390-dkms</Package>
             <Package>nvidia340-dkms</Package>
+            <Package>nvidia430</Package>
         </Conflicts>
     </Package>
 
+    <Package>
+        <Name>nvidia430</Name>
+        <IsA>driver</IsA>
+        <Summary>Meata package for nvidia430 drivers</Summary>
+        <RuntimeDependencies>
+            <Dependency>module-nvidia430</Dependency>
+            <Dependency>xorg-video-nvidia430</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="data">/var/tmp/nvidia</Path>
+        </Files>
+        <BuildFlags>
+            <Flag>noDelta</Flag>
+        </BuildFlags>
+        <Conflicts>
+            <Package>nvidia390-dkms</Package>
+        </Conflicts>
+        <AdditionalFiles>
+            <AdditionalFile owner="root" permission="0644" target="/var/tmp/nvidia">nvidia.tmp</AdditionalFile>
+        </AdditionalFiles>
+    </Package>
+
     <History>
+        <Update release="6">
+            <Date>2020-07-05</Date>
+            <Version>430.64</Version>
+            <Comment>Add comar script and meta package</Comment>
+            <Name>Marcin Bojara</Name>
+            <Email>marcin.bojara@gmail.com</Email>
+        </Update>
         <Update release="5">
             <Date>2020-06-01</Date>
             <Version>430.64</Version>