From 876904bf1acfe79e1b80e62319a8ddfce091572b Mon Sep 17 00:00:00 2001 From: Piotr Gorski Date: Fri, 3 Nov 2023 08:41:11 +0100 Subject: [PATCH] Revert: Prevent ZFS and bcachefs building at the same time (issue #152 is solved now) Signed-off-by: Piotr Gorski --- linux-bore/PKGBUILD | 6 ------ linux-cachyos-bore-rt/PKGBUILD | 6 ------ linux-cachyos-bore/PKGBUILD | 6 ------ linux-cachyos-eevdf/PKGBUILD | 6 ------ linux-cachyos-rc/PKGBUILD | 6 ------ linux-cachyos-rt/PKGBUILD | 6 ------ linux-cachyos-server/PKGBUILD | 6 ------ linux-cachyos/PKGBUILD | 6 ------ 8 files changed, 48 deletions(-) diff --git a/linux-bore/PKGBUILD b/linux-bore/PKGBUILD index 2ce221a6f..77e1aba4b 100644 --- a/linux-bore/PKGBUILD +++ b/linux-bore/PKGBUILD @@ -296,12 +296,6 @@ 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 - ### Prevent ZFS and LTO building at the same time # More infos here: https://github.com/openzfs/zfs/issues/15384 if [[ "$_use_llvm_lto" != "none" && -n "$_build_zfs" ]]; then diff --git a/linux-cachyos-bore-rt/PKGBUILD b/linux-cachyos-bore-rt/PKGBUILD index 6b0670d54..8e4922445 100644 --- a/linux-cachyos-bore-rt/PKGBUILD +++ b/linux-cachyos-bore-rt/PKGBUILD @@ -296,12 +296,6 @@ 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 - ### Prevent ZFS and LTO building at the same time # More infos here: https://github.com/openzfs/zfs/issues/15384 if [[ "$_use_llvm_lto" != "none" && -n "$_build_zfs" ]]; then diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD index f11a09daf..7d1402737 100644 --- a/linux-cachyos-bore/PKGBUILD +++ b/linux-cachyos-bore/PKGBUILD @@ -296,12 +296,6 @@ 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 - ### Prevent ZFS and LTO building at the same time # More infos here: https://github.com/openzfs/zfs/issues/15384 if [[ "$_use_llvm_lto" != "none" && -n "$_build_zfs" ]]; then diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD index 6f5f8d946..ba583ee7e 100644 --- a/linux-cachyos-eevdf/PKGBUILD +++ b/linux-cachyos-eevdf/PKGBUILD @@ -296,12 +296,6 @@ 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 - ### Prevent ZFS and LTO building at the same time # More infos here: https://github.com/openzfs/zfs/issues/15384 if [[ "$_use_llvm_lto" != "none" && -n "$_build_zfs" ]]; then diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD index c8d346a5b..e5b1b8ef3 100644 --- a/linux-cachyos-rc/PKGBUILD +++ b/linux-cachyos-rc/PKGBUILD @@ -295,12 +295,6 @@ 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 - ### Prevent ZFS and LTO building at the same time # More infos here: https://github.com/openzfs/zfs/issues/15384 if [[ "$_use_llvm_lto" != "none" && -n "$_build_zfs" ]]; then diff --git a/linux-cachyos-rt/PKGBUILD b/linux-cachyos-rt/PKGBUILD index 4acb78766..c2f85b8c1 100644 --- a/linux-cachyos-rt/PKGBUILD +++ b/linux-cachyos-rt/PKGBUILD @@ -296,12 +296,6 @@ 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 - ### Prevent ZFS and LTO building at the same time # More infos here: https://github.com/openzfs/zfs/issues/15384 if [[ "$_use_llvm_lto" != "none" && -n "$_build_zfs" ]]; then diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD index 05155d819..bf8e47701 100644 --- a/linux-cachyos-server/PKGBUILD +++ b/linux-cachyos-server/PKGBUILD @@ -296,12 +296,6 @@ 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 - ### Prevent ZFS and LTO building at the same time # More infos here: https://github.com/openzfs/zfs/issues/15384 if [[ "$_use_llvm_lto" != "none" && -n "$_build_zfs" ]]; then diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD index 64c35459e..3d3599b44 100644 --- a/linux-cachyos/PKGBUILD +++ b/linux-cachyos/PKGBUILD @@ -296,12 +296,6 @@ 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 - ### Prevent ZFS and LTO building at the same time # More infos here: https://github.com/openzfs/zfs/issues/15384 if [[ "$_use_llvm_lto" != "none" && -n "$_build_zfs" ]]; then