Skip to content

Commit

Permalink
KernelSU: 11988
Browse files Browse the repository at this point in the history
This corresponds to 11988 upstream

Removed/Skipped: (-2)
	[1.0] Drop Non-GKI Support (tiann#1483)
		- upstream commit: tiann@898e9d4
		- upstream policy change tiann#1705
	Drop some legacy codes (tiann#1981)
		- upstream commit: tiann@fd09ccf
		- fsopen has to be backported for this one

Added: (+10)
	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
	workflows: debloat
	dummy.keystore
	manager: failure mode dummy demo
	manager: unofficial build
	KernelSU v1.0.2-legacy / 11986

Warning: Managers built from this repo has a known keystore. See dummy.keystore.

Signed-off-by: backslashxx <118538522+backslashxx@users.noreply.github.com>
  • Loading branch information
backslashxx committed Nov 16, 2024
1 parent a146ccd commit 48daf43
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion kernel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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) + 193))
$(info -- KernelSU version: $(KSU_VERSION))
ccflags-y += -DKSU_VERSION=$(KSU_VERSION)
else # If there is no .git file, the default version will be passed.
Expand Down
4 changes: 2 additions & 2 deletions manager/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 + 193
}

fun getVersionName(): String {
Expand Down Expand Up @@ -95,4 +95,4 @@ subprojects {
}
}
}
}
}
2 changes: 1 addition & 1 deletion userspace/ksud/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 + 193 + version_code; // For historical reasons

let version_name = String::from_utf8(
Command::new("git")
Expand Down

0 comments on commit 48daf43

Please sign in to comment.