From 1e966bc9390599d16dc99f710dc63f6294b24812 Mon Sep 17 00:00:00 2001 From: Shoiya Date: Thu, 14 Nov 2024 23:16:31 -0300 Subject: [PATCH] Revert "treewide: adjust version counting" This reverts commit 4dee59bf1cc50f2247376df6ced85de732ecbfd4. --- 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 3c06d5ccca62..669297563b1d 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) + 194)) +$(eval KSU_VERSION=$(shell expr 10000 + $(KSU_GIT_VERSION) + 200)) $(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 a370a941d5ab..3bb25ee907cc 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 + 194 + return major * 10000 + commitCount + 200 } 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 a7db4b140504..021418acf722 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 + 194 + version_code; // For historical reasons + let version_code = 10000 + 200 + version_code; // For historical reasons let version_name = String::from_utf8( Command::new("git")