From 566dcf4d566d5b7ee7428112fa703c495f32356b Mon Sep 17 00:00:00 2001 From: Pete Fotheringham Date: Thu, 5 Sep 2024 16:15:32 +0100 Subject: [PATCH] Disable LOCAL_MIROR & BUILD_OVERLAY for now --- src/new_build.sh | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/src/new_build.sh b/src/new_build.sh index 2ec9256..23df685 100755 --- a/src/new_build.sh +++ b/src/new_build.sh @@ -171,22 +171,24 @@ fi # Sync mirror if we're using one if [ "$LOCAL_MIRROR" = true ]; then + echo "Using LOCAL_MIRROR is not yet working" - cd "$MIRROR_DIR" - if [ "$INIT_MIRROR" = true ]; then - if [ ! -d .repo ]; then - echo ">> [$(date)] Initializing mirror repository" | tee -a "$repo_log" - ( yes||: ) | repo init -u https://github.com/LineageOS/mirror --mirror --no-clone-bundle -p linux --git-lfs &>> "$repo_log" - fi - else - echo ">> [$(date)] Initializing mirror repository disabled" | tee -a "$repo_log" - fi - if [ "$SYNC_MIRROR" = true ]; then - echo ">> [$(date)] Syncing mirror repository" | tee -a "$repo_log" - repo sync "${jobs_arg[@]}" "${retry_fetches_arg[@]}" --force-sync --no-clone-bundle &>> "$repo_log" - else - echo ">> [$(date)] Sync mirror repository disabled" | tee -a "$repo_log" - fi + # cd "$MIRROR_DIR" + # if [ "$INIT_MIRROR" = true ]; then + # if [ ! -d .repo ]; then + # echo ">> [$(date)] Initializing mirror repository" | tee -a "$repo_log" + # ( yes||: ) | repo init -u https://github.com/LineageOS/mirror --mirror --no-clone-bundle -p linux --git-lfs &>> "$repo_log" + # fi + # else + # echo ">> [$(date)] Initializing mirror repository disabled" | tee -a "$repo_log" + # fi + # if [ "$SYNC_MIRROR" = true ]; then + # echo ">> [$(date)] Syncing mirror repository" | tee -a "$repo_log" + # repo sync "${jobs_arg[@]}" "${retry_fetches_arg[@]}" --force-sync --no-clone-bundle &>> "$repo_log" + # + # else + # echo ">> [$(date)] Sync mirror repository disabled" | tee -a "$repo_log" + # fi fi @@ -244,13 +246,15 @@ for codename in ${devices//,/ }; do # Setup our overlays if [ "$BUILD_OVERLAY" = true ]; then - lowerdir=$SRC_DIR/$branch_dir - upperdir=$TMP_DIR/device - workdir=$TMP_DIR/workdir - merged=$TMP_DIR/merged - mkdir -p "$upperdir" "$workdir" "$merged" - mount -t overlay overlay -o lowerdir="$lowerdir",upperdir="$upperdir",workdir="$workdir" "$merged" - source_dir="$TMP_DIR/merged" + echo "Using BUILD_OVERLAY is not yet working" + + # lowerdir=$SRC_DIR/$branch_dir + # upperdir=$TMP_DIR/device + # workdir=$TMP_DIR/workdir + # merged=$TMP_DIR/merged + # mkdir -p "$upperdir" "$workdir" "$merged" + # mount -t overlay overlay -o lowerdir="$lowerdir",upperdir="$upperdir",workdir="$workdir" "$merged" + # source_dir="$TMP_DIR/merged" else source_dir="$SRC_DIR/$branch_dir" fi