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

Commit 0e825f8c authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Revert "feat(sync): support REPO_SYNC_JOBS override" 

This reverts commit a0d905b2
parent 1e199d32

Dockerfile

+0 −4
Original line number Diff line number Diff line
@@ -47,10 +47,6 @@ ENV CHANGE_REF='' 
# A size of 0 deactivates --depth N

ENV REPO_INIT_DEPTH=0



# Optional parameter to override repo sync parallelism

# It must be a positive integer; when unset, build.sh derives a default and caps it at 10

ENV REPO_SYNC_JOBS=''



# User identity

ENV USER_NAME='/e/ robot'

ENV USER_MAIL='erobot@e.email'

Dockerfile.community

+0 −4
Original line number Diff line number Diff line
@@ -38,10 +38,6 @@ ENV RELEASE_TYPE='UNOFFICIAL' 
# Repo use for build

ENV REPO='https://gitlab.e.foundation/e/os/android.git'



# Optional parameter to override repo sync parallelism

# It must be a positive integer; when unset, build.sh derives a default and caps it at 10

ENV REPO_SYNC_JOBS=''



# Repo use for build

ENV MIRROR='https://github.com/LineageOS/mirror'

README.md

+0 −3
Original line number Diff line number Diff line
@@ -130,9 +130,6 @@ Other useful settings are: 
    the tree is cleaned with `mka clean`. If you want to be sure that each build

    is isolated from the others, set `BUILD_OVERLAY` to `true` (longer build

    time). Requires `--cap-add=SYS_ADMIN`.

 * `REPO_SYNC_JOBS`: overrides the `repo sync -j` value. It must be a positive

    integer. When unset, the script derives a default from available CPUs and

    caps it at `10`.

 * `MIRROR (https://github.com/LineageOS/mirror)`: Repo used for mirror

 * `LOCAL_MIRROR (false)`: change this to `true` if you want to create a local

    mirror of the LineageOS source (> 200 GB)

build-community.sh

+2 −10
Original line number Diff line number Diff line
@@ -21,16 +21,8 @@ 
repo_log="$LOGS_DIR/repo-$(date +%Y%m%d).log"



# Determine the number of parallel jobs to use for repo sync

if [ -n "${REPO_SYNC_JOBS+x}" ]; then

  if [[ ! "$REPO_SYNC_JOBS" =~ ^[0-9]+$ ]] || [ "$REPO_SYNC_JOBS" -le 0 ]; then

    echo ">> [$(date)] Invalid REPO_SYNC_JOBS value '$REPO_SYNC_JOBS': expected a positive integer"

    exit 1

  fi

  JOBS=$REPO_SYNC_JOBS

else

nproc_value=$(nproc --all)

JOBS=$((nproc_value > 10 ? 10 : nproc_value))

fi



source /root/init-ccache.sh

src/build.sh

+2 −10
Original line number Diff line number Diff line
@@ -21,16 +21,8 @@ 
cd "$SRC_DIR" || return 1



# Determine the number of parallel jobs to use for repo sync

if [ -n "${REPO_SYNC_JOBS+x}" ]; then

  if [[ ! "$REPO_SYNC_JOBS" =~ ^[0-9]+$ ]] || [ "$REPO_SYNC_JOBS" -le 0 ]; then

    echo ">> [$(date)] Invalid REPO_SYNC_JOBS value '$REPO_SYNC_JOBS': expected a positive integer"

    exit 1

  fi

  JOBS=$REPO_SYNC_JOBS

else

nproc_value=$(nproc --all)

JOBS=$((nproc_value > 10 ? 10 : nproc_value))

fi



if [ -f /root/userscripts/begin.sh ]; then

  echo ">> [$(date)] Running begin.sh"