Skip to content

Archlinux Kernel based on different schedulers and some other performance improvements.

Remove conflict add nvidia-open module, add license for ZFS Module, fixup linux-cachyos-rc nvidia-open module

Peter Jungef66405a068a
diff --git a/linux-bore/PKGBUILD b/linux-bore/PKGBUILD
index 7fe7bad0..cfc8d436 100644
--- a/linux-bore/PKGBUILD
+++ b/linux-bore/PKGBUILD
@@ -422,8 +422,6 @@ prepare() {
--set-str DEFAULT_TCP_CONG bbr
fi
-
-
### Select THP
[ -z "$_hugepage" ] && _die "The value is empty. Choose the correct one again."
@@ -687,6 +685,7 @@ _package-zfs(){
pkgdesc="zfs module for the $pkgdesc kernel"
depends=('pahole' $pkgbase=$_kernver)
provides=('ZFS-MODULE')
+ license=('CDDL')
cd ${srcdir}/"zfs"
install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
@@ -712,7 +711,6 @@ _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=('NVIDIA-MODULE')
license=('GPL')
cd "${srcdir}/${_nv_open_pkg}"
diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD
index b4f795c1..2f2b50b5 100644
--- a/linux-cachyos-bore/PKGBUILD
+++ b/linux-cachyos-bore/PKGBUILD
@@ -685,6 +685,7 @@ _package-zfs(){
pkgdesc="zfs module for the $pkgdesc kernel"
depends=('pahole' $pkgbase=$_kernver)
provides=('ZFS-MODULE')
+ license=('CDDL')
cd ${srcdir}/"zfs"
install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
@@ -710,7 +711,6 @@ _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=('NVIDIA-MODULE')
license=('GPL')
cd "${srcdir}/${_nv_open_pkg}"
diff --git a/linux-cachyos-deckify/PKGBUILD b/linux-cachyos-deckify/PKGBUILD
index 862fad2d..446cc21b 100644
--- a/linux-cachyos-deckify/PKGBUILD
+++ b/linux-cachyos-deckify/PKGBUILD
@@ -723,6 +723,7 @@ _package-zfs(){
pkgdesc="zfs module for the $pkgdesc kernel"
depends=('pahole' $pkgbase=$_kernver)
provides=('ZFS-MODULE')
+ license=('CDDL')
cd ${srcdir}/"zfs"
install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
@@ -748,7 +749,6 @@ _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=('NVIDIA-MODULE')
license=('GPL')
cd "${srcdir}/${_nv_open_pkg}"
diff --git a/linux-cachyos-echo/PKGBUILD b/linux-cachyos-echo/PKGBUILD
index e259dfad..d11d2183 100644
--- a/linux-cachyos-echo/PKGBUILD
+++ b/linux-cachyos-echo/PKGBUILD
@@ -685,6 +685,7 @@ _package-zfs(){
pkgdesc="zfs module for the $pkgdesc kernel"
depends=('pahole' $pkgbase=$_kernver)
provides=('ZFS-MODULE')
+ license=('CDDL')
cd ${srcdir}/"zfs"
install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
@@ -710,7 +711,6 @@ _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=('NVIDIA-MODULE')
license=('GPL')
cd "${srcdir}/${_nv_open_pkg}"
diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD
index c8a45738..4f02f548 100644
--- a/linux-cachyos-eevdf/PKGBUILD
+++ b/linux-cachyos-eevdf/PKGBUILD
@@ -685,6 +685,7 @@ _package-zfs(){
pkgdesc="zfs module for the $pkgdesc kernel"
depends=('pahole' $pkgbase=$_kernver)
provides=('ZFS-MODULE')
+ license=('CDDL')
cd ${srcdir}/"zfs"
install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
@@ -710,7 +711,6 @@ _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=('NVIDIA-MODULE')
license=('GPL')
cd "${srcdir}/${_nv_open_pkg}"
diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD
index 562c58f1..cd07e3cf 100644
--- a/linux-cachyos-hardened/PKGBUILD
+++ b/linux-cachyos-hardened/PKGBUILD
@@ -722,6 +722,7 @@ _package-zfs(){
pkgdesc="zfs module for the $pkgdesc kernel"
depends=('pahole' $pkgbase=$_kernver)
provides=('ZFS-MODULE')
+ license=('CDDL')
cd ${srcdir}/"zfs"
install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
@@ -747,7 +748,6 @@ _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=('NVIDIA-MODULE')
license=('GPL')
cd "${srcdir}/${_nv_open_pkg}"
diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD
index 4a39e5b4..42b4bccd 100644
--- a/linux-cachyos-lts/PKGBUILD
+++ b/linux-cachyos-lts/PKGBUILD
@@ -753,6 +753,7 @@ _package-zfs(){
pkgdesc="zfs module for the $pkgdesc kernel"
depends=('pahole' $pkgbase=$_kernver)
provides=('ZFS-MODULE')
+ license=('CDDL')
cd ${srcdir}/"zfs"
install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
@@ -778,7 +779,6 @@ _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=('NVIDIA-MODULE')
license=('GPL')
cd "${srcdir}/${_nv_open_pkg}"
diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD
index 35ece5aa..bee78bfb 100644
--- a/linux-cachyos-rc/PKGBUILD
+++ b/linux-cachyos-rc/PKGBUILD
@@ -422,8 +422,6 @@ prepare() {
--set-str DEFAULT_TCP_CONG bbr
fi
-
-
### Select THP
[ -z "$_hugepage" ] && _die "The value is empty. Choose the correct one again."
@@ -687,7 +685,7 @@ _package-zfs(){
pkgdesc="zfs module for the $pkgdesc kernel"
depends=('pahole' $pkgbase=$_kernver)
provides=('ZFS-MODULE')
-
+ license=('CDDL')
local moduleprefix=${_major}.${_minor}-${_rcver}-${pkgrel}
cd ${srcdir}/"zfs"
@@ -715,12 +713,12 @@ _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=('NVIDIA-MODULE')
license=('GPL')
+ local moduleprefix=${_major}.${_minor}-${_rcver}-${pkgrel}
cd "${srcdir}/${_nv_open_pkg}"
- install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
- install -m644 kernel-open/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -dm755 "$pkgdir/usr/lib/modules/${moduleprefix}-${pkgsuffix}"
+ install -m644 kernel/*.ko "$pkgdir/usr/lib/modules/${moduleprefix}-${pkgsuffix}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 COPYING
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD
index 5692b309..0127a235 100644
--- a/linux-cachyos-rt-bore/PKGBUILD
+++ b/linux-cachyos-rt-bore/PKGBUILD
@@ -685,6 +685,7 @@ _package-zfs(){
pkgdesc="zfs module for the $pkgdesc kernel"
depends=('pahole' $pkgbase=$_kernver)
provides=('ZFS-MODULE')
+ license=('CDDL')
cd ${srcdir}/"zfs"
install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
@@ -710,7 +711,6 @@ _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=('NVIDIA-MODULE')
license=('GPL')
cd "${srcdir}/${_nv_open_pkg}"
diff --git a/linux-cachyos-sched-ext-debug/PKGBUILD b/linux-cachyos-sched-ext-debug/PKGBUILD
index 4d59162e..85966010 100644
--- a/linux-cachyos-sched-ext-debug/PKGBUILD
+++ b/linux-cachyos-sched-ext-debug/PKGBUILD
@@ -682,6 +682,7 @@ _package-zfs(){
pkgdesc="zfs module for the $pkgdesc kernel"
depends=('pahole' $pkgbase=$_kernver)
provides=('ZFS-MODULE')
+ license=('CDDL')
cd ${srcdir}/"zfs"
install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
@@ -707,7 +708,6 @@ _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=('NVIDIA-MODULE')
license=('GPL')
cd "${srcdir}/${_nv_open_pkg}"
diff --git a/linux-cachyos-sched-ext/PKGBUILD b/linux-cachyos-sched-ext/PKGBUILD
index 20b5447b..ba9c713a 100644
--- a/linux-cachyos-sched-ext/PKGBUILD
+++ b/linux-cachyos-sched-ext/PKGBUILD
@@ -685,6 +685,7 @@ _package-zfs(){
pkgdesc="zfs module for the $pkgdesc kernel"
depends=('pahole' $pkgbase=$_kernver)
provides=('ZFS-MODULE')
+ license=('CDDL')
cd ${srcdir}/"zfs"
install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
@@ -710,7 +711,6 @@ _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=('NVIDIA-MODULE')
license=('GPL')
cd "${srcdir}/${_nv_open_pkg}"
diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD
index cd203b4c..3ae68336 100644
--- a/linux-cachyos-server/PKGBUILD
+++ b/linux-cachyos-server/PKGBUILD
@@ -685,6 +685,7 @@ _package-zfs(){
pkgdesc="zfs module for the $pkgdesc kernel"
depends=('pahole' $pkgbase=$_kernver)
provides=('ZFS-MODULE')
+ license=('CDDL')
cd ${srcdir}/"zfs"
install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
@@ -710,7 +711,6 @@ _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=('NVIDIA-MODULE')
license=('GPL')
cd "${srcdir}/${_nv_open_pkg}"
diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD
index e0fa4775..5743d958 100644
--- a/linux-cachyos/PKGBUILD
+++ b/linux-cachyos/PKGBUILD
@@ -685,6 +685,7 @@ _package-zfs(){
pkgdesc="zfs module for the $pkgdesc kernel"
depends=('pahole' $pkgbase=$_kernver)
provides=('ZFS-MODULE')
+ license=('CDDL')
cd ${srcdir}/"zfs"
install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
@@ -710,7 +711,6 @@ _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=('NVIDIA-MODULE')
license=('GPL')
cd "${srcdir}/${_nv_open_pkg}"