Skip to content

Commit

Permalink
Revert: Prevent ZFS and bcachefs building at the same time (issue #152 …
Browse files Browse the repository at this point in the history 
…is solved now)

Signed-off-by: Piotr Gorski <[email protected]>
  • Loading branch information
@sirlucjan
sirlucjan committed Nov 3, 2023
1 parent 9908b65 commit 876904b
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 48 deletions.
6 changes: 0 additions & 6 deletions linux-bore/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions linux-cachyos-bore-rt/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions linux-cachyos-bore/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions linux-cachyos-eevdf/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions linux-cachyos-rc/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions linux-cachyos-rt/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions linux-cachyos-server/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions linux-cachyos/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 876904b

Please sign in to comment.