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

Remove --nofast --nostatefuldev from build_image as they are never used.

Browse Source 
BUG=chromium-os:27362
TEST=Built a test image.

Change-Id: I884acd534f06d9070b28d5cd74862e2774822578
Reviewed-on: https://gerrit.chromium.org/gerrit/17759
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Chris Sosa <sosa@chromium.org>
Commit-Ready: Chris Sosa <sosa@chromium.org>
This commit is contained in:
Chris Sosa 2012-03-09 15:27:48 -08:00 committed by Gerrit
parent 839e82adc8
commit e9e2d66366
3 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build_image
View File

@ -25,8 +25,6 @@ DEFINE_boolean replace ${FLAGS_FALSE} \
"Overwrite existing output, if any." "Overwrite existing output, if any."
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} \
"Install development packages on stateful partition rather than the rootfs"
DEFINE_integer rootfs_partition_size 1024 \ DEFINE_integer rootfs_partition_size 1024 \
"rootfs partition size in MiBs." "rootfs partition size in MiBs."
DEFINE_integer rootfs_size 850 \ DEFINE_integer rootfs_size 850 \
@ -36,8 +34,6 @@ DEFINE_integer rootfs_hash_pad 8 \
"MiBs reserved at the end of the rootfs image." "MiBs reserved at the end of the rootfs image."
DEFINE_integer statefulfs_size 1024 \ DEFINE_integer statefulfs_size 1024 \
"stateful filesystem size in MiBs." "stateful filesystem size in MiBs."
DEFINE_boolean fast ${DEFAULT_FAST} \
"Call many emerges in parallel"
DEFINE_string boot_args "noinitrd" \ DEFINE_string boot_args "noinitrd" \
"Additional boot arguments to pass to the commandline" "Additional boot arguments to pass to the commandline"

7
build_library/dev_image_util.sh
View File

@ -20,9 +20,7 @@ install_dev_packages() {
"${STATEFUL_FS_DIR}" "${ESP_FS_DIR}" "${STATEFUL_FS_DIR}" "${ESP_FS_DIR}"
# Determine the root dir for developer packages. # Determine the root dir for developer packages.
local root_dev_dir="${ROOT_FS_DIR}" local root_dev_dir="${ROOT_FS_DIR}/usr/local"
[ ${FLAGS_statefuldev} -eq ${FLAGS_TRUE} ] &&
root_dev_dir="${ROOT_FS_DIR}/usr/local"
# Install developer packages described in chromeos-dev. # Install developer packages described in chromeos-dev.
emerge_to_image --root="${root_dev_dir}" chromeos-dev emerge_to_image --root="${root_dev_dir}" chromeos-dev
@ -34,11 +32,10 @@ install_dev_packages() {
./usr/lib/debug/usr/${CHOST} --strip-components=6 ./usr/lib/debug/usr/${CHOST} --strip-components=6
# Install the bare necessary files so that the "emerge" command works # Install the bare necessary files so that the "emerge" command works
if [ ${FLAGS_statefuldev} -eq ${FLAGS_TRUE} ]; then
sudo cp -a ${root_dev_dir}/share/portage ${ROOT_FS_DIR}/usr/share sudo cp -a ${root_dev_dir}/share/portage ${ROOT_FS_DIR}/usr/share
sudo sed -i s,/usr/bin/wget,wget, \ sudo sed -i s,/usr/bin/wget,wget, \
${ROOT_FS_DIR}/usr/share/portage/config/make.globals ${ROOT_FS_DIR}/usr/share/portage/config/make.globals
fi
sudo mkdir -p ${ROOT_FS_DIR}/etc/make.profile sudo mkdir -p ${ROOT_FS_DIR}/etc/make.profile
# Re-run ldconfig to fix /etc/ldconfig.so.cache. # Re-run ldconfig to fix /etc/ldconfig.so.cache.

9
build_library/test_image_util.sh
View File

@ -17,12 +17,9 @@
# build_image and mod_image_for_test.sh. The code is not used # build_image and mod_image_for_test.sh. The code is not used
# by the mod_image_for_test function. # by the mod_image_for_test function.
EMERGE_BOARD_CMD="emerge-$BOARD" EMERGE_BOARD_CMD="$GCLIENT_ROOT/chromite/bin/parallel_emerge"
if [ $FLAGS_fast -eq $FLAGS_TRUE ]; then EMERGE_BOARD_CMD="$EMERGE_BOARD_CMD --board=$BOARD"
echo "Using alternate emerge"
EMERGE_BOARD_CMD="$GCLIENT_ROOT/chromite/bin/parallel_emerge"
EMERGE_BOARD_CMD="$EMERGE_BOARD_CMD --board=$BOARD"
fi
if [ $FLAGS_jobs -ne -1 ]; then if [ $FLAGS_jobs -ne -1 ]; then
EMERGE_JOBS="--jobs=$FLAGS_jobs" EMERGE_JOBS="--jobs=$FLAGS_jobs"
fi fi