diff --git a/linux-cachyos/.SRCINFO b/linux-cachyos/.SRCINFO index 00c62ed1..6d2060d1 100644 --- a/linux-cachyos/.SRCINFO +++ b/linux-cachyos/.SRCINFO @@ -50,12 +50,8 @@ pkgname = linux-cachyos provides = WIREGUARD-MODULE provides = KSMBD-MODULE provides = UKSMD-BUILTIN - provides = linux-cachyos-lto=6.11.3-2 - replaces = linux-cachyos-lto pkgname = linux-cachyos-headers pkgdesc = Headers and scripts for building modules for the Linux SCHED-EXT + BORE + Cachy Sauce Kernel by CachyOS with other patches and improvements kernel depends = pahole depends = linux-cachyos - provides = linux-cachyos-lto-headers=6.11.3-2 - replaces = linux-cachyos-lto-headers diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD index abcd0185..2f3d9fbb 100644 --- a/linux-cachyos/PKGBUILD +++ b/linux-cachyos/PKGBUILD @@ -142,11 +142,6 @@ _build_nvidia=${_build_nvidia-} # Use this only if you have Turing+ GPU _build_nvidia_open=${_build_nvidia_open-} -_is_lto_kernel() { - [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] || [ -n "$_use_kcfi" ] - return $? -} - # Build a debug package with non-stripped vmlinux _build_debug=${_build_debug-} @@ -201,7 +196,7 @@ source=( "${_patchsource}/all/0001-cachyos-base-all.patch") # LLVM makedepends -if _is_lto_kernel; then +if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] || [ -n "$_use_kcfi" ]; then makedepends+=(clang llvm lld) source+=("${_patchsource}/misc/dkms-clang.patch") BUILD_FLAGS=( @@ -602,12 +597,6 @@ _package() { 'uksmd: Userspace KSM helper daemon') provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN) - # Replace LTO kernel with the default kernel - if _is_lto_kernel; then - provides+=(linux-cachyos-lto=$_kernver) - replaces=(linux-cachyos-lto) - fi - cd "$_srcname" local modulesdir="$pkgdir/usr/lib/modules/$(