Skip to content

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

fix: refactor modules dir to use version file (#272)

Vladislav Nepogodin4a0effed9e1e
diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD
index 87798958..0dcdd109 100644
--- a/linux-cachyos-bore/PKGBUILD
+++ b/linux-cachyos-bore/PKGBUILD
@@ -705,9 +705,12 @@ _package-zfs(){
provides=('ZFS-MODULE')
license=('CDDL')
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
cd ${srcdir}/"zfs"
- install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
- install -m644 module/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -dm755 "${modulesdir}"
+ install -m644 module/*.ko "${modulesdir}"
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
# sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
}
@@ -719,9 +722,12 @@ _package-nvidia(){
conflicts=("$pkgbase-nvidia-open")
license=('custom')
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
cd "${srcdir}/${_nv_pkg}/"
- install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
- install -m644 kernel/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -dm755 "${modulesdir}"
+ install -m644 kernel/*.ko "${modulesdir}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 LICENSE
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
}
@@ -733,9 +739,12 @@ _package-nvidia-open(){
conflicts=("$pkgbase-nvidia")
license=(GPL-1.0-only)
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
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 "${modulesdir}"
+ install -m644 kernel-open/*.ko "${modulesdir}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 COPYING
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
diff --git a/linux-cachyos-deckify/PKGBUILD b/linux-cachyos-deckify/PKGBUILD
index efae3e71..6bc86e4c 100644
--- a/linux-cachyos-deckify/PKGBUILD
+++ b/linux-cachyos-deckify/PKGBUILD
@@ -707,9 +707,12 @@ _package-zfs(){
provides=('ZFS-MODULE')
license=('CDDL')
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
cd ${srcdir}/"zfs"
- install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
- install -m644 module/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -dm755 "${modulesdir}"
+ install -m644 module/*.ko "${modulesdir}"
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
# sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
}
@@ -721,9 +724,12 @@ _package-nvidia(){
conflicts=("$pkgbase-nvidia-open")
license=('custom')
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
cd "${srcdir}/${_nv_pkg}/"
- install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
- install -m644 kernel/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -dm755 "${modulesdir}"
+ install -m644 kernel/*.ko "${modulesdir}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 LICENSE
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
}
@@ -735,9 +741,12 @@ _package-nvidia-open(){
conflicts=("$pkgbase-nvidia")
license=(GPL-1.0-only)
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
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 "${modulesdir}"
+ install -m644 kernel-open/*.ko "${modulesdir}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 COPYING
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
diff --git a/linux-cachyos-echo/PKGBUILD b/linux-cachyos-echo/PKGBUILD
index 12c65ab2..d61df1dd 100644
--- a/linux-cachyos-echo/PKGBUILD
+++ b/linux-cachyos-echo/PKGBUILD
@@ -705,9 +705,12 @@ _package-zfs(){
provides=('ZFS-MODULE')
license=('CDDL')
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
cd ${srcdir}/"zfs"
- install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
- install -m644 module/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -dm755 "${modulesdir}"
+ install -m644 module/*.ko "${modulesdir}"
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
# sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
}
@@ -719,9 +722,12 @@ _package-nvidia(){
conflicts=("$pkgbase-nvidia-open")
license=('custom')
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
cd "${srcdir}/${_nv_pkg}/"
- install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
- install -m644 kernel/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -dm755 "${modulesdir}"
+ install -m644 kernel/*.ko "${modulesdir}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 LICENSE
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
}
@@ -733,9 +739,12 @@ _package-nvidia-open(){
conflicts=("$pkgbase-nvidia")
license=(GPL-1.0-only)
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
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 "${modulesdir}"
+ install -m644 kernel-open/*.ko "${modulesdir}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 COPYING
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD
index 3f08ede0..7e85752e 100644
--- a/linux-cachyos-eevdf/PKGBUILD
+++ b/linux-cachyos-eevdf/PKGBUILD
@@ -705,9 +705,12 @@ _package-zfs(){
provides=('ZFS-MODULE')
license=('CDDL')
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
cd ${srcdir}/"zfs"
- install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
- install -m644 module/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -dm755 "${modulesdir}"
+ install -m644 module/*.ko "${modulesdir}"
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
# sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
}
@@ -719,9 +722,12 @@ _package-nvidia(){
conflicts=("$pkgbase-nvidia-open")
license=('custom')
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
cd "${srcdir}/${_nv_pkg}/"
- install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
- install -m644 kernel/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -dm755 "${modulesdir}"
+ install -m644 kernel/*.ko "${modulesdir}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 LICENSE
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
}
@@ -733,9 +739,12 @@ _package-nvidia-open(){
conflicts=("$pkgbase-nvidia")
license=(GPL-1.0-only)
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
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 "${modulesdir}"
+ install -m644 kernel-open/*.ko "${modulesdir}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 COPYING
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD
index e29b11ef..926cb13d 100644
--- a/linux-cachyos-hardened/PKGBUILD
+++ b/linux-cachyos-hardened/PKGBUILD
@@ -704,9 +704,12 @@ _package-zfs(){
provides=('ZFS-MODULE')
license=('CDDL')
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
cd ${srcdir}/"zfs"
- install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
- install -m644 module/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -dm755 "${modulesdir}"
+ install -m644 module/*.ko "${modulesdir}"
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
# sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
}
@@ -718,9 +721,12 @@ _package-nvidia(){
conflicts=("$pkgbase-nvidia-open")
license=('custom')
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
cd "${srcdir}/${_nv_pkg}/"
- install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
- install -m644 kernel/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -dm755 "${modulesdir}"
+ install -m644 kernel/*.ko "${modulesdir}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 LICENSE
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
}
@@ -732,9 +738,12 @@ _package-nvidia-open(){
conflicts=("$pkgbase-nvidia")
license=(GPL-1.0-only)
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
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 "${modulesdir}"
+ install -m644 kernel-open/*.ko "${modulesdir}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 COPYING
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD
index 160740c3..06fe1f3a 100644
--- a/linux-cachyos-lts/PKGBUILD
+++ b/linux-cachyos-lts/PKGBUILD
@@ -773,9 +773,12 @@ _package-zfs(){
provides=('ZFS-MODULE')
license=('CDDL')
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
cd ${srcdir}/"zfs"
- install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
- install -m644 module/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -dm755 "${modulesdir}"
+ install -m644 module/*.ko "${modulesdir}"
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
# sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
}
@@ -787,9 +790,12 @@ _package-nvidia(){
conflicts=("$pkgbase-nvidia-open")
license=('custom')
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
cd "${srcdir}/${_nv_pkg}/"
- install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
- install -m644 kernel/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -dm755 "${modulesdir}"
+ install -m644 kernel/*.ko "${modulesdir}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 LICENSE
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
}
@@ -801,9 +807,12 @@ _package-nvidia-open(){
conflicts=("$pkgbase-nvidia")
license=(GPL-1.0-only)
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
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 "${modulesdir}"
+ install -m644 kernel-open/*.ko "${modulesdir}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 COPYING
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD
index 4ff3f20a..a9a6b8e4 100644
--- a/linux-cachyos-rc/PKGBUILD
+++ b/linux-cachyos-rc/PKGBUILD
@@ -704,11 +704,13 @@ _package-zfs(){
depends=('pahole' $pkgbase=$_kernver)
provides=('ZFS-MODULE')
license=('CDDL')
- local moduleprefix=${_major}.${_minor}-${_rcver}-${pkgrel}
+
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
cd ${srcdir}/"zfs"
- install -dm755 "$pkgdir/usr/lib/modules/${moduleprefix}-${pkgsuffix}"
- install -m644 module/*.ko "$pkgdir/usr/lib/modules/${moduleprefix}-${pkgsuffix}"
+ install -dm755 "${modulesdir}"
+ install -m644 module/*.ko "${modulesdir}"
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
# sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
}
@@ -720,10 +722,12 @@ _package-nvidia(){
conflicts=("$pkgbase-nvidia-open")
license=('custom')
- local moduleprefix=${_major}.${_minor}-${_rcver}-${pkgrel}
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
cd "${srcdir}/${_nv_pkg}/"
- install -dm755 "$pkgdir/usr/lib/modules/${moduleprefix}-${pkgsuffix}"
- install -m644 kernel/*.ko "$pkgdir/usr/lib/modules/${moduleprefix}-${pkgsuffix}"
+ install -dm755 "${modulesdir}"
+ install -m644 kernel/*.ko "${modulesdir}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 LICENSE
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
}
@@ -735,10 +739,12 @@ _package-nvidia-open(){
conflicts=("$pkgbase-nvidia")
license=(GPL-1.0-only)
- local moduleprefix=${_major}.${_minor}-${_rcver}-${pkgrel}
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
cd "${srcdir}/${_nv_open_pkg}"
- install -dm755 "$pkgdir/usr/lib/modules/${moduleprefix}-${pkgsuffix}"
- install -m644 kernel-open/*.ko "$pkgdir/usr/lib/modules/${moduleprefix}-${pkgsuffix}"
+ install -dm755 "${modulesdir}"
+ install -m644 kernel-open/*.ko "${modulesdir}"
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 e36da6b8..a4afe32a 100644
--- a/linux-cachyos-rt-bore/PKGBUILD
+++ b/linux-cachyos-rt-bore/PKGBUILD
@@ -705,9 +705,12 @@ _package-zfs(){
provides=('ZFS-MODULE')
license=('CDDL')
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
cd ${srcdir}/"zfs"
- install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
- install -m644 module/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -dm755 "${modulesdir}"
+ install -m644 module/*.ko "${modulesdir}"
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
# sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
}
@@ -719,9 +722,12 @@ _package-nvidia(){
conflicts=("$pkgbase-nvidia-open")
license=('custom')
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
cd "${srcdir}/${_nv_pkg}/"
- install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
- install -m644 kernel/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -dm755 "${modulesdir}"
+ install -m644 kernel/*.ko "${modulesdir}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 LICENSE
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
}
@@ -733,9 +739,12 @@ _package-nvidia-open(){
conflicts=("$pkgbase-nvidia")
license=(GPL-1.0-only)
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
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 "${modulesdir}"
+ install -m644 kernel-open/*.ko "${modulesdir}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 COPYING
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
diff --git a/linux-cachyos-sched-ext/PKGBUILD b/linux-cachyos-sched-ext/PKGBUILD
index 79dd2fcc..0103ea22 100644
--- a/linux-cachyos-sched-ext/PKGBUILD
+++ b/linux-cachyos-sched-ext/PKGBUILD
@@ -705,9 +705,12 @@ _package-zfs(){
provides=('ZFS-MODULE')
license=('CDDL')
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
cd ${srcdir}/"zfs"
- install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
- install -m644 module/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -dm755 "${modulesdir}"
+ install -m644 module/*.ko "${modulesdir}"
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
# sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
}
@@ -719,9 +722,12 @@ _package-nvidia(){
conflicts=("$pkgbase-nvidia-open")
license=('custom')
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
cd "${srcdir}/${_nv_pkg}/"
- install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
- install -m644 kernel/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -dm755 "${modulesdir}"
+ install -m644 kernel/*.ko "${modulesdir}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 LICENSE
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
}
@@ -733,9 +739,12 @@ _package-nvidia-open(){
conflicts=("$pkgbase-nvidia")
license=(GPL-1.0-only)
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
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 "${modulesdir}"
+ install -m644 kernel-open/*.ko "${modulesdir}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 COPYING
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD
index 986a20c4..98e9629a 100644
--- a/linux-cachyos-server/PKGBUILD
+++ b/linux-cachyos-server/PKGBUILD
@@ -705,9 +705,12 @@ _package-zfs(){
provides=('ZFS-MODULE')
license=('CDDL')
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
cd ${srcdir}/"zfs"
- install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
- install -m644 module/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -dm755 "${modulesdir}"
+ install -m644 module/*.ko "${modulesdir}"
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
# sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
}
@@ -719,9 +722,12 @@ _package-nvidia(){
conflicts=("$pkgbase-nvidia-open")
license=('custom')
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
cd "${srcdir}/${_nv_pkg}/"
- install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
- install -m644 kernel/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -dm755 "${modulesdir}"
+ install -m644 kernel/*.ko "${modulesdir}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 LICENSE
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
}
@@ -733,9 +739,12 @@ _package-nvidia-open(){
conflicts=("$pkgbase-nvidia")
license=(GPL-1.0-only)
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
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 "${modulesdir}"
+ install -m644 kernel-open/*.ko "${modulesdir}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 COPYING
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD
index 757bd46a..96b13782 100644
--- a/linux-cachyos/PKGBUILD
+++ b/linux-cachyos/PKGBUILD
@@ -705,9 +705,12 @@ _package-zfs(){
provides=('ZFS-MODULE')
license=('CDDL')
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
cd ${srcdir}/"zfs"
- install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
- install -m644 module/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -dm755 "${modulesdir}"
+ install -m644 module/*.ko "${modulesdir}"
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
# sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
}
@@ -719,9 +722,12 @@ _package-nvidia(){
conflicts=("$pkgbase-nvidia-open")
license=('custom')
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
cd "${srcdir}/${_nv_pkg}/"
- install -dm755 "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
- install -m644 kernel/*.ko "$pkgdir/usr/lib/modules/${_kernver}-${pkgsuffix}"
+ install -dm755 "${modulesdir}"
+ install -m644 kernel/*.ko "${modulesdir}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 LICENSE
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +
}
@@ -733,9 +739,12 @@ _package-nvidia-open(){
conflicts=("$pkgbase-nvidia")
license=(GPL-1.0-only)
+ cd ${srcdir}/$_srcname
+ local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
+
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 "${modulesdir}"
+ install -m644 kernel-open/*.ko "${modulesdir}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 COPYING
find "$pkgdir" -name '*.ko' -exec zstd --rm -10 {} +