Reworking ZFS build lock in RT kernels

Signed-off-by: Piotr Gorski <[email protected]>
CachyOS · Nov 2, 2023 · f976981 · f976981
1 parent 126e339
commit f976981
Show file tree

Hide file tree

Showing 16 changed files with 64 additions and 24 deletions.
diff --git a/linux-bore/.SRCINFO b/linux-bore/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by makepkg 6.0.2
-# Wed Nov  1 20:57:21 UTC 2023
+# Thu Nov  2 22:06:43 UTC 2023
 pkgbase = linux-bore
 	pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements
 	pkgver = 6.6.0

diff --git a/linux-bore/PKGBUILD b/linux-bore/PKGBUILD
@@ -210,6 +210,11 @@ source=(
     "auto-cpu-optimization.sh"
     "${_patchsource}/all/0001-cachyos-base-all.patch")
 
+# WARNING The ZFS module doesn't build with selected RT sched due to licensing issues."
+if [[ "$_cpusched" = "rt" || "$_cpusched" = "bore-rt" ]]; then
+    unset _build_zfs
+fi
+
 # ZFS support
 if [ -n "$_build_zfs" ]; then
     makedepends+=(git)
@@ -678,7 +683,7 @@ build() {
         make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules
     fi
 
-    if [[ "$_cpusched" != "rt" || "$_cpusched" != "bore-rt" ]] && [ -n "$_build_zfs" ]; then
+    if [ -n "$_build_zfs" ]; then
         cd ${srcdir}/"zfs"
 
         local CONFIGURE_FLAGS=()
@@ -857,7 +862,7 @@ _package-schedulers() {
 }
 
 pkgname=("$pkgbase" "$pkgbase-headers")
-[[ "$_cpusched" != "rt" || "$_cpusched" != "bore-rt" ]] && [ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
+[ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
 [ -n "$_build_nvidia" ] && pkgname+=("$pkgbase-nvidia")
 [ "$_cpusched" = "sched-ext" ] && pkgname+=("$pkgbase-schedulers")
 for _p in "${pkgname[@]}"; do

diff --git a/linux-cachyos-bore-rt/.SRCINFO b/linux-cachyos-bore-rt/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by makepkg 6.0.2
-# Wed Nov  1 20:58:03 UTC 2023
+# Thu Nov  2 22:15:31 UTC 2023
 pkgbase = linux-cachyos-bore-rt
 	pkgdesc = Linux kernel with BORE-RT patches by CachyOS with other patches and improvements
 	pkgver = 6.6.0

diff --git a/linux-cachyos-bore-rt/PKGBUILD b/linux-cachyos-bore-rt/PKGBUILD
@@ -210,6 +210,11 @@ source=(
     "auto-cpu-optimization.sh"
     "${_patchsource}/all/0001-cachyos-base-all.patch")
 
+# WARNING The ZFS module doesn't build with selected RT sched due to licensing issues."
+if [[ "$_cpusched" = "rt" || "$_cpusched" = "bore-rt" ]]; then
+    unset _build_zfs
+fi
+
 # ZFS support
 if [ -n "$_build_zfs" ]; then
     makedepends+=(git)
@@ -678,7 +683,7 @@ build() {
         make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules
     fi
 
-    if [[ "$_cpusched" != "rt" || "$_cpusched" != "bore-rt" ]] && [ -n "$_build_zfs" ]; then
+    if [ -n "$_build_zfs" ]; then
         cd ${srcdir}/"zfs"
 
         local CONFIGURE_FLAGS=()
@@ -857,7 +862,7 @@ _package-schedulers() {
 }
 
 pkgname=("$pkgbase" "$pkgbase-headers")
-[[ "$_cpusched" != "rt" || "$_cpusched" != "bore-rt" ]] && [ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
+[ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
 [ -n "$_build_nvidia" ] && pkgname+=("$pkgbase-nvidia")
 [ "$_cpusched" = "sched-ext" ] && pkgname+=("$pkgbase-schedulers")
 for _p in "${pkgname[@]}"; do

diff --git a/linux-cachyos-bore/.SRCINFO b/linux-cachyos-bore/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by makepkg 6.0.2
-# Wed Nov  1 20:57:49 UTC 2023
+# Thu Nov  2 22:07:46 UTC 2023
 pkgbase = linux-cachyos-bore
 	pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements
 	pkgver = 6.6.0

diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD
@@ -210,6 +210,11 @@ source=(
     "auto-cpu-optimization.sh"
     "${_patchsource}/all/0001-cachyos-base-all.patch")
 
+# WARNING The ZFS module doesn't build with selected RT sched due to licensing issues."
+if [[ "$_cpusched" = "rt" || "$_cpusched" = "bore-rt" ]]; then
+    unset _build_zfs
+fi
+
 # ZFS support
 if [ -n "$_build_zfs" ]; then
     makedepends+=(git)
@@ -678,7 +683,7 @@ build() {
         make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules
     fi
 
-    if [[ "$_cpusched" != "rt" || "$_cpusched" != "bore-rt" ]] && [ -n "$_build_zfs" ]; then
+    if [ -n "$_build_zfs" ]; then
         cd ${srcdir}/"zfs"
 
         local CONFIGURE_FLAGS=()
@@ -857,7 +862,7 @@ _package-schedulers() {
 }
 
 pkgname=("$pkgbase" "$pkgbase-headers")
-[[ "$_cpusched" != "rt" || "$_cpusched" != "bore-rt" ]] && [ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
+[ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
 [ -n "$_build_nvidia" ] && pkgname+=("$pkgbase-nvidia")
 [ "$_cpusched" = "sched-ext" ] && pkgname+=("$pkgbase-schedulers")
 for _p in "${pkgname[@]}"; do

diff --git a/linux-cachyos-eevdf/.SRCINFO b/linux-cachyos-eevdf/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by makepkg 6.0.2
-# Wed Nov  1 20:58:17 UTC 2023
+# Thu Nov  2 22:08:50 UTC 2023
 pkgbase = linux-cachyos-eevdf
 	pkgdesc = Linux EEVDF scheduler Kernel by CachyOS with other patches and improvements
 	pkgver = 6.6.0

diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD
@@ -210,6 +210,11 @@ source=(
     "auto-cpu-optimization.sh"
     "${_patchsource}/all/0001-cachyos-base-all.patch")
 
+# WARNING The ZFS module doesn't build with selected RT sched due to licensing issues."
+if [[ "$_cpusched" = "rt" || "$_cpusched" = "bore-rt" ]]; then
+    unset _build_zfs
+fi
+
 # ZFS support
 if [ -n "$_build_zfs" ]; then
     makedepends+=(git)
@@ -678,7 +683,7 @@ build() {
         make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules
     fi
 
-    if [[ "$_cpusched" != "rt" || "$_cpusched" != "bore-rt" ]] && [ -n "$_build_zfs" ]; then
+    if [ -n "$_build_zfs" ]; then
         cd ${srcdir}/"zfs"
 
         local CONFIGURE_FLAGS=()
@@ -857,7 +862,7 @@ _package-schedulers() {
 }
 
 pkgname=("$pkgbase" "$pkgbase-headers")
-[[ "$_cpusched" != "rt" || "$_cpusched" != "bore-rt" ]] && [ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
+[ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
 [ -n "$_build_nvidia" ] && pkgname+=("$pkgbase-nvidia")
 [ "$_cpusched" = "sched-ext" ] && pkgname+=("$pkgbase-schedulers")
 for _p in "${pkgname[@]}"; do

diff --git a/linux-cachyos-rc/.SRCINFO b/linux-cachyos-rc/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by makepkg 6.0.2
-# Wed Nov  1 20:59:03 UTC 2023
+# Thu Nov  2 22:09:54 UTC 2023
 pkgbase = linux-cachyos-rc
 	pkgdesc = Linux EEVDF-BORE scheduler Kernel by CachyOS and with some other patches and other improvements
 	pkgver = 6.6.rc7

diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD
@@ -209,6 +209,11 @@ source=(
     "auto-cpu-optimization.sh"
     "${_patchsource}/all/0001-cachyos-base-all.patch")
 
+# WARNING The ZFS module doesn't build with selected RT sched due to licensing issues."
+if [[ "$_cpusched" = "rt" || "$_cpusched" = "bore-rt" ]]; then
+    unset _build_zfs
+fi
+
 # ZFS support
 if [ -n "$_build_zfs" ]; then
     makedepends+=(git)
@@ -677,7 +682,7 @@ build() {
         make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules
     fi
 
-    if [[ "$_cpusched" != "rt" || "$_cpusched" != "bore-rt" ]] && [ -n "$_build_zfs" ]; then
+    if [ -n "$_build_zfs" ]; then
         cd ${srcdir}/"zfs"
 
         local CONFIGURE_FLAGS=()
@@ -859,7 +864,7 @@ _package-schedulers() {
 }
 
 pkgname=("$pkgbase" "$pkgbase-headers")
-[[ "$_cpusched" != "rt" || "$_cpusched" != "bore-rt" ]] && [ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
+[ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
 [ -n "$_build_nvidia" ] && pkgname+=("$pkgbase-nvidia")
 [ "$_cpusched" = "sched-ext" ] && pkgname+=("$pkgbase-schedulers")
 for _p in "${pkgname[@]}"; do

diff --git a/linux-cachyos-rt/.SRCINFO b/linux-cachyos-rt/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by makepkg 6.0.2
-# Wed Nov  1 20:59:18 UTC 2023
+# Thu Nov  2 22:10:26 UTC 2023
 pkgbase = linux-cachyos-rt
 	pkgdesc = Linux kernel with RT patches by CachyOS with other patches and improvements
 	pkgver = 6.6.0

diff --git a/linux-cachyos-rt/PKGBUILD b/linux-cachyos-rt/PKGBUILD
@@ -210,6 +210,11 @@ source=(
     "auto-cpu-optimization.sh"
     "${_patchsource}/all/0001-cachyos-base-all.patch")
 
+# WARNING The ZFS module doesn't build with selected RT sched due to licensing issues."
+if [[ "$_cpusched" = "rt" || "$_cpusched" = "bore-rt" ]]; then
+    unset _build_zfs
+fi
+
 # ZFS support
 if [ -n "$_build_zfs" ]; then
     makedepends+=(git)
@@ -678,7 +683,7 @@ build() {
         make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules
     fi
 
-    if [[ "$_cpusched" != "rt" || "$_cpusched" != "bore-rt" ]] && [ -n "$_build_zfs" ]; then
+    if [ -n "$_build_zfs" ]; then
         cd ${srcdir}/"zfs"
 
         local CONFIGURE_FLAGS=()
@@ -857,7 +862,7 @@ _package-schedulers() {
 }
 
 pkgname=("$pkgbase" "$pkgbase-headers")
-[[ "$_cpusched" != "rt" || "$_cpusched" != "bore-rt" ]] && [ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
+[ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
 [ -n "$_build_nvidia" ] && pkgname+=("$pkgbase-nvidia")
 [ "$_cpusched" = "sched-ext" ] && pkgname+=("$pkgbase-schedulers")
 for _p in "${pkgname[@]}"; do

diff --git a/linux-cachyos-server/.SRCINFO b/linux-cachyos-server/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by makepkg 6.0.2
-# Wed Nov  1 20:59:32 UTC 2023
+# Thu Nov  2 22:10:58 UTC 2023
 pkgbase = linux-cachyos-server
 	pkgdesc = Linux EEVDF scheduler Kernel by CachyOS targeted for Servers
 	pkgver = 6.6.0

diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD
@@ -210,6 +210,11 @@ source=(
     "auto-cpu-optimization.sh"
     "${_patchsource}/all/0001-cachyos-base-all.patch")
 
+# WARNING The ZFS module doesn't build with selected RT sched due to licensing issues."
+if [[ "$_cpusched" = "rt" || "$_cpusched" = "bore-rt" ]]; then
+    unset _build_zfs
+fi
+
 # ZFS support
 if [ -n "$_build_zfs" ]; then
     makedepends+=(git)
@@ -678,7 +683,7 @@ build() {
         make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules
     fi
 
-    if [[ "$_cpusched" != "rt" || "$_cpusched" != "bore-rt" ]] && [ -n "$_build_zfs" ]; then
+    if [ -n "$_build_zfs" ]; then
         cd ${srcdir}/"zfs"
 
         local CONFIGURE_FLAGS=()
@@ -857,7 +862,7 @@ _package-schedulers() {
 }
 
 pkgname=("$pkgbase" "$pkgbase-headers")
-[[ "$_cpusched" != "rt" || "$_cpusched" != "bore-rt" ]] && [ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
+[ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
 [ -n "$_build_nvidia" ] && pkgname+=("$pkgbase-nvidia")
 [ "$_cpusched" = "sched-ext" ] && pkgname+=("$pkgbase-schedulers")
 for _p in "${pkgname[@]}"; do

diff --git a/linux-cachyos/.SRCINFO b/linux-cachyos/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by makepkg 6.0.2
-# Wed Nov  1 20:57:36 UTC 2023
+# Thu Nov  2 22:07:15 UTC 2023
 pkgbase = linux-cachyos
 	pkgdesc = Linux EEVDF-BORE scheduler Kernel by CachyOS with other patches and improvements
 	pkgver = 6.6.0

diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD
@@ -210,6 +210,11 @@ source=(
     "auto-cpu-optimization.sh"
     "${_patchsource}/all/0001-cachyos-base-all.patch")
 
+# WARNING The ZFS module doesn't build with selected RT sched due to licensing issues."
+if [[ "$_cpusched" = "rt" || "$_cpusched" = "bore-rt" ]]; then
+    unset _build_zfs
+fi
+
 # ZFS support
 if [ -n "$_build_zfs" ]; then
     makedepends+=(git)
@@ -678,7 +683,7 @@ build() {
         make ${BUILD_FLAGS[*]} ${MODULE_FLAGS[*]} -j$(nproc) modules
     fi
 
-    if [[ "$_cpusched" != "rt" || "$_cpusched" != "bore-rt" ]] && [ -n "$_build_zfs" ]; then
+    if [ -n "$_build_zfs" ]; then
         cd ${srcdir}/"zfs"
 
         local CONFIGURE_FLAGS=()
@@ -857,7 +862,7 @@ _package-schedulers() {
 }
 
 pkgname=("$pkgbase" "$pkgbase-headers")
-[[ "$_cpusched" != "rt" || "$_cpusched" != "bore-rt" ]] && [ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
+[ -n "$_build_zfs" ] && pkgname+=("$pkgbase-zfs")
 [ -n "$_build_nvidia" ] && pkgname+=("$pkgbase-nvidia")
 [ "$_cpusched" = "sched-ext" ] && pkgname+=("$pkgbase-schedulers")
 for _p in "${pkgname[@]}"; do