From ee630237c59e97b127a3cced5e48ed8ed2a50dcc Mon Sep 17 00:00:00 2001 From: easterNday <849919718@qq.com> Date: Tue, 2 Jan 2024 15:34:55 +0800 Subject: [PATCH] fix: LXC_defconfig loss, close #7 --- .github/workflows/kernel.yml | 2 +- Kernel/configs/thyme.config.json | 46 ++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/.github/workflows/kernel.yml b/.github/workflows/kernel.yml index b89d452c7..e050bf63e 100644 --- a/.github/workflows/kernel.yml +++ b/.github/workflows/kernel.yml @@ -254,7 +254,7 @@ jobs: working-directory: ${{ env.KERNEL_NAME }} env: DEFCONFIG: ${{ env.WORKSPACE }}/${{ env.KERNEL_NAME }}/arch/${{ steps.generate-args.outputs.ARCH }}/configs/${{env.KERNEL_DEFCONFIG_PATH}} - ADD_DEFCONFIG: ${{ env.WORKSPACE }}/LXC/LXC_defconfig + ADD_DEFCONFIG: ${{ env.WORKSPACE }}/Kernel/LXC/LXC_defconfig if: ${{ env.ENABLE_LXC == 'true' }} run: | # Add configuration diff --git a/Kernel/configs/thyme.config.json b/Kernel/configs/thyme.config.json index f1e112cca..6c5e25753 100644 --- a/Kernel/configs/thyme.config.json +++ b/Kernel/configs/thyme.config.json @@ -152,5 +152,51 @@ }, "enableKernelSU": true, "enableLXC": false + }, + { + "kernelSource": { + "name": "Xiaomi10S(Google-Docker)", + "repo": "https://codeberg.org/DogDayAndroid/android_kernel_xiaomi_thyme", + "branch": "lineage-20.0", + "device": "thyme", + "defconfig": "thyme_defconfig" + }, + "toolchains": [ + { + "repo": "https://android.googlesource.com/platform/prebuilts/gas/linux-x86", + "branch": "master", + "name": "gas", + "binaryEnv": [] + }, + { + "repo": "https://gitlab.com/ThankYouMario/android_prebuilts_clang-standalone/", + "branch": "11", + "name": "clang", + "binaryEnv": [ + "bin" + ] + } + ], + "enableCcache": true, + "params": { + "ARCH": "arm64", + "CC": "clang/bin/clang", + "externalCommands": { + "CROSS_COMPILE": "aarch64-linux-gnu-", + "CROSS_COMPILE_ARM32": "arm-linux-gnueabi-", + "CROSS_COMPILE_COMPAT": "arm-linux-gnueabi-", + "CLANG_TRIPLE": "aarch64-linux-gnu-" + } + }, + "AnyKernel3": { + "use": true, + "release": true, + "custom": { + "repo": "https://github.com/easterNday/AnyKernel3/", + "branch": "thyme" + } + }, + "enableKernelSU": true, + "enableLXC": true } ] \ No newline at end of file