From 5436a22791d6dd39e54311117e21b7f3ff3e98e4 Mon Sep 17 00:00:00 2001 From: Jackeagle Date: Tue, 3 Mar 2026 14:37:18 +0530 Subject: [PATCH 1/2] 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 From 6dc1905b4905206473a6d2e4dd3554ecb58c07ca Mon Sep 17 00:00:00 2001 From: Jackeagle Date: Wed, 4 Mar 2026 19:36:56 +0530 Subject: [PATCH 2/2] build_kernel: Filter muppets repo groups during kernel sync When proprietary_gitlab.xml exists in local manifests, add repo group filtering to exclude unrelated muppets repos from the kernel source sync. This prevents sync failures for vendor repos that don't have the kernel manifest branch. --- build/envsetup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/envsetup.sh b/build/envsetup.sh index 2d52ed9d..c9e28efe 100644 --- a/build/envsetup.sh +++ b/build/envsetup.sh @@ -983,6 +983,9 @@ function build_kernel() { if [ -n "${REPO_VERSION}" ]; then repo_init_args+=("--repo-rev" "${REPO_VERSION}") fi + if [ -f "${ANDROID_BUILD_TOP}/.repo/local_manifests/proprietary_gitlab.xml" ]; then + repo_init_args+=("-g" "default,-darwin,-muppets,muppets_${LINEAGE_BUILD}") + fi yes | repo init -u https://github.com/LineageOS/${target_kernel_manifest}.git ${repo_init_args[@]} || [ $? -eq 141 ] if [ $? -ne 0 ]; then -- GitLab