mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-08 05:26:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Delete some unused options from build_image and mod_image_for_recovery.sh

Browse Source 
BUG=None
TEST=run both scripts, boot the images

Change-Id: I7209421d3b438d6daf37f210d5e73c0b9f91eb1d
Reviewed-on: http://gerrit.chromium.org/gerrit/6941
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Richard Barnette <jrbarnette@chromium.org>
This commit is contained in:
J. Richard Barnette 2011-08-30 16:00:59 -07:00 committed by Richard Barnette
parent d7a3503914
commit 8e48095cb3
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build_image
View File

@ -21,14 +21,10 @@ DEFINE_integer build_attempt 1 \
"The build attempt for this image build." "The build attempt for this image build."
DEFINE_string output_root "${DEFAULT_BUILD_ROOT}/images" \ DEFINE_string output_root "${DEFAULT_BUILD_ROOT}/images" \
"Directory in which to place image result directories (named by version)" "Directory in which to place image result directories (named by version)"
DEFINE_boolean eclean ${FLAGS_TRUE} \
"Perform eclean-<board> -d as part of this script to remove obsolete packages"
DEFINE_boolean replace ${FLAGS_FALSE} \ DEFINE_boolean replace ${FLAGS_FALSE} \
"Overwrite existing output, if any." "Overwrite existing output, if any."
DEFINE_boolean withdev ${FLAGS_TRUE} \ DEFINE_boolean withdev ${FLAGS_TRUE} \
"Include useful developer friendly utilities in the image." "Include useful developer friendly utilities in the image."
DEFINE_boolean installmask ${FLAGS_TRUE} \
"Use INSTALL_MASK to shrink the resulting image."
DEFINE_integer jobs -1 \ DEFINE_integer jobs -1 \
"How many packages to build in parallel at maximum." "How many packages to build in parallel at maximum."
DEFINE_boolean statefuldev ${FLAGS_TRUE} \ DEFINE_boolean statefuldev ${FLAGS_TRUE} \
@ -181,10 +177,7 @@ DEVKEYSDIR="/usr/share/vboot/devkeys"
# translate to /usr/local. # translate to /usr/local.
DEV_IMAGE_ROOT="${STATEFUL_FS_DIR}/dev_image" DEV_IMAGE_ROOT="${STATEFUL_FS_DIR}/dev_image"
# Perform an eclean to remove packages which are not installed
if [ $FLAGS_eclean -eq $FLAGS_TRUE ]; then
eclean-$BOARD -d packages eclean-$BOARD -d packages
fi
check_blacklist check_blacklist

5
build_library/test_image_util.sh
View File

@ -27,10 +27,7 @@ if [ $FLAGS_jobs -ne -1 ]; then
EMERGE_JOBS="--jobs=$FLAGS_jobs" EMERGE_JOBS="--jobs=$FLAGS_jobs"
fi fi
export INSTALL_MASK="" export INSTALL_MASK="${DEFAULT_INSTALL_MASK}"
if [ ${FLAGS_installmask} -eq ${FLAGS_TRUE} ] ; then
INSTALL_MASK="${DEFAULT_INSTALL_MASK}"
fi
# Utility function for creating a copy of an image prior to # Utility function for creating a copy of an image prior to

2
mod_image_for_test.sh
View File

@ -23,8 +23,6 @@ DEFINE_string board "$DEFAULT_BOARD" "Board for which the image was built" b
DEFINE_boolean factory $FLAGS_FALSE \ DEFINE_boolean factory $FLAGS_FALSE \
"Modify the image for manufacturing testing" f "Modify the image for manufacturing testing" f
DEFINE_string image "" "Location of the rootfs raw image file" i DEFINE_string image "" "Location of the rootfs raw image file" i
DEFINE_boolean installmask $FLAGS_TRUE \
"Use INSTALL_MASK to shrink the resulting image." m
DEFINE_integer jobs -1 \ DEFINE_integer jobs -1 \
"How many packages to build in parallel at maximum." j "How many packages to build in parallel at maximum." j
DEFINE_boolean yes $FLAGS_FALSE "Answer yes to all prompts" y DEFINE_boolean yes $FLAGS_FALSE "Answer yes to all prompts" y