From 8e48095cb3b554f764dbc796675c62b2258abb9c Mon Sep 17 00:00:00 2001 From: "J. Richard Barnette" Date: Tue, 30 Aug 2011 16:00:59 -0700 Subject: [PATCH] Delete some unused options from build_image and mod_image_for_recovery.sh BUG=None TEST=run both scripts, boot the images Change-Id: I7209421d3b438d6daf37f210d5e73c0b9f91eb1d Reviewed-on: http://gerrit.chromium.org/gerrit/6941 Tested-by: Richard Barnette Reviewed-by: Richard Barnette --- build_image | 9 +-------- build_library/test_image_util.sh | 5 +---- mod_image_for_test.sh | 2 -- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/build_image b/build_image index 7cc75bf467..9647a4b2c9 100755 --- a/build_image +++ b/build_image @@ -21,14 +21,10 @@ DEFINE_integer build_attempt 1 \ "The build attempt for this image build." DEFINE_string output_root "${DEFAULT_BUILD_ROOT}/images" \ "Directory in which to place image result directories (named by version)" -DEFINE_boolean eclean ${FLAGS_TRUE} \ - "Perform eclean- -d as part of this script to remove obsolete packages" DEFINE_boolean replace ${FLAGS_FALSE} \ "Overwrite existing output, if any." DEFINE_boolean withdev ${FLAGS_TRUE} \ "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 \ "How many packages to build in parallel at maximum." DEFINE_boolean statefuldev ${FLAGS_TRUE} \ @@ -181,10 +177,7 @@ DEVKEYSDIR="/usr/share/vboot/devkeys" # translate to /usr/local. 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 -fi +eclean-$BOARD -d packages check_blacklist diff --git a/build_library/test_image_util.sh b/build_library/test_image_util.sh index 1b7bb87fc2..9542f5a2fb 100755 --- a/build_library/test_image_util.sh +++ b/build_library/test_image_util.sh @@ -27,10 +27,7 @@ if [ $FLAGS_jobs -ne -1 ]; then EMERGE_JOBS="--jobs=$FLAGS_jobs" fi -export INSTALL_MASK="" -if [ ${FLAGS_installmask} -eq ${FLAGS_TRUE} ] ; then - INSTALL_MASK="${DEFAULT_INSTALL_MASK}" -fi +export INSTALL_MASK="${DEFAULT_INSTALL_MASK}" # Utility function for creating a copy of an image prior to diff --git a/mod_image_for_test.sh b/mod_image_for_test.sh index 1049706333..e6e4801662 100755 --- a/mod_image_for_test.sh +++ b/mod_image_for_test.sh @@ -23,8 +23,6 @@ DEFINE_string board "$DEFAULT_BOARD" "Board for which the image was built" b DEFINE_boolean factory $FLAGS_FALSE \ "Modify the image for manufacturing testing" f 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 \ "How many packages to build in parallel at maximum." j DEFINE_boolean yes $FLAGS_FALSE "Answer yes to all prompts" y