Make open nvidia modules conflict with closed ones (#267)

CachyOS · Jul 11, 2024 · 820acd4 · 820acd4
1 parent 95918f1
commit 820acd4
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 0 deletions.
diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD
@@ -715,6 +715,7 @@ _package-nvidia(){
     pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
     depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
     provides=('NVIDIA-MODULE')
+    conflicts=("$pkgbase-nvidia-open")
     license=('custom')
 
     cd "${srcdir}/${_nv_pkg}/"
@@ -728,6 +729,7 @@ _package-nvidia-open(){
     pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
     depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
     provides=('NVIDIA-MODULE')
+    conflicts=("$pkgbase-nvidia")
     license=(GPL-1.0-only)
 
     cd "${srcdir}/${_nv_open_pkg}"

diff --git a/linux-cachyos-deckify/PKGBUILD b/linux-cachyos-deckify/PKGBUILD
@@ -717,6 +717,7 @@ _package-nvidia(){
     pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
     depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
     provides=('NVIDIA-MODULE')
+    conflicts=("$pkgbase-nvidia-open")
     license=('custom')
 
     cd "${srcdir}/${_nv_pkg}/"
@@ -730,6 +731,7 @@ _package-nvidia-open(){
     pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
     depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
     provides=('NVIDIA-MODULE')
+    conflicts=("$pkgbase-nvidia")
     license=(GPL-1.0-only)
 
     cd "${srcdir}/${_nv_open_pkg}"

diff --git a/linux-cachyos-echo/PKGBUILD b/linux-cachyos-echo/PKGBUILD
@@ -715,6 +715,7 @@ _package-nvidia(){
     pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
     depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
     provides=('NVIDIA-MODULE')
+    conflicts=("$pkgbase-nvidia-open")
     license=('custom')
 
     cd "${srcdir}/${_nv_pkg}/"
@@ -728,6 +729,7 @@ _package-nvidia-open(){
     pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
     depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
     provides=('NVIDIA-MODULE')
+    conflicts=("$pkgbase-nvidia")
     license=(GPL-1.0-only)
 
     cd "${srcdir}/${_nv_open_pkg}"

diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD
@@ -715,6 +715,7 @@ _package-nvidia(){
     pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
     depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
     provides=('NVIDIA-MODULE')
+    conflicts=("$pkgbase-nvidia-open")
     license=('custom')
 
     cd "${srcdir}/${_nv_pkg}/"
@@ -728,6 +729,7 @@ _package-nvidia-open(){
     pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
     depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
     provides=('NVIDIA-MODULE')
+    conflicts=("$pkgbase-nvidia")
     license=(GPL-1.0-only)
 
     cd "${srcdir}/${_nv_open_pkg}"

diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD
@@ -714,6 +714,7 @@ _package-nvidia(){
     pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
     depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
     provides=('NVIDIA-MODULE')
+    conflicts=("$pkgbase-nvidia-open")
     license=('custom')
 
     cd "${srcdir}/${_nv_pkg}/"
@@ -727,6 +728,7 @@ _package-nvidia-open(){
     pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
     depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
     provides=('NVIDIA-MODULE')
+    conflicts=("$pkgbase-nvidia")
     license=(GPL-1.0-only)
 
     cd "${srcdir}/${_nv_open_pkg}"

diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD
@@ -783,6 +783,7 @@ _package-nvidia(){
     pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
     depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
     provides=('NVIDIA-MODULE')
+    conflicts=("$pkgbase-nvidia-open")
     license=('custom')
 
     cd "${srcdir}/${_nv_pkg}/"
@@ -796,6 +797,7 @@ _package-nvidia-open(){
     pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
     depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
     provides=('NVIDIA-MODULE')
+    conflicts=("$pkgbase-nvidia")
     license=(GPL-1.0-only)
 
     cd "${srcdir}/${_nv_open_pkg}"

diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD
@@ -716,6 +716,7 @@ _package-nvidia(){
     pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
     depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
     provides=('NVIDIA-MODULE')
+    conflicts=("$pkgbase-nvidia-open")
     license=('custom')
 
     local moduleprefix=${_major}.${_minor}-${_rcver}-${pkgrel}
@@ -730,6 +731,7 @@ _package-nvidia-open(){
     pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
     depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
     provides=('NVIDIA-MODULE')
+    conflicts=("$pkgbase-nvidia")
     license=(GPL-1.0-only)
 
     local moduleprefix=${_major}.${_minor}-${_rcver}-${pkgrel}

diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD
@@ -715,6 +715,7 @@ _package-nvidia(){
     pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
     depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
     provides=('NVIDIA-MODULE')
+    conflicts=("$pkgbase-nvidia-open")
     license=('custom')
 
     cd "${srcdir}/${_nv_pkg}/"
@@ -728,6 +729,7 @@ _package-nvidia-open(){
     pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
     depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
     provides=('NVIDIA-MODULE')
+    conflicts=("$pkgbase-nvidia")
     license=(GPL-1.0-only)
 
     cd "${srcdir}/${_nv_open_pkg}"

diff --git a/linux-cachyos-sched-ext/PKGBUILD b/linux-cachyos-sched-ext/PKGBUILD
@@ -715,6 +715,7 @@ _package-nvidia(){
     pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
     depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
     provides=('NVIDIA-MODULE')
+    conflicts=("$pkgbase-nvidia-open")
     license=('custom')
 
     cd "${srcdir}/${_nv_pkg}/"
@@ -728,6 +729,7 @@ _package-nvidia-open(){
     pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
     depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
     provides=('NVIDIA-MODULE')
+    conflicts=("$pkgbase-nvidia")
     license=(GPL-1.0-only)
 
     cd "${srcdir}/${_nv_open_pkg}"

diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD
@@ -715,6 +715,7 @@ _package-nvidia(){
     pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
     depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
     provides=('NVIDIA-MODULE')
+    conflicts=("$pkgbase-nvidia-open")
     license=('custom')
 
     cd "${srcdir}/${_nv_pkg}/"
@@ -728,6 +729,7 @@ _package-nvidia-open(){
     pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
     depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
     provides=('NVIDIA-MODULE')
+    conflicts=("$pkgbase-nvidia")
     license=(GPL-1.0-only)
 
     cd "${srcdir}/${_nv_open_pkg}"

diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD
@@ -715,6 +715,7 @@ _package-nvidia(){
     pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
     depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
     provides=('NVIDIA-MODULE')
+    conflicts=("$pkgbase-nvidia-open")
     license=('custom')
 
     cd "${srcdir}/${_nv_pkg}/"
@@ -728,6 +729,7 @@ _package-nvidia-open(){
     pkgdesc="nvidia open modules of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
     depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
     provides=('NVIDIA-MODULE')
+    conflicts=("$pkgbase-nvidia")
     license=(GPL-1.0-only)
 
     cd "${srcdir}/${_nv_open_pkg}"