Skip to content

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

Prevent ZFS and bcachefs building at the same time

Piotr Gorskib4fe325a3c2d
diff --git a/linux-bore/.SRCINFO b/linux-bore/.SRCINFO
index cdb94843..3b4fd543 100644
--- a/linux-bore/.SRCINFO
+++ b/linux-bore/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by makepkg 6.0.2
+# Sat Aug 12 00:04:58 UTC 2023
pkgbase = linux-bore
pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.4.10
diff --git a/linux-bore/PKGBUILD b/linux-bore/PKGBUILD
index d87e8aa3..82ac7e04 100644
--- a/linux-bore/PKGBUILD
+++ b/linux-bore/PKGBUILD
@@ -286,6 +286,12 @@ prepare() {
"${srcdir}"/auto-cpu-optimization.sh
fi
+ ### Prevent ZFS and bcachefs building at the same time
+ # More infos here: https://github.com/CachyOS/linux-cachyos/issues/152
+ if [[ -n "$_bcachefs" && -n "$_build_zfs" ]]; then
+ _die "ZFS and bcachefs support cannot be built at the same time. "
+ fi
+
### Selecting CachyOS config
if [ -n "$_cachy_config" ]; then
echo "Enabling CachyOS config..."
diff --git a/linux-cachyos-bmq/.SRCINFO b/linux-cachyos-bmq/.SRCINFO
index 268bf796..d53185e9 100644
--- a/linux-cachyos-bmq/.SRCINFO
+++ b/linux-cachyos-bmq/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by makepkg 6.0.2
+# Sat Aug 12 00:01:17 UTC 2023
pkgbase = linux-cachyos-bmq
pkgdesc = Linux BMQ scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.4.10
diff --git a/linux-cachyos-bmq/PKGBUILD b/linux-cachyos-bmq/PKGBUILD
index c38f9cfd..2e989eeb 100644
--- a/linux-cachyos-bmq/PKGBUILD
+++ b/linux-cachyos-bmq/PKGBUILD
@@ -286,6 +286,12 @@ prepare() {
"${srcdir}"/auto-cpu-optimization.sh
fi
+ ### Prevent ZFS and bcachefs building at the same time
+ # More infos here: https://github.com/CachyOS/linux-cachyos/issues/152
+ if [[ -n "$_bcachefs" && -n "$_build_zfs" ]]; then
+ _die "ZFS and bcachefs support cannot be built at the same time. "
+ fi
+
### Selecting CachyOS config
if [ -n "$_cachy_config" ]; then
echo "Enabling CachyOS config..."
diff --git a/linux-cachyos-bore/.SRCINFO b/linux-cachyos-bore/.SRCINFO
index 46e16315..61b2fa9e 100644
--- a/linux-cachyos-bore/.SRCINFO
+++ b/linux-cachyos-bore/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by makepkg 6.0.2
+# Sat Aug 12 00:01:31 UTC 2023
pkgbase = linux-cachyos-bore
pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.4.10
diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD
index 0455a3d7..ac10c398 100644
--- a/linux-cachyos-bore/PKGBUILD
+++ b/linux-cachyos-bore/PKGBUILD
@@ -286,6 +286,12 @@ prepare() {
"${srcdir}"/auto-cpu-optimization.sh
fi
+ ### Prevent ZFS and bcachefs building at the same time
+ # More infos here: https://github.com/CachyOS/linux-cachyos/issues/152
+ if [[ -n "$_bcachefs" && -n "$_build_zfs" ]]; then
+ _die "ZFS and bcachefs support cannot be built at the same time. "
+ fi
+
### Selecting CachyOS config
if [ -n "$_cachy_config" ]; then
echo "Enabling CachyOS config..."
diff --git a/linux-cachyos-cfs/.SRCINFO b/linux-cachyos-cfs/.SRCINFO
index c7099dd1..86b40100 100644
--- a/linux-cachyos-cfs/.SRCINFO
+++ b/linux-cachyos-cfs/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by makepkg 6.0.2
+# Sat Aug 12 00:01:44 UTC 2023
pkgbase = linux-cachyos-cfs
pkgdesc = Linux CFS scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.4.10
diff --git a/linux-cachyos-cfs/PKGBUILD b/linux-cachyos-cfs/PKGBUILD
index 9e9a5e40..f9f27168 100644
--- a/linux-cachyos-cfs/PKGBUILD
+++ b/linux-cachyos-cfs/PKGBUILD
@@ -286,6 +286,12 @@ prepare() {
"${srcdir}"/auto-cpu-optimization.sh
fi
+ ### Prevent ZFS and bcachefs building at the same time
+ # More infos here: https://github.com/CachyOS/linux-cachyos/issues/152
+ if [[ -n "$_bcachefs" && -n "$_build_zfs" ]]; then
+ _die "ZFS and bcachefs support cannot be built at the same time. "
+ fi
+
### Selecting CachyOS config
if [ -n "$_cachy_config" ]; then
echo "Enabling CachyOS config..."
diff --git a/linux-cachyos-eevdf/.SRCINFO b/linux-cachyos-eevdf/.SRCINFO
index ae34cc10..f81c8fae 100644
--- a/linux-cachyos-eevdf/.SRCINFO
+++ b/linux-cachyos-eevdf/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by makepkg 6.0.2
+# Sat Aug 12 00:01:58 UTC 2023
pkgbase = linux-cachyos-eevdf
pkgdesc = Linux EEVDF scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.4.10
diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD
index 8c0fd658..0543a2ad 100644
--- a/linux-cachyos-eevdf/PKGBUILD
+++ b/linux-cachyos-eevdf/PKGBUILD
@@ -286,6 +286,12 @@ prepare() {
"${srcdir}"/auto-cpu-optimization.sh
fi
+ ### Prevent ZFS and bcachefs building at the same time
+ # More infos here: https://github.com/CachyOS/linux-cachyos/issues/152
+ if [[ -n "$_bcachefs" && -n "$_build_zfs" ]]; then
+ _die "ZFS and bcachefs support cannot be built at the same time. "
+ fi
+
### Selecting CachyOS config
if [ -n "$_cachy_config" ]; then
echo "Enabling CachyOS config..."
diff --git a/linux-cachyos-hardened/.SRCINFO b/linux-cachyos-hardened/.SRCINFO
index b232c5d7..87cd0e62 100644
--- a/linux-cachyos-hardened/.SRCINFO
+++ b/linux-cachyos-hardened/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by makepkg 6.0.2
+# Sat Aug 12 00:02:13 UTC 2023
pkgbase = linux-cachyos-hardened
pkgdesc = Linux hardenened BORE scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.4.10
diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD
index 7050e785..73e577a8 100644
--- a/linux-cachyos-hardened/PKGBUILD
+++ b/linux-cachyos-hardened/PKGBUILD
@@ -286,6 +286,12 @@ prepare() {
"${srcdir}"/auto-cpu-optimization.sh
fi
+ ### Prevent ZFS and bcachefs building at the same time
+ # More infos here: https://github.com/CachyOS/linux-cachyos/issues/152
+ if [[ -n "$_bcachefs" && -n "$_build_zfs" ]]; then
+ _die "ZFS and bcachefs support cannot be built at the same time. "
+ fi
+
### Selecting CachyOS config
if [ -n "$_cachy_config" ]; then
echo "Enabling CachyOS config..."
diff --git a/linux-cachyos-lts/.SRCINFO b/linux-cachyos-lts/.SRCINFO
index e3236cad..4470f448 100644
--- a/linux-cachyos-lts/.SRCINFO
+++ b/linux-cachyos-lts/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by makepkg 6.0.2
+# Sat Aug 12 00:02:41 UTC 2023
pkgbase = linux-cachyos-lts
pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.1.40
diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD
index 4ce88964..09a5baf8 100644
--- a/linux-cachyos-lts/PKGBUILD
+++ b/linux-cachyos-lts/PKGBUILD
@@ -310,6 +310,12 @@ prepare() {
"${srcdir}"/auto-cpu-optimization.sh
fi
+ ### Prevent ZFS and bcachefs building at the same time
+ # More infos here: https://github.com/CachyOS/linux-cachyos/issues/152
+ if [[ -n "$_bcachefs" && -n "$_build_zfs" ]]; then
+ _die "ZFS and bcachefs support cannot be built at the same time. "
+ fi
+
### Selecting CachyOS config
if [ -n "$_cachy_config" ]; then
echo "Enabling CachyOS config..."
diff --git a/linux-cachyos-pds/.SRCINFO b/linux-cachyos-pds/.SRCINFO
index 8e7973c4..8177b7ed 100644
--- a/linux-cachyos-pds/.SRCINFO
+++ b/linux-cachyos-pds/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by makepkg 6.0.2
+# Sat Aug 12 00:02:55 UTC 2023
pkgbase = linux-cachyos-pds
pkgdesc = Linux PDS scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.4.10
diff --git a/linux-cachyos-pds/PKGBUILD b/linux-cachyos-pds/PKGBUILD
index 5d33b9eb..d5054808 100644
--- a/linux-cachyos-pds/PKGBUILD
+++ b/linux-cachyos-pds/PKGBUILD
@@ -286,6 +286,12 @@ prepare() {
"${srcdir}"/auto-cpu-optimization.sh
fi
+ ### Prevent ZFS and bcachefs building at the same time
+ # More infos here: https://github.com/CachyOS/linux-cachyos/issues/152
+ if [[ -n "$_bcachefs" && -n "$_build_zfs" ]]; then
+ _die "ZFS and bcachefs support cannot be built at the same time. "
+ fi
+
### Selecting CachyOS config
if [ -n "$_cachy_config" ]; then
echo "Enabling CachyOS config..."
diff --git a/linux-cachyos-rc/.SRCINFO b/linux-cachyos-rc/.SRCINFO
index 6a1bded0..9521552b 100644
--- a/linux-cachyos-rc/.SRCINFO
+++ b/linux-cachyos-rc/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by makepkg 6.0.2
+# Sat Aug 12 00:03:44 UTC 2023
pkgbase = linux-cachyos-rc
pkgdesc = Linux EEVDF-BORE scheduler Kernel by CachyOS and with some other patches and other improvements
pkgver = 6.5.rc4
diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD
index 3c84bd72..758634f7 100644
--- a/linux-cachyos-rc/PKGBUILD
+++ b/linux-cachyos-rc/PKGBUILD
@@ -286,6 +286,12 @@ prepare() {
"${srcdir}"/auto-cpu-optimization.sh
fi
+ ### Prevent ZFS and bcachefs building at the same time
+ # More infos here: https://github.com/CachyOS/linux-cachyos/issues/152
+ if [[ -n "$_bcachefs" && -n "$_build_zfs" ]]; then
+ _die "ZFS and bcachefs support cannot be built at the same time. "
+ fi
+
### Selecting CachyOS config
if [ -n "$_cachy_config" ]; then
echo "Enabling CachyOS config..."
diff --git a/linux-cachyos-rt/.SRCINFO b/linux-cachyos-rt/.SRCINFO
index 42243fe9..a3b142c9 100644
--- a/linux-cachyos-rt/.SRCINFO
+++ b/linux-cachyos-rt/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by makepkg 6.0.2
+# Sat Aug 12 00:03:59 UTC 2023
pkgbase = linux-cachyos-rt
pkgdesc = Linux kernel with RT patches by CachyOS with other patches and improvements
pkgver = 6.4.10
diff --git a/linux-cachyos-rt/PKGBUILD b/linux-cachyos-rt/PKGBUILD
index 5e983272..f77ee4b6 100644
--- a/linux-cachyos-rt/PKGBUILD
+++ b/linux-cachyos-rt/PKGBUILD
@@ -286,6 +286,12 @@ prepare() {
"${srcdir}"/auto-cpu-optimization.sh
fi
+ ### Prevent ZFS and bcachefs building at the same time
+ # More infos here: https://github.com/CachyOS/linux-cachyos/issues/152
+ if [[ -n "$_bcachefs" && -n "$_build_zfs" ]]; then
+ _die "ZFS and bcachefs support cannot be built at the same time. "
+ fi
+
### Selecting CachyOS config
if [ -n "$_cachy_config" ]; then
echo "Enabling CachyOS config..."
diff --git a/linux-cachyos-server/.SRCINFO b/linux-cachyos-server/.SRCINFO
index c13a96b9..bf6396a0 100644
--- a/linux-cachyos-server/.SRCINFO
+++ b/linux-cachyos-server/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by makepkg 6.0.2
+# Sat Aug 12 00:04:13 UTC 2023
pkgbase = linux-cachyos-server
pkgdesc = Linux CFS scheduler Kernel by CachyOS targeted for Servers
pkgver = 6.4.10
diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD
index e7978c1a..9833f574 100644
--- a/linux-cachyos-server/PKGBUILD
+++ b/linux-cachyos-server/PKGBUILD
@@ -286,6 +286,12 @@ prepare() {
"${srcdir}"/auto-cpu-optimization.sh
fi
+ ### Prevent ZFS and bcachefs building at the same time
+ # More infos here: https://github.com/CachyOS/linux-cachyos/issues/152
+ if [[ -n "$_bcachefs" && -n "$_build_zfs" ]]; then
+ _die "ZFS and bcachefs support cannot be built at the same time. "
+ fi
+
### Selecting CachyOS config
if [ -n "$_cachy_config" ]; then
echo "Enabling CachyOS config..."
diff --git a/linux-cachyos-tt/.SRCINFO b/linux-cachyos-tt/.SRCINFO
index f55eb4af..f291532c 100644
--- a/linux-cachyos-tt/.SRCINFO
+++ b/linux-cachyos-tt/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by makepkg 6.0.2
+# Sat Aug 12 00:04:28 UTC 2023
pkgbase = linux-cachyos-tt
pkgdesc = Linux TT scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.4.10
diff --git a/linux-cachyos-tt/PKGBUILD b/linux-cachyos-tt/PKGBUILD
index 26e97b24..bcb7ef10 100644
--- a/linux-cachyos-tt/PKGBUILD
+++ b/linux-cachyos-tt/PKGBUILD
@@ -286,6 +286,12 @@ prepare() {
"${srcdir}"/auto-cpu-optimization.sh
fi
+ ### Prevent ZFS and bcachefs building at the same time
+ # More infos here: https://github.com/CachyOS/linux-cachyos/issues/152
+ if [[ -n "$_bcachefs" && -n "$_build_zfs" ]]; then
+ _die "ZFS and bcachefs support cannot be built at the same time. "
+ fi
+
### Selecting CachyOS config
if [ -n "$_cachy_config" ]; then
echo "Enabling CachyOS config..."
diff --git a/linux-cachyos/.SRCINFO b/linux-cachyos/.SRCINFO
index 5b0ada25..3a6e832f 100644
--- a/linux-cachyos/.SRCINFO
+++ b/linux-cachyos/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by makepkg 6.0.2
+# Sat Aug 12 00:00:59 UTC 2023
pkgbase = linux-cachyos
pkgdesc = Linux EEVDF-BORE scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.4.10
diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD
index 1d56f7d3..46805c40 100644
--- a/linux-cachyos/PKGBUILD
+++ b/linux-cachyos/PKGBUILD
@@ -286,6 +286,12 @@ prepare() {
"${srcdir}"/auto-cpu-optimization.sh
fi
+ ### Prevent ZFS and bcachefs building at the same time
+ # More infos here: https://github.com/CachyOS/linux-cachyos/issues/152
+ if [[ -n "$_bcachefs" && -n "$_build_zfs" ]]; then
+ _die "ZFS and bcachefs support cannot be built at the same time. "
+ fi
+
### Selecting CachyOS config
if [ -n "$_cachy_config" ]; then
echo "Enabling CachyOS config..."
diff --git a/linux-tt/.SRCINFO b/linux-tt/.SRCINFO
index 312e80e9..8bb4dddb 100644
--- a/linux-tt/.SRCINFO
+++ b/linux-tt/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by makepkg 6.0.2
+# Sat Aug 12 00:04:44 UTC 2023
pkgbase = linux-tt
pkgdesc = Linux TT scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.4.10
diff --git a/linux-tt/PKGBUILD b/linux-tt/PKGBUILD
index a1f3bf95..0cedf75b 100644
--- a/linux-tt/PKGBUILD
+++ b/linux-tt/PKGBUILD
@@ -286,6 +286,12 @@ prepare() {
"${srcdir}"/auto-cpu-optimization.sh
fi
+ ### Prevent ZFS and bcachefs building at the same time
+ # More infos here: https://github.com/CachyOS/linux-cachyos/issues/152
+ if [[ -n "$_bcachefs" && -n "$_build_zfs" ]]; then
+ _die "ZFS and bcachefs support cannot be built at the same time. "
+ fi
+
### Selecting CachyOS config
if [ -n "$_cachy_config" ]; then
echo "Enabling CachyOS config..."