diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD index f6054804..a26eddb5 100644 --- a/linux-cachyos-bore/PKGBUILD +++ b/linux-cachyos-bore/PKGBUILD @@ -152,13 +152,13 @@ elif [ -n "$_use_llvm_lto" ] || [[ "$_use_lto_suffix" = "n" ]]; then _pkgsuffix="cachyos-${_cpusched}" pkgbase="linux-$_pkgsuffix" fi -_major=6.10 -_minor=10 +_major=6.11 +_minor=0 #_minorc=$((_minor+1)) #_rcver=rc8 pkgver=${_major}.${_minor} -_stable=${_major}.${_minor} -#_stable=${_major} +#_stable=${_major}.${_minor} +_stable=${_major} #_stablerc=${_major}-${_rcver} _srcname=linux-${_stable} #_srcname=linux-${_major} @@ -224,7 +224,8 @@ if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/fix-zen5.patch") + "${_patchsource}/misc/nvidia/fix-zen5.patch" + "${_patchsource}/misc/nvidia/6.11-fbdev.patch") fi ## List of CachyOS schedulers @@ -233,7 +234,8 @@ case "$_cpusched" in source+=("${_patchsource}/sched/0001-sched-ext.patch" "${_patchsource}/sched/0001-bore-cachy-ext.patch");; bore) ## BORE Scheduler - source+=("${_patchsource}/sched/0001-bore-cachy.patch");; + source+=("${_patchsource}/sched/0001-eevdf-next.patch" + "${_patchsource}/sched/0001-bore-cachy-next.patch");; echo) ## ECHO Scheduler source+=("${_patchsource}/sched/0001-echo-cachy.patch");; rt) ## EEVDF with RT patches @@ -271,6 +273,7 @@ prepare() { [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue [[ $src = fix-zen5.patch ]] && continue + [[ $src = 6.11-fbdev.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -324,8 +327,7 @@ prepare() { ### Enable KCFI if [ -n "$_use_kcfi" ]; then echo "Enabling kCFI" - scripts/config -e ARCH_SUPPORTS_CFI_CLANG \ - -e CFI_CLANG + scripts/config -e ARCH_SUPPORTS_CFI_CLANG -e CFI_CLANG -e CFI_AUTO_DEFAULT fi ### Select LLVM level @@ -536,6 +538,8 @@ prepare() { patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix for Zen5 error print in dmesg patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" + # Fix broken fbdev on 6.11 + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/6.11-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD index db1afba6..514ed2b6 100644 --- a/linux-cachyos-eevdf/PKGBUILD +++ b/linux-cachyos-eevdf/PKGBUILD @@ -152,13 +152,13 @@ elif [ -n "$_use_llvm_lto" ] || [[ "$_use_lto_suffix" = "n" ]]; then _pkgsuffix="cachyos-${_cpusched}" pkgbase="linux-$_pkgsuffix" fi -_major=6.10 -_minor=10 +_major=6.11 +_minor=0 #_minorc=$((_minor+1)) #_rcver=rc8 pkgver=${_major}.${_minor} -_stable=${_major}.${_minor} -#_stable=${_major} +#_stable=${_major}.${_minor} +_stable=${_major} #_stablerc=${_major}-${_rcver} _srcname=linux-${_stable} #_srcname=linux-${_major} @@ -224,7 +224,8 @@ if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/fix-zen5.patch") + "${_patchsource}/misc/nvidia/fix-zen5.patch" + "${_patchsource}/misc/nvidia/6.11-fbdev.patch") fi ## List of CachyOS schedulers @@ -233,7 +234,8 @@ case "$_cpusched" in source+=("${_patchsource}/sched/0001-sched-ext.patch" "${_patchsource}/sched/0001-bore-cachy-ext.patch");; bore) ## BORE Scheduler - source+=("${_patchsource}/sched/0001-bore-cachy.patch");; + source+=("${_patchsource}/sched/0001-eevdf-next.patch" + "${_patchsource}/sched/0001-bore-cachy-next.patch");; echo) ## ECHO Scheduler source+=("${_patchsource}/sched/0001-echo-cachy.patch");; rt) ## EEVDF with RT patches @@ -271,6 +273,7 @@ prepare() { [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue [[ $src = fix-zen5.patch ]] && continue + [[ $src = 6.11-fbdev.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -324,8 +327,7 @@ prepare() { ### Enable KCFI if [ -n "$_use_kcfi" ]; then echo "Enabling kCFI" - scripts/config -e ARCH_SUPPORTS_CFI_CLANG \ - -e CFI_CLANG + scripts/config -e ARCH_SUPPORTS_CFI_CLANG -e CFI_CLANG -e CFI_AUTO_DEFAULT fi ### Select LLVM level @@ -536,6 +538,8 @@ prepare() { patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix for Zen5 error print in dmesg patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" + # Fix broken fbdev on 6.11 + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/6.11-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD index 6a7d07bb..fd52fd59 100644 --- a/linux-cachyos-rt-bore/PKGBUILD +++ b/linux-cachyos-rt-bore/PKGBUILD @@ -152,13 +152,13 @@ elif [ -n "$_use_llvm_lto" ] || [[ "$_use_lto_suffix" = "n" ]]; then _pkgsuffix="cachyos-${_cpusched}" pkgbase="linux-$_pkgsuffix" fi -_major=6.10 -_minor=10 +_major=6.11 +_minor=0 #_minorc=$((_minor+1)) #_rcver=rc8 pkgver=${_major}.${_minor} -_stable=${_major}.${_minor} -#_stable=${_major} +#_stable=${_major}.${_minor} +_stable=${_major} #_stablerc=${_major}-${_rcver} _srcname=linux-${_stable} #_srcname=linux-${_major} @@ -224,7 +224,8 @@ if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/fix-zen5.patch") + "${_patchsource}/misc/nvidia/fix-zen5.patch" + "${_patchsource}/misc/nvidia/6.11-fbdev.patch") fi ## List of CachyOS schedulers @@ -233,7 +234,8 @@ case "$_cpusched" in source+=("${_patchsource}/sched/0001-sched-ext.patch" "${_patchsource}/sched/0001-bore-cachy-ext.patch");; bore) ## BORE Scheduler - source+=("${_patchsource}/sched/0001-bore-cachy.patch");; + source+=("${_patchsource}/sched/0001-eevdf-next.patch" + "${_patchsource}/sched/0001-bore-cachy-next.patch");; echo) ## ECHO Scheduler source+=("${_patchsource}/sched/0001-echo-cachy.patch");; rt) ## EEVDF with RT patches @@ -271,6 +273,7 @@ prepare() { [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue [[ $src = fix-zen5.patch ]] && continue + [[ $src = 6.11-fbdev.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -324,8 +327,7 @@ prepare() { ### Enable KCFI if [ -n "$_use_kcfi" ]; then echo "Enabling kCFI" - scripts/config -e ARCH_SUPPORTS_CFI_CLANG \ - -e CFI_CLANG + scripts/config -e ARCH_SUPPORTS_CFI_CLANG -e CFI_CLANG -e CFI_AUTO_DEFAULT fi ### Select LLVM level @@ -536,6 +538,8 @@ prepare() { patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix for Zen5 error print in dmesg patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" + # Fix broken fbdev on 6.11 + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/6.11-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-sched-ext/PKGBUILD b/linux-cachyos-sched-ext/PKGBUILD index 53138748..ff89a4da 100644 --- a/linux-cachyos-sched-ext/PKGBUILD +++ b/linux-cachyos-sched-ext/PKGBUILD @@ -152,13 +152,13 @@ elif [ -n "$_use_llvm_lto" ] || [[ "$_use_lto_suffix" = "n" ]]; then _pkgsuffix="cachyos-${_cpusched}" pkgbase="linux-$_pkgsuffix" fi -_major=6.10 -_minor=10 +_major=6.11 +_minor=0 #_minorc=$((_minor+1)) #_rcver=rc8 pkgver=${_major}.${_minor} -_stable=${_major}.${_minor} -#_stable=${_major} +#_stable=${_major}.${_minor} +_stable=${_major} #_stablerc=${_major}-${_rcver} _srcname=linux-${_stable} #_srcname=linux-${_major} @@ -224,7 +224,8 @@ if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/fix-zen5.patch") + "${_patchsource}/misc/nvidia/fix-zen5.patch" + "${_patchsource}/misc/nvidia/6.11-fbdev.patch") fi ## List of CachyOS schedulers @@ -233,7 +234,8 @@ case "$_cpusched" in source+=("${_patchsource}/sched/0001-sched-ext.patch" "${_patchsource}/sched/0001-bore-cachy-ext.patch");; bore) ## BORE Scheduler - source+=("${_patchsource}/sched/0001-bore-cachy.patch");; + source+=("${_patchsource}/sched/0001-eevdf-next.patch" + "${_patchsource}/sched/0001-bore-cachy-next.patch");; echo) ## ECHO Scheduler source+=("${_patchsource}/sched/0001-echo-cachy.patch");; rt) ## EEVDF with RT patches @@ -324,8 +326,7 @@ prepare() { ### Enable KCFI if [ -n "$_use_kcfi" ]; then echo "Enabling kCFI" - scripts/config -e ARCH_SUPPORTS_CFI_CLANG \ - -e CFI_CLANG + scripts/config -e ARCH_SUPPORTS_CFI_CLANG -e CFI_CLANG -e CFI_AUTO_DEFAULT fi ### Select LLVM level @@ -536,6 +537,8 @@ prepare() { patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix for Zen5 error print in dmesg patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" + # Fix broken fbdev on 6.11 + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/6.11-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD index 84e501cf..c5f3f6ad 100644 --- a/linux-cachyos-server/PKGBUILD +++ b/linux-cachyos-server/PKGBUILD @@ -152,13 +152,13 @@ elif [ -n "$_use_llvm_lto" ] || [[ "$_use_lto_suffix" = "n" ]]; then _pkgsuffix=cachyos-server pkgbase="linux-$_pkgsuffix" fi -_major=6.10 -_minor=10 +_major=6.11 +_minor=0 #_minorc=$((_minor+1)) #_rcver=rc8 pkgver=${_major}.${_minor} -_stable=${_major}.${_minor} -#_stable=${_major} +#_stable=${_major}.${_minor} +_stable=${_major} #_stablerc=${_major}-${_rcver} _srcname=linux-${_stable} #_srcname=linux-${_major} @@ -224,7 +224,8 @@ if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/fix-zen5.patch") + "${_patchsource}/misc/nvidia/fix-zen5.patch" + "${_patchsource}/misc/nvidia/6.11-fbdev.patch") fi ## List of CachyOS schedulers @@ -233,7 +234,8 @@ case "$_cpusched" in source+=("${_patchsource}/sched/0001-sched-ext.patch" "${_patchsource}/sched/0001-bore-cachy-ext.patch");; bore) ## BORE Scheduler - source+=("${_patchsource}/sched/0001-bore-cachy.patch");; + source+=("${_patchsource}/sched/0001-eevdf-next.patch" + "${_patchsource}/sched/0001-bore-cachy-next.patch");; echo) ## ECHO Scheduler source+=("${_patchsource}/sched/0001-echo-cachy.patch");; rt) ## EEVDF with RT patches @@ -271,6 +273,7 @@ prepare() { [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue [[ $src = fix-zen5.patch ]] && continue + [[ $src = 6.11-fbdev.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -324,8 +327,7 @@ prepare() { ### Enable KCFI if [ -n "$_use_kcfi" ]; then echo "Enabling kCFI" - scripts/config -e ARCH_SUPPORTS_CFI_CLANG \ - -e CFI_CLANG + scripts/config -e ARCH_SUPPORTS_CFI_CLANG -e CFI_CLANG -e CFI_AUTO_DEFAULT fi ### Select LLVM level @@ -536,6 +538,8 @@ prepare() { patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix for Zen5 error print in dmesg patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" + # Fix broken fbdev on 6.11 + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/6.11-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" fi } diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD index 828b9c7b..66d0562a 100644 --- a/linux-cachyos/PKGBUILD +++ b/linux-cachyos/PKGBUILD @@ -152,13 +152,13 @@ elif [ -n "$_use_llvm_lto" ] || [[ "$_use_lto_suffix" = "n" ]]; then _pkgsuffix=cachyos pkgbase="linux-$_pkgsuffix" fi -_major=6.10 -_minor=10 +_major=6.11 +_minor=0 #_minorc=$((_minor+1)) #_rcver=rc8 pkgver=${_major}.${_minor} -_stable=${_major}.${_minor} -#_stable=${_major} +#_stable=${_major}.${_minor} +_stable=${_major} #_stablerc=${_major}-${_rcver} _srcname=linux-${_stable} #_srcname=linux-${_major} @@ -224,7 +224,8 @@ if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/fix-zen5.patch") + "${_patchsource}/misc/nvidia/fix-zen5.patch" + "${_patchsource}/misc/nvidia/6.11-fbdev.patch") fi ## List of CachyOS schedulers @@ -233,7 +234,8 @@ case "$_cpusched" in source+=("${_patchsource}/sched/0001-sched-ext.patch" "${_patchsource}/sched/0001-bore-cachy-ext.patch");; bore) ## BORE Scheduler - source+=("${_patchsource}/sched/0001-bore-cachy.patch");; + source+=("${_patchsource}/sched/0001-eevdf-next.patch" + "${_patchsource}/sched/0001-bore-cachy-next.patch");; echo) ## ECHO Scheduler source+=("${_patchsource}/sched/0001-echo-cachy.patch");; rt) ## EEVDF with RT patches @@ -271,6 +273,7 @@ prepare() { [[ $src = make-modeset-fbdev-default.patch ]] && continue [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue [[ $src = fix-zen5.patch ]] && continue + [[ $src = 6.11-fbdev.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -324,8 +327,7 @@ prepare() { ### Enable KCFI if [ -n "$_use_kcfi" ]; then echo "Enabling kCFI" - scripts/config -e ARCH_SUPPORTS_CFI_CLANG \ - -e CFI_CLANG + scripts/config -e ARCH_SUPPORTS_CFI_CLANG -e CFI_CLANG -e CFI_AUTO_DEFAULT fi ### Select LLVM level @@ -536,6 +538,8 @@ prepare() { patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix for Zen5 error print in dmesg patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" + # Fix broken fbdev on 6.11 + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/6.11-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" fi }