From d06afcff0a7911431ffab32f36a4dbf1d2364e5b Mon Sep 17 00:00:00 2001 From: backslashxx <118538522+backslashxx@users.noreply.github.com> Date: Thu, 14 Nov 2024 12:05:48 +0800 Subject: [PATCH] KernelSU v1.0.2+magic Removed/Skipped: (-1) [1.0] Drop Non-GKI Support (tiann#1483) - upstream commit: tiann/KernelSU@898e9d4 - upstream policy change tiann#1705 Added from 5ec1cff/KernelSU @ https://github.com/5ec1cff/KernelSU/commit/92d793d0e0e80ed0e87af9e39879d2b70c37c748 (+17) implement magic mount no need to deny relabel restorecon: set adb_file to system_file for module files magic_mount: use trusted.overlay.opaque chore: fmt magic_mount: supports whiteout chore: refine code magic_mount: fix log: make verbose logging optional magic_mount: refine ksud: fix disable / enable modules ksud: fix odm not magic-mounted manager: no need to check overlayfs ksud: fix partition link ksud: fix clone symlink ksud: refine tmpfs ksud: add KSU_MAGIC_MOUNT to env Added from: tiann#2273 (+1) Update Busybox Added: personal changes (+8) kernel: expose allowlist workaround as Kconfig option kernel/core_hook.c: use upstream ksu_umount_mnt kernel: require path_umount backporting workflows: debloat dummy.keystore manager: failure mode dummy demo manager: unofficial build KernelSU v1.0.2+magic Warning: Managers built from this repo has a known keystore. See dummy.keystore. Make sure to also chant, "thank you 5ec1cff" before you sleep. Signed-off-by: backslashxx <118538522+backslashxx@users.noreply.github.com> --- kernel/Makefile | 2 +- manager/build.gradle.kts | 4 ++-- userspace/ksud/build.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index 296e2ce80bb3..272b6dfd0e8e 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -21,7 +21,7 @@ ifeq ($(shell test -e $(srctree)/$(src)/../.git; echo $$?),0) $(shell cd $(srctree)/$(src); /usr/bin/env PATH="$$PATH":/usr/bin:/usr/local/bin [ -f ../.git/shallow ] && git fetch --unshallow) KSU_GIT_VERSION := $(shell cd $(srctree)/$(src); /usr/bin/env PATH="$$PATH":/usr/bin:/usr/local/bin git rev-list --count HEAD) # ksu_version: major * 10000 + git version + 200 for historical reasons -$(eval KSU_VERSION=$(shell expr 10000 + $(KSU_GIT_VERSION) + 200)) +$(eval KSU_VERSION=$(shell expr 10000 + $(KSU_GIT_VERSION) + 175)) $(info -- KernelSU version: $(KSU_VERSION)) ccflags-y += -DKSU_VERSION=$(KSU_VERSION) else # If there is no .git file, the default version will be passed. diff --git a/manager/build.gradle.kts b/manager/build.gradle.kts index 3c4f02e7faef..1e08ab84f1f8 100644 --- a/manager/build.gradle.kts +++ b/manager/build.gradle.kts @@ -58,7 +58,7 @@ fun getGitDescribe(): String { fun getVersionCode(): Int { val commitCount = getGitCommitCount() val major = 1 - return major * 10000 + commitCount + 200 + return major * 10000 + commitCount + 175 } fun getVersionName(): String { @@ -95,4 +95,4 @@ subprojects { } } } -} \ No newline at end of file +} diff --git a/userspace/ksud/build.rs b/userspace/ksud/build.rs index 021418acf722..b78d69924792 100644 --- a/userspace/ksud/build.rs +++ b/userspace/ksud/build.rs @@ -15,7 +15,7 @@ fn get_git_version() -> Result<(u32, String), std::io::Error> { .trim() .parse() .map_err(|_| std::io::Error::new(std::io::ErrorKind::Other, "Failed to parse git count"))?; - let version_code = 10000 + 200 + version_code; // For historical reasons + let version_code = 10000 + 175 + version_code; // For historical reasons let version_name = String::from_utf8( Command::new("git")