From 47f1854c7a4765d3e4179a4f81190e2200debab8 Mon Sep 17 00:00:00 2001 From: Jackeagle Date: Tue, 3 Mar 2026 14:37:18 +0530 Subject: [PATCH] build_kernel: Use LINEAGE_UPSTREAM_VERSION for kernel manifest branch Add LINEAGE_UPSTREAM_VERSION to version.mk and use it in build_kernel() instead of deriving the branch from PRODUCT_VERSION_MAJOR/MINOR. This decouples the kernel manifest branch from the /e/OS version number, allowing it to be set independently as upstream LineageOS versions differ. Signed-off-by: Jackeagle --- build/envsetup.sh | 2 +- config/version.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build/envsetup.sh b/build/envsetup.sh index 9a803164..2d52ed9d 100644 --- a/build/envsetup.sh +++ b/build/envsetup.sh @@ -935,7 +935,7 @@ function build_kernel() { echo "Skipping kernel build" return fi - local lineage_version="lineage-$(_get_build_var_cached PRODUCT_VERSION_MAJOR).$(_get_build_var_cached PRODUCT_VERSION_MINOR)" + local lineage_version="$(_get_build_var_cached LINEAGE_UPSTREAM_VERSION)" local target_kernel_device="$(_get_build_var_cached TARGET_KERNEL_DEVICE)" local target_kernel_dir="${ANDROID_BUILD_TOP}/$(_get_build_var_cached TARGET_KERNEL_DIR)" diff --git a/config/version.mk b/config/version.mk index 6023a13b..27b59a49 100644 --- a/config/version.mk +++ b/config/version.mk @@ -2,6 +2,7 @@ ANDROID_LETTER := a16 PRODUCT_VERSION_MAJOR = 3 PRODUCT_VERSION_MINOR = 6 PRODUCT_VERSION_MAINTENANCE := 0 +LINEAGE_UPSTREAM_VERSION := lineage-23.0 PRODUCT_PRERELEASE_STRING = ifdef PRODUCT_PRERELEASE -- GitLab