diff --git a/manager/app/src/main/assets/5_10-mkbootfs b/manager/app/src/main/assets/5_10-mkbootfs new file mode 100644 index 00000000..2af1167a Binary files /dev/null and b/manager/app/src/main/assets/5_10-mkbootfs differ diff --git a/manager/app/src/main/assets/mkbootfs b/manager/app/src/main/assets/5_15+-mkbootfs similarity index 100% rename from manager/app/src/main/assets/mkbootfs rename to manager/app/src/main/assets/5_15+-mkbootfs diff --git a/manager/app/src/main/java/com/sukisu/ultra/flash/KernelFlash.kt b/manager/app/src/main/java/com/sukisu/ultra/flash/KernelFlash.kt index 343c265f..63088a99 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/flash/KernelFlash.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/flash/KernelFlash.kt @@ -196,9 +196,17 @@ class HorizonKernelWorker( } private fun patch() { - val mkbootfsPath = "${context.filesDir.absolutePath}/mkbootfs" - AssetsUtil.exportFiles(context, "mkbootfs", mkbootfsPath) - runCommand(false, "sed -i '/chmod -R 755 tools bin;/i cp -f $mkbootfsPath \$AKHOME/tools;' $binaryPath") + val kernelVersion = runCommandGetOutput(true, "cat /proc/version") + val versionRegex = """\d+\.\d+\.\d+""".toRegex() + val version = versionRegex.find(kernelVersion)?.value ?: "" + val toolName = when { + version.startsWith("5.10.") -> "5_10" + else -> "5_15+" + } + val toolPath = "${context.filesDir.absolutePath}/mkbootfs" + AssetsUtil.exportFiles(context, "$toolName-mkbootfs", toolPath) + state.addLog("${context.getString(R.string.kernel_version_log, version)} ${context.getString(R.string.tool_version_log, toolName)}") + runCommand(false, "sed -i '/chmod -R 755 tools bin;/i cp -f $toolPath \$AKHOME/tools;' $binaryPath") } private fun flash() { diff --git a/manager/app/src/main/res/values-zh-rCN/strings.xml b/manager/app/src/main/res/values-zh-rCN/strings.xml index 6f9e2c8b..0fce62e9 100644 --- a/manager/app/src/main/res/values-zh-rCN/strings.xml +++ b/manager/app/src/main/res/values-zh-rCN/strings.xml @@ -295,4 +295,6 @@ LKM修补/安装 GKI安装 + 内核版本:%1$s + 使用修补工具:%1$s diff --git a/manager/app/src/main/res/values/strings.xml b/manager/app/src/main/res/values/strings.xml index 382f6b9a..ac575ee8 100644 --- a/manager/app/src/main/res/values/strings.xml +++ b/manager/app/src/main/res/values/strings.xml @@ -299,4 +299,6 @@ LKM repair/installation GKI installation + Kernel version:%1$s + Using the patching tool:%1$s