PDS Kernel Configuration

PKGBUILD

@@ -68,7 +68,7 @@ fi
 optdepends=('schedtool')
 options=('!strip' 'docs')
 
-for f in "$_where"/linux-tkg-config/"$_basekernel"/* "$_where"/linux-tkg-patches/"$_basekernel"/*; do
+for f in $_where/linux-tkg-config/$_basekernel/* $_where/linux-tkg-patches/$_basekernel/*; do
   source+=( "$f" )
   sha256sums+=( "SKIP" )
 done
@@ -95,9 +95,9 @@ build() {
 
   # Use custom compiler paths if defined
   if [ "$_compiler_name" = "-llvm" ] && [ -n "${CUSTOM_LLVM_PATH}" ]; then
-    PATH="${CUSTOM_LLVM_PATH}/bin:${CUSTOM_LLVM_PATH}/lib:${CUSTOM_LLVM_PATH}/include:${PATH}"
+    PATH=${CUSTOM_LLVM_PATH}/bin:${CUSTOM_LLVM_PATH}/lib:${CUSTOM_LLVM_PATH}/include:${PATH}
   elif [ -n "${CUSTOM_GCC_PATH}" ]; then
-    PATH="${CUSTOM_GCC_PATH}/bin:${CUSTOM_GCC_PATH}/lib:${CUSTOM_GCC_PATH}/include:${PATH}"
+    PATH=${CUSTOM_GCC_PATH}/bin:${CUSTOM_GCC_PATH}/lib:${CUSTOM_GCC_PATH}/include:${PATH}
   fi
 
   if [ "$_force_all_threads" = "true" ]; then

linux-tkg-config/prepare

@@ -297,7 +297,7 @@ _set_cpu_scheduler() {
   elif [ "$_kver" = "519" ]; then
     _avail_cpu_scheds=("cfs" "pds" "bmq" "cacule" "tt" "bore")
   elif [ "$_kver" = "600" ]; then
-    _avail_cpu_scheds=("cfs" "pds" "bmq" "tt" "bore")
+    _avail_cpu_scheds=("cfs" "pds" "bmq" "bore")
   else
     _avail_cpu_scheds=("cfs")
   fi
@@ -804,10 +804,22 @@ _tkg_srcprep() {
   elif [ "${_cpusched}" = "tt" ]; then
     _msg="Applying TT patch"
     if [ "${_distro}" = "Void" ]; then
-      curl "https://raw.githubusercontent.com/CachyOS/kernel-patches/master/${_basekernel}/sched/0001-tt.patch" > "$wrksrc"/tt.patch
+      if [[ $_kver = 515 ]]; then
+        curl "https://raw.githubusercontent.com/CachyOS/kernel-patches/master/${_basekernel}/TT/0001-tt-${_basekernel}.patch" > "$srcdir"/tt.patch
+      elif [[ $_kver = 517 ]] || [[ $_kver = 519 ]]; then
+        curl "https://raw.githubusercontent.com/ptr1337/kernel-patches/master/${_basekernel}/sched/0001-tt.patch" > "$wrksrc"/tt.patch
+      else
+        curl "https://raw.githubusercontent.com/ptr1337/kernel-patches/master/${_basekernel}/sched/0001-tt-${_basekernel}.patch" > "$wrksrc"/tt.patch
+      fi
       tkgpatch="$wrksrc/tt.patch" && _tkg_patcher
     else
-      curl "https://raw.githubusercontent.com/CachyOS/kernel-patches/master/${_basekernel}/sched/0001-tt.patch" > "$srcdir"/tt.patch
+      if [[ $_kver = 515 ]]; then
+         curl "https://raw.githubusercontent.com/CachyOS/kernel-patches/master/${_basekernel}/TT/0001-tt-${_basekernel}.patch" > "$srcdir"/tt.patch
+      elif [[ $_kver = 517 ]] || [[ $_kver = 519 ]]; then
+         curl "https://raw.githubusercontent.com/ptr1337/kernel-patches/master/${_basekernel}/sched/0001-tt.patch" > "$srcdir"/tt.patch
+      else
+         curl "https://raw.githubusercontent.com/ptr1337/kernel-patches/master/${_basekernel}/sched/0001-tt-${_basekernel}.patch" > "$srcdir"/tt.patch
+      fi
       tkgpatch="$srcdir/tt.patch" && _tkg_patcher
     fi
     if [ "$_tt_high_hz" = "true" ] && [ $_kver = 515 ]; then
@@ -822,11 +834,14 @@ _tkg_srcprep() {
     fi
   elif [ "${_cpusched}" = "bore" ]; then
     _msg="Applying BORE patch"
+    if [ "$_kver" = "518" ]; then
+      _bore_suffix="-sched"
+    fi
     if [ "${_distro}" = "Void" ]; then
-      curl "https://raw.githubusercontent.com/CachyOS/kernel-patches/master/${_basekernel}/sched/0001-bore.patch" > "$wrksrc"/0001-bore.patch
+      curl "https://raw.githubusercontent.com/CachyOS/kernel-patches/master/${_basekernel}/sched/0001-bore$_bore_suffix.patch" > "$wrksrc"/0001-bore.patch
       tkgpatch="$wrksrc/0001-bore.patch" && _tkg_patcher
     else
-      curl "https://raw.githubusercontent.com/CachyOS/kernel-patches/master/${_basekernel}/sched/0001-bore.patch" > "$srcdir"/0001-bore.patch
+      curl "https://raw.githubusercontent.com/CachyOS/kernel-patches/master/${_basekernel}/sched/0001-bore$_bore_suffix.patch" > "$srcdir"/0001-bore.patch
       tkgpatch="$srcdir/0001-bore.patch" && _tkg_patcher
     fi
   elif [ "${_cpusched}" = "cfs" ]; then