Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8cd99edb authored by Jackeagle's avatar Jackeagle Committed by Jackeagle
Browse files

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: default avatarJackeagle <jackeagle102@gmail.com>
parent d5a15c1c

src/build.sh

+14 −13
Original line number Diff line number Diff line
@@ -198,10 +198,11 @@ 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



  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
@@ -212,7 +213,7 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; 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"