Skip to content

Commit

Permalink
Merge pull request #184 from CachyOS/rt-zfs-6.6
Browse files Browse the repository at this point in the history 
Build RT without ZFS support - part 2
  • Loading branch information
@sirlucjan
sirlucjan authored Nov 3, 2023
2 parents 124ef1b + 8c39b99 commit e327f01
Show file tree
Hide file tree
Showing 16 changed files with 56 additions and 16 deletions.
2 changes: 1 addition & 1 deletion linux-bore/.SRCINFO
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated by makepkg 6.0.2
# Wed Nov 1 20:10:01 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
Expand Down
7 changes: 6 additions & 1 deletion linux-bore/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -674,7 +679,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=()
Expand Down
2 changes: 1 addition & 1 deletion linux-cachyos-bore-rt/.SRCINFO
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated by makepkg 6.0.2
# Wed Nov 1 20:10:42 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
Expand Down
7 changes: 6 additions & 1 deletion linux-cachyos-bore-rt/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -674,7 +679,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=()
Expand Down
2 changes: 1 addition & 1 deletion linux-cachyos-bore/.SRCINFO
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated by makepkg 6.0.2
# Wed Nov 1 20:10:28 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
Expand Down
7 changes: 6 additions & 1 deletion linux-cachyos-bore/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -674,7 +679,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=()
Expand Down
2 changes: 1 addition & 1 deletion linux-cachyos-eevdf/.SRCINFO
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated by makepkg 6.0.2
# Wed Nov 1 20:10:56 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
Expand Down
7 changes: 6 additions & 1 deletion linux-cachyos-eevdf/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -674,7 +679,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=()
Expand Down
2 changes: 1 addition & 1 deletion linux-cachyos-rc/.SRCINFO
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated by makepkg 6.0.2
# Wed Nov 1 20:11:44 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
Expand Down
7 changes: 6 additions & 1 deletion linux-cachyos-rc/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -673,7 +678,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=()
Expand Down
2 changes: 1 addition & 1 deletion linux-cachyos-rt/.SRCINFO
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated by makepkg 6.0.2
# Wed Nov 1 20:11:57 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
Expand Down
7 changes: 6 additions & 1 deletion linux-cachyos-rt/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -674,7 +679,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=()
Expand Down
2 changes: 1 addition & 1 deletion linux-cachyos-server/.SRCINFO
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated by makepkg 6.0.2
# Wed Nov 1 20:24:13 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
Expand Down
7 changes: 6 additions & 1 deletion linux-cachyos-server/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -674,7 +679,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=()
Expand Down
2 changes: 1 addition & 1 deletion linux-cachyos/.SRCINFO
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated by makepkg 6.0.2
# Wed Nov 1 20:10:15 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
Expand Down
7 changes: 6 additions & 1 deletion linux-cachyos/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -674,7 +679,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=()
Expand Down

0 comments on commit e327f01

Please sign in to comment.