From 68545e857a3f55e0d31605d4a97d07e20aa74fa1 Mon Sep 17 00:00:00 2001
From: Jackeagle <116548-Jackeagle@users.noreply.gitlab.e.foundation>
Date: Wed, 5 Feb 2025 13:38:03 +0000
Subject: [PATCH 1/2] build.sh: Skip local_manifests when REPO_CUSTOM_MANIFEST

- Since REPO_CUSTOM_MANIFEST file already has all device and vendor blobs stack, it conflicts with muppets manifest when running in parallel.

Signed-off-by: Jackeagle <jackeagle102@gmail.com>
---
 src/build.sh | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/build.sh b/src/build.sh
index eca2ccb..970d07b 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -195,21 +195,22 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
   echo ">> [$(date)] Running: repo init $REPO_INIT_PARAM -u \"$REPO\" -b \"${TAG_PREFIX}${BRANCH_NAME}\" $REPO_GROUPS"
   yes | repo init $REPO_INIT_PARAM -u "$REPO" -b "${TAG_PREFIX}${BRANCH_NAME}" $REPO_GROUPS
 
-  if [ "$REPO_CUSTOM_MANIFEST" != false ]; then
-    wget -O .repo/manifests/default.xml $REPO_CUSTOM_MANIFEST
+  if [ -n "$REPO_CUSTOM_MANIFEST" ] && [ "$REPO_CUSTOM_MANIFEST" != "false" ]; then
+      wget -O .repo/manifests/default.xml "$REPO_CUSTOM_MANIFEST"
   fi
 
-  # Copy local manifests to the appropriate folder in order take them into consideration
-  echo ">> [$(date)] Copying '$LMANIFEST_DIR/*.xml' to '.repo/local_manifests/'"
-  mkdir -p .repo/local_manifests
-  rsync -a --delete --include '*.xml' --exclude '*' "$LMANIFEST_DIR/" .repo/local_manifests/
-
-  rm -f .repo/local_manifests/proprietary.xml
-  if [ "$INCLUDE_PROPRIETARY" = true ]; then
-    wget -q -O .repo/local_manifests/proprietary.xml "https://raw.githubusercontent.com/TheMuppets/manifests/$themuppets_branch/muppets.xml"
-    /root/build_manifest.py --remote "https://gitlab.com" --remotename "gitlab_https" \
-      "https://gitlab.com/the-muppets/manifest/raw/$themuppets_branch/muppets.xml" .repo/local_manifests/proprietary_gitlab.xml
-
+  if [ -z "$REPO_CUSTOM_MANIFEST" ] || [ "$REPO_CUSTOM_MANIFEST" = "false" ]; then
+      # Copy local manifests to the appropriate folder in order take them into consideration
+      echo ">> [$(date)] Copying '$LMANIFEST_DIR/*.xml' to '.repo/local_manifests/'"
+      mkdir -p .repo/local_manifests
+      rsync -a --delete --include '*.xml' --exclude '*' "$LMANIFEST_DIR/" .repo/local_manifests/
+
+      rm -f .repo/local_manifests/proprietary.xml
+      if [ "$INCLUDE_PROPRIETARY" = true ]; then
+        wget -q -O .repo/local_manifests/proprietary.xml "https://raw.githubusercontent.com/TheMuppets/manifests/$themuppets_branch/muppets.xml"
+        /root/build_manifest.py --remote "https://gitlab.com" --remotename "gitlab_https" \
+          "https://gitlab.com/the-muppets/manifest/raw/$themuppets_branch/muppets.xml" .repo/local_manifests/proprietary_gitlab.xml
+      fi
   fi
 
   echo ">> [$(date)] Syncing branch repository"
-- 
GitLab


From 9a6292a381d4bcd9e797f804250c43d1d9855ee3 Mon Sep 17 00:00:00 2001
From: Jackeagle <116548-Jackeagle@users.noreply.gitlab.e.foundation>
Date: Wed, 5 Feb 2025 13:58:29 +0000
Subject: [PATCH 2/2] build.sh: Remove all local_manifests if
 REPO_CUSTOM_MANIFEST set

Signed-off-by: Jackeagle <jackeagle102@gmail.com>
---
 src/build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/build.sh b/src/build.sh
index 970d07b..53ae3c7 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -197,6 +197,7 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
 
   if [ -n "$REPO_CUSTOM_MANIFEST" ] && [ "$REPO_CUSTOM_MANIFEST" != "false" ]; then
       wget -O .repo/manifests/default.xml "$REPO_CUSTOM_MANIFEST"
+      rm -f .repo/local_manifests/*.xml
   fi
 
   if [ -z "$REPO_CUSTOM_MANIFEST" ] || [ "$REPO_CUSTOM_MANIFEST" = "false" ]; then
-- 
GitLab