From 956e50eb14765dcd99026603031cd8d57eec5876 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-5-legacy / 11991 This corresponds to v1.0.2-5 / 11991 upstream Removed/Skipped: (-2) [1.0] Drop Non-GKI Support (#1483) - upstream commit: https://github.com/tiann/KernelSU/commit/898e9d4f8ca9b2f46b0c6b36b80a872b5b88d899 - upstream policy change https://github.com/tiann/KernelSU/issues/1705 Drop some legacy codes (tiann#1981) - upstream commit: https://github.com/tiann/KernelSU/commit/fd09ccfc2906ad119f7158f9518810e06a73a919 - fsopen has to be backported for this one Added: (+11) kernel: expose allowlist workaround as Kconfig option kernel: selinux: add security_bounded_transition hook for < 4.14 kernel: selinux: fix redefined KERNEL_SU_DOMAIN kernel/core_hook.c: use upstream ksu_umount_mnt kernel: require path_umount backporting ksud: resize sparse to 16GB workflows: debloat dummy.keystore manager: failure mode dummy demo manager: unofficial build KernelSU v1.0.2-5-legacy / 11991 Warning: Managers built from this repo has a known keystore. See dummy.keystore. 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 82e788031cc9..de6afef22c66 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -22,7 +22,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) + 191)) $(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..1a92bc0f99e2 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 + 191 } 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..43e789407ca2 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 + 191 + version_code; // For historical reasons let version_name = String::from_utf8( Command::new("git")