From ab8fcec9ece71c9aa307c6e0fe7e6001fed91dc8 Mon Sep 17 00:00:00 2001 From: Dich Date: Mon, 7 Jul 2025 23:51:00 +0800 Subject: [PATCH] update:toolchains --- .github/workflows/build-gki-kernel.yml | 18 +++++----- config/config_corvette | 46 +++++++++++++++++++++++--- 2 files changed, 50 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build-gki-kernel.yml b/.github/workflows/build-gki-kernel.yml index 5a9c8af..2cc38fb 100644 --- a/.github/workflows/build-gki-kernel.yml +++ b/.github/workflows/build-gki-kernel.yml @@ -98,23 +98,23 @@ jobs: cd $GITHUB_WORKSPACE/kernel echo "=== 下载 Clang 工具链 ===" # 创建 Clang 目录 - mkdir -p ./toolchains/clang-r536225 - # 下载 Android 官方 Clang r536225 工具链 + mkdir -p ./toolchains/clang-r487747c + # 下载 Android 官方 Clang r487747c 工具链 cd toolchains - git clone --depth=1 https://gitlab.com/crdroidandroid/android_prebuilts_clang_host_linux-x86_clang-r536225.git + git clone --depth=1 https://gitlab.com/crdroidandroid/android_prebuilts_clang_host_linux-x86_clang-r487747c.git # 检查下载是否成功 - if [ ! -d "android_prebuilts_clang_host_linux-x86_clang-r536225" ]; then + if [ ! -d "android_prebuilts_clang_host_linux-x86_clang-r487747c" ]; then echo "Error: Clang 工具链下载失败" exit 1 fi echo "=== 移动工具链文件 ===" - # 移动到 clang-r536225 目录 - mv android_prebuilts_clang_host_linux-x86_clang-r536225/* clang-r536225/ + # 移动到 clang-r487747c 目录 + mv android_prebuilts_clang_host_linux-x86_clang-r487747c/* clang-r487747c/ # 检查解压后的目录结构 echo "=== 检查解压后的目录结构 ===" - ls -la clang-r536225/ + ls -la clang-r487747c/ # 清理临时目录 - rm -rf android_prebuilts_clang_host_linux-x86_clang-r536225 + rm -rf android_prebuilts_clang_host_linux-x86_clang-r487747c # 返回 kernel 目录 cd $GITHUB_WORKSPACE/kernel echo "=== 最终目录结构 ===" @@ -407,7 +407,7 @@ jobs: export KCONFIG_CONFIG=$PWD/myconfig # 设置工具链路径变量 - export CLANG_PATH=$GITHUB_WORKSPACE/kernel/toolchains/clang-r536225/bin + export CLANG_PATH=$GITHUB_WORKSPACE/kernel/toolchains/clang-r487747c/bin export PATH=$CLANG_PATH:$PATH # 验证所有必需的工具 diff --git a/config/config_corvette b/config/config_corvette index b48329f..0470755 100644 --- a/config/config_corvette +++ b/config/config_corvette @@ -3,21 +3,23 @@ # Linux/arm64 6.1.130 Kernel Configuration # CONFIG_OPLUS_SYSTEM_KERNEL_QCOM=y -CONFIG_CC_VERSION_TEXT="Android (12701618, +pgo, +bolt, +lto, +mlgo, based on r536225) clang version 19.0.1 (https://android.googlesource.com/toolchain/llvm-project b3a530ec6537146650e42be89f1089e9a3588460)" +CONFIG_CC_VERSION_TEXT="Android (10087095, +pgo, +bolt, +lto, -mlgo, based on r487747c) clang version 17.0.2 (https://android.googlesource.com/toolchain/llvm-project d9f89f4d16663d5012e5c09495f3b30ece3d2362)" CONFIG_GCC_VERSION=0 CONFIG_CC_IS_CLANG=y -CONFIG_CLANG_VERSION=190001 +CONFIG_CLANG_VERSION=170002 CONFIG_AS_IS_LLVM=y -CONFIG_AS_VERSION=190001 +CONFIG_AS_VERSION=170002 CONFIG_LD_VERSION=0 CONFIG_LD_IS_LLD=y -CONFIG_LLD_VERSION=190001 +CONFIG_LLD_VERSION=170002 +CONFIG_CC_CAN_LINK=y +CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y -CONFIG_PAHOLE_VERSION=125 +CONFIG_PAHOLE_VERSION=130 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -28,6 +30,7 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set CONFIG_WERROR=y +# CONFIG_UAPI_HEADER_TEST is not set CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_BUILD_SALT="" @@ -7656,6 +7659,38 @@ CONFIG_INTERCONNECT_QCOM_DEBUG=m # CONFIG_MOST is not set # CONFIG_PECI is not set # CONFIG_HTE is not set + +# +# KernelSU +# +CONFIG_KSU=y +# CONFIG_KSU_DEBUG is not set +CONFIG_KSU_MANUAL_HOOK=y +# CONFIG_KSU_ALLOWLIST_WORKAROUND is not set +# CONFIG_KSU_CMDLINE is not set +CONFIG_KPM=y + +# +# KernelSU - SUSFS +# +CONFIG_KSU_SUSFS=y +CONFIG_KSU_SUSFS_HAS_MAGIC_MOUNT=y +CONFIG_KSU_SUSFS_SUS_PATH=y +CONFIG_KSU_SUSFS_SUS_MOUNT=y +CONFIG_KSU_SUSFS_AUTO_ADD_SUS_KSU_DEFAULT_MOUNT=y +CONFIG_KSU_SUSFS_AUTO_ADD_SUS_BIND_MOUNT=y +CONFIG_KSU_SUSFS_SUS_KSTAT=y +# CONFIG_KSU_SUSFS_SUS_OVERLAYFS is not set +CONFIG_KSU_SUSFS_TRY_UMOUNT=y +CONFIG_KSU_SUSFS_AUTO_ADD_TRY_UMOUNT_FOR_BIND_MOUNT=y +CONFIG_KSU_SUSFS_SPOOF_UNAME=y +CONFIG_KSU_SUSFS_ENABLE_LOG=y +CONFIG_KSU_SUSFS_HIDE_KSU_SUSFS_SYMBOLS=y +CONFIG_KSU_SUSFS_SPOOF_CMDLINE_OR_BOOTCONFIG=y +CONFIG_KSU_SUSFS_OPEN_REDIRECT=y +# CONFIG_KSU_SUSFS_SUS_SU is not set +# end of KernelSU - SUSFS +# end of KernelSU # end of Device Drivers # @@ -8721,3 +8756,4 @@ CONFIG_SCHED_WALT=m # CONFIG_SCHED_WALT_DEBUG is not set # CONFIG_SCHED_CONSERVATIVE_BOOST_LPM_BIAS is not set # end of QTI WALT based scheduler features +