kernel: improve Git repository detection for KernelSU versioning #3108
+11
−13
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44a4d55 to
23ede6c
Compare
ff3c78d to
684973d
Compare
5ec1cff
reviewed
Jan 10, 2026
d90ce42 to
c75edf8
Compare
5ec1cff
reviewed
Jan 12, 2026
Collaborator
5ec1cff
left a comment
There was a problem hiding this comment.
Ensuring that Kernel(KDIR)'s git root directory and MDIR(KernelSU)'s git root directory are different was based on the assumption that KernelSU and the kernel are located in different repositories. Checking this ensures that the commit count obtained comes from the KernelSU repository and not the kernel repository.
Collaborator
|
Why too slow? |
Contributor
Author
For integrating kernelsu without using git submodule, the speed is unacceptable. |
Contributor
Author
|
More precisely, since it is built within the tree, not explicitly passing KDIR causes KERNEL_GIT_ROOT to be empty. Changing it to $(srctree) resolves this issue. |
Collaborator
|
你可以讲讲有什么集成方式，如果你的集成方式完全没有 KernelSU 的原始仓库，那根本不需要数提交来获取版本号 |
Contributor
Author
手动复制和通过 git submodule 两种方式 |
Collaborator
|
如果是要兼容手动复制的方法，改这个的意义是什么？ |
Contributor
Author
|
#2102 和 pr 的描述我想说的已经很清楚了 |
5ec1cff
requested changes
Jan 13, 2026
5ec1cff
requested changes
Jan 13, 2026
5ec1cff
requested changes
Jan 14, 2026
The previous logic for detecting the Git repository in KernelSU's Kbuild assumed two distinct build scenarios—in-tree (as a submodule) and out-of-tree (standalone)—and used hardcoded path checks (e.g., `$(srctree)/$(src)/../.git` or `$(MDIR)/../.git`) to differentiate them. This approach is fragile, sensitive to directory layout changes, and fails in more complex repository structures (e.g., subtrees, nested worktrees, or non-standard submodules). This commit replaces the ad-hoc path inspection with `git rev-parse --show-toplevel`, which reliably determines the root of the containing Git repository from any subdirectory. This eliminates the need to distinguish between in-tree and out-of-tree builds and unifies the version detection logic into a single, robust code path. Additionally: - Removes the use of `realpath`, improving compatibility with older or minimal build environments where `realpath` may be unavailable. - Retains shallow-clone handling by unshallowing the repository before counting commits, ensuring accurate version numbers. - Adds an informative build message (`$(info ...)`) to indicate when a Git repository is successfully detected, aiding debuggability. This change makes KernelSU's build system more portable, maintainable, and resilient across diverse development and integration workflows. Signed-off-by: dabao1955 <[email protected]>
5ec1cff
approved these changes
Jan 14, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The previous logic for detecting the Git repository in KernelSU's Kbuild assumed two distinct build scenarios—in-tree (as a submodule) and out-of-tree (standalone)—and used hardcoded path checks (e.g.,
$(srctree)/$(src)/../.gitor$(MDIR)/../.git) to differentiate them. This approach is fragile, sensitive to directory layout changes, and fails in more complex repository structures (e.g., subtrees, nested worktrees, or non-standard submodules).This commit replaces the ad-hoc path inspection with
git rev-parse --show-toplevel, which reliably determines the root of the containing Git repository from any subdirectory. This eliminates the need to distinguish between in-tree and out-of-tree builds and unifies the version detection logic into a single, robust code path.Additionally:
realpath, improving compatibility with older or minimal build environments whererealpathmay be unavailable.$(info ...)) to indicate when a Git repository is successfully detected, aiding debuggability.This change makes Kbuild more portable, maintainable, and resilient across diverse development and integration workflows.