fix(*): Change default for --jobs to $NUM_JOBS

This makes parallelism behavior between parallel_emerge and emerge
consistent. NUM_JOBS is defined as the number of CPUs by common.sh
This commit is contained in:
Michael Marineau 2013-12-01 15:15:03 -08:00
parent c9c1efd276
commit 6452857e82
5 changed files with 6 additions and 5 deletions

View File

@ -51,7 +51,7 @@ DEFINE_integer build_attempt 1 \
"The build attempt for this image build." "The build attempt for this image build."
DEFINE_boolean fast "${DEFAULT_FAST}" \ DEFINE_boolean fast "${DEFAULT_FAST}" \
"Use the parallel_emerge wrapper script." "Use the parallel_emerge wrapper script."
DEFINE_integer jobs -1 \ DEFINE_integer jobs "${NUM_JOBS}" \
"How many packages to build in parallel at maximum." "How many packages to build in parallel at maximum."
DEFINE_boolean replace ${FLAGS_FALSE} \ DEFINE_boolean replace ${FLAGS_FALSE} \
"Overwrite existing output, if any." "Overwrite existing output, if any."

View File

@ -51,7 +51,7 @@ DEFINE_string accept_licenses "" \
"Licenses to append to the accept list." "Licenses to append to the accept list."
DEFINE_boolean fast "${DEFAULT_FAST}" \ DEFINE_boolean fast "${DEFAULT_FAST}" \
"Use the parallel_emerge wrapper script." "Use the parallel_emerge wrapper script."
DEFINE_integer jobs -1 \ DEFINE_integer jobs "${NUM_JOBS}" \
"How many packages to build in parallel at maximum." "How many packages to build in parallel at maximum."
DEFINE_boolean norebuild "${FLAGS_FALSE}" \ DEFINE_boolean norebuild "${FLAGS_FALSE}" \
"Don't automatically rebuild dependencies." "Don't automatically rebuild dependencies."

View File

@ -40,9 +40,10 @@ DEFINE_boolean getbinpkg $FLAGS_TRUE \
"Download binary packages from remote repository." "Download binary packages from remote repository."
DEFINE_boolean delete $FLAGS_FALSE "Delete an existing chroot." DEFINE_boolean delete $FLAGS_FALSE "Delete an existing chroot."
DEFINE_boolean replace $FLAGS_FALSE "Overwrite existing chroot, if any." DEFINE_boolean replace $FLAGS_FALSE "Overwrite existing chroot, if any."
DEFINE_integer jobs -1 "How many packages to build in parallel at maximum."
DEFINE_boolean fast "${DEFAULT_FAST}" \ DEFINE_boolean fast "${DEFAULT_FAST}" \
"Use the parallel_emerge wrapper script." "Use the parallel_emerge wrapper script."
DEFINE_integer jobs "${NUM_JOBS}" \
"How many packages to build in parallel at maximum."
DEFINE_string stage3_date "20130130" \ DEFINE_string stage3_date "20130130" \
"Use the stage3 with the given date." "Use the stage3 with the given date."
DEFINE_string stage3_path "" \ DEFINE_string stage3_path "" \

View File

@ -39,7 +39,7 @@ DEFINE_string board_overlay "" \
"Location of the board overlay." "Location of the board overlay."
DEFINE_boolean fast "${DEFAULT_FAST}" \ DEFINE_boolean fast "${DEFAULT_FAST}" \
"Use the parallel_emerge wrapper script." "Use the parallel_emerge wrapper script."
DEFINE_integer jobs -1 \ DEFINE_integer jobs "${NUM_JOBS}" \
"How many packages to build in parallel at maximum." "How many packages to build in parallel at maximum."
DEFINE_boolean latest_toolchain $FLAGS_FALSE \ DEFINE_boolean latest_toolchain $FLAGS_FALSE \
"Use the latest ebuild for all toolchain packages (gcc, binutils, libc, \ "Use the latest ebuild for all toolchain packages (gcc, binutils, libc, \

View File

@ -30,7 +30,7 @@ show_help_if_requested "$@"
# not needed for the typical developer workflow. # not needed for the typical developer workflow.
DEFINE_boolean fast ${DEFAULT_FAST} \ DEFINE_boolean fast ${DEFAULT_FAST} \
"Use the parallel_emerge wrapper script." "Use the parallel_emerge wrapper script."
DEFINE_integer jobs -1 \ DEFINE_integer jobs "${NUM_JOBS}" \
"How many packages to build in parallel at maximum." "How many packages to build in parallel at maximum."
DEFINE_boolean skip_toolchain_update $FLAGS_FALSE \ DEFINE_boolean skip_toolchain_update $FLAGS_FALSE \
"Don't update the toolchains." "Don't update the toolchains."