From aebfaf132aeabff46104684c21516d6fe1aa92d2 Mon Sep 17 00:00:00 2001 From: bachnxuan Date: Thu, 25 Sep 2025 22:51:31 +0700 Subject: [PATCH 1/2] Revert "perf(sukisu): disable KPM patch to avoid battery drain" This reverts commit 8e27215dc31cc73e54e8bfeddef4a01aefb47abf. Signed-off-by: bachnxuan --- .gitmodules | 0 kernel_builder/config/variants.json | 4 ++-- kernel_builder/kernel_builder.py | 3 +++ {preserved/pre_build => kernel_builder/post_build}/kpm.py | 0 pyproject.toml | 8 ++++---- 5 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 .gitmodules rename {preserved/pre_build => kernel_builder/post_build}/kpm.py (100%) diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..e69de29 diff --git a/kernel_builder/config/variants.json b/kernel_builder/config/variants.json index 975a83d..f837454 100644 --- a/kernel_builder/config/variants.json +++ b/kernel_builder/config/variants.json @@ -39,7 +39,7 @@ }, "config": { "CONFIG_KSU": true, - "CONFIG_KPM": false, + "CONFIG_KPM": true, "CONFIG_KSU_SUSFS": false, "CONFIG_KSU_KPROBES_HOOK": false, "CONFIG_KSU_TRACEPOINT_HOOK": true @@ -79,7 +79,7 @@ }, "config": { "CONFIG_KSU": true, - "CONFIG_KPM": false, + "CONFIG_KPM": true, "CONFIG_KSU_KPROBES_HOOK": false, "CONFIG_KSU_TRACEPOINT_HOOK": true, "CONFIG_KSU_SUSFS": true, diff --git a/kernel_builder/kernel_builder.py b/kernel_builder/kernel_builder.py index d425bc4..ac6f188 100755 --- a/kernel_builder/kernel_builder.py +++ b/kernel_builder/kernel_builder.py @@ -15,6 +15,7 @@ from kernel_builder.constants import OUTPUT, TOOLCHAIN, WORKSPACE from kernel_builder.post_build.export_env import GithubExportEnv from kernel_builder.post_build.flashable import FlashableBuilder +from kernel_builder.post_build.kpm import KPMPatcher from kernel_builder.pre_build.ksu import KSUInstaller from kernel_builder.pre_build.lxc import LXCPatcher from kernel_builder.pre_build.susfs import SUSFSPatcher @@ -33,6 +34,7 @@ def __init__(self, ksu: str, susfs: bool, lxc: bool) -> None: self.use_susfs: bool = susfs self.use_lxc: bool = lxc + self.kpm: KPMPatcher = KPMPatcher(ksu) self.ksu: KSUInstaller = KSUInstaller(ksu, susfs) self.susfs: SUSFSPatcher = SUSFSPatcher(ksu, susfs) self.lxc: LXCPatcher = LXCPatcher(lxc) @@ -104,6 +106,7 @@ def run_build(self) -> None: self.builder.build() # Post build + self.kpm.patch() self.export_env.export_github_env() # Build flashable diff --git a/preserved/pre_build/kpm.py b/kernel_builder/post_build/kpm.py similarity index 100% rename from preserved/pre_build/kpm.py rename to kernel_builder/post_build/kpm.py diff --git a/pyproject.toml b/pyproject.toml index a8ed8a1..af6b5b8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,10 +1,10 @@ [project] name = "kernel_builder" version = "1.0.0" -description = "A python android12-5.10 gki kernel builder" +description = "A python gki kernel builder" readme = "README.md" license = "GPL-3.0" -license-files = ["LICENSE"] +license-files = ["LICEN[CS]E*"] requires-python = ">=3.12" dependencies = [ "lz4>=4.4.4", @@ -22,7 +22,7 @@ dependencies = [ [tool.ruff] target-version = "py312" line-length = 120 -extend-exclude = ["tests", "typings", "preserved"] +extend-exclude = ["tests", "typings"] [tool.ruff.lint] extend-select = ["I"] @@ -41,7 +41,7 @@ line-ending = "auto" [tool.basedpyright] include = ["kernel_builder"] -exclude = ["tests", "typings", "preserved"] +exclude = ["tests", "typings"] pythonVersion = "3.12" pythonPlatform = "Linux" From 6f6ee1ab532908adb59b8a63f5c1361da3d46264 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Sep 2025 15:52:51 +0000 Subject: [PATCH 2/2] chore(deps): bump typer from 0.17.4 to 0.19.1 Bumps [typer](https://github.com/fastapi/typer) from 0.17.4 to 0.19.1. - [Release notes](https://github.com/fastapi/typer/releases) - [Changelog](https://github.com/fastapi/typer/blob/master/docs/release-notes.md) - [Commits](https://github.com/fastapi/typer/compare/0.17.4...0.19.1) --- updated-dependencies: - dependency-name: typer dependency-version: 0.19.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- uv.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/uv.lock b/uv.lock index a6ddf2b..b53d069 100644 --- a/uv.lock +++ b/uv.lock @@ -327,7 +327,7 @@ wheels = [ [[package]] name = "typer" -version = "0.17.4" +version = "0.19.2" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "click" }, @@ -335,9 +335,9 @@ dependencies = [ { name = "shellingham" }, { name = "typing-extensions" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/92/e8/2a73ccf9874ec4c7638f172efc8972ceab13a0e3480b389d6ed822f7a822/typer-0.17.4.tar.gz", hash = "sha256:b77dc07d849312fd2bb5e7f20a7af8985c7ec360c45b051ed5412f64d8dc1580", size = 103734, upload-time = "2025-09-05T18:14:40.746Z" } +sdist = { url = "https://files.pythonhosted.org/packages/21/ca/950278884e2ca20547ff3eb109478c6baf6b8cf219318e6bc4f666fad8e8/typer-0.19.2.tar.gz", hash = "sha256:9ad824308ded0ad06cc716434705f691d4ee0bfd0fb081839d2e426860e7fdca", size = 104755, upload-time = "2025-09-23T09:47:48.256Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/93/72/6b3e70d32e89a5cbb6a4513726c1ae8762165b027af569289e19ec08edd8/typer-0.17.4-py3-none-any.whl", hash = "sha256:015534a6edaa450e7007eba705d5c18c3349dcea50a6ad79a5ed530967575824", size = 46643, upload-time = "2025-09-05T18:14:39.166Z" }, + { url = "https://files.pythonhosted.org/packages/00/22/35617eee79080a5d071d0f14ad698d325ee6b3bf824fc0467c03b30e7fa8/typer-0.19.2-py3-none-any.whl", hash = "sha256:755e7e19670ffad8283db353267cb81ef252f595aa6834a0d1ca9312d9326cb9", size = 46748, upload-time = "2025-09-23T09:47:46.777Z" }, ] [[package]]