mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-25 15:41:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Allow build of shim"

Browse Source 
This reverts commit 9a9ba1f76910eb6be35d4eba3902cc0caabc051c.

BUG=
TEST=

Review URL: http://codereview.chromium.org/4048002

Change-Id: I69d55a29bee690ac374c82a48fa718afe44dbaa1
This commit is contained in:
Ken Mixter 2010-10-22 17:09:28 -07:00
parent 7e493cb4d3
commit 9b07a8ed9d
1 changed files with 19 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
archive_build.sh
View File

@ -58,26 +58,20 @@ DEFAULT_USED=
# Reset "default" FLAGS_from based on passed-in board if not set on cmd-line
if [ "$FLAGS_from" = "$DEFAULT_FROM" ]
then
# Keep the directory name of the current image set (*.bin).
IMG_DIR="$(ls -t1 ${IMAGES_DIR}/${FLAGS_board} 2>&-| head -1)"
FLAGS_from="${IMAGES_DIR}/${FLAGS_board}/${IMG_DIR}"
FLAGS_from="${IMAGES_DIR}/$FLAGS_board/$(ls -t1 \
$IMAGES_DIR/$FLAGS_board 2>&-| head -1)"
DEFAULT_USED=1
fi
# Die on any errors.
set -e
if [ -z $DEFAULT_USED ]
if [ -z $DEFAULT_USED ] && [ $FLAGS_test_mod -eq $FLAGS_TRUE ]
then
if [ $FLAGS_test_mod -eq $FLAGS_TRUE ] || \
[ $FLAGS_factory_install_mod -eq $FLAGS_TRUE ] || \
[ $FLAGS_factory_test_mod -eq $FLAGS_TRUE ]
then
echo "test_mod requires that the default from path be used."
echo "If non default behavior is desired, run mod_image_for_test manually"
echo "re-run archive build without test_mod"
exit 1
fi
echo "test_mod requires that the default from path be used."
echo "If non default behavior is desired, run mod_image_for_test manually"
echo "re-run archive build without test_mod"
exit 1
fi
if [ ! -d "$FLAGS_from" ]
@ -158,12 +152,19 @@ then
"--factory"
fi
if [ $FLAGS_factory_install_mod -eq $FLAGS_TRUE ]
then
echo "Modifying image for factory install"
do_chroot_mod "${FLAGS_from}/chromiumos_factory_install_image.bin" \
"--factory_install"
fi
# Modify for recovery
if [ $FLAGS_official_build -eq $FLAGS_TRUE ]
then
BUILDVER=$(ls -t1 $IMAGES_DIR/$FLAGS_board 2>&-| head -1)
CHROOT_IMAGE_DIR=/home/$USER/trunk/src/build/images/$FLAGS_board/$BUILDVER
./enter_chroot.sh -- ./mod_image_for_recovery.sh --board $FLAGS_board \
BUILDVER=$(ls -t1 $IMAGES_DIR/$FLAGS_board 2>&-| head -1)
CHROOT_IMAGE_DIR=/home/$USER/trunk/src/build/images/$FLAGS_board/$BUILDVER
./enter_chroot.sh -- ./mod_image_for_recovery.sh --board $FLAGS_board \
--image $CHROOT_IMAGE_DIR/chromiumos_base_image.bin
fi
@ -172,19 +173,6 @@ if [ $FLAGS_test_mod -eq $FLAGS_TRUE ] ; then
rm -f ${SRC_IMAGE}
fi
# Build differently sized shims. Currently only factory install shim is
# supported, TODO(tgao): Add developer shim.
if [ $FLAGS_factory_install_mod -eq $FLAGS_TRUE ]
then
echo "Building factory install shim."
./enter_chroot.sh -- ./build_image --board $FLAGS_board --factory_install
# Get the install shim dir: It is the newest build.
# This is the output dir for the factory shim, the factory test and
# release umages will remain in IMG_DIR, defined previously.
SHIM_DIR="$(ls -t1 $IMAGES_DIR/$FLAGS_board 2>&-| head -1)"
fi
# Zip the build
echo "Compressing and archiving build..."
cd "$FLAGS_from"
@ -194,17 +182,8 @@ zip -r "${ZIPFILE}" ${MANIFEST}
if [ $FLAGS_factory_test_mod -eq $FLAGS_TRUE ] || \
[ $FLAGS_factory_install_mod -eq $FLAGS_TRUE ]
then
# We need to have directory structure for factory package, as
# signing and packaging utilities need unpack_partitions.sh.
echo "Compressing factory software"
pushd ..
[ -n "${SHIM_DIR}" ] && ln -sf "${SHIM_DIR}" factory_shim
[ -n "${IMG_DIR}" ] && ln -sf "${IMG_DIR}" factory_test
FACTORY_MANIFEST=`find factory_shim factory_test -follow \
-type f | grep -E "(factory_image|factory_install|partition)"`
zip "${FACTORY_ZIPFILE}" ${FACTORY_MANIFEST}
echo "Zipped"
popd
FACTORY_MANIFEST=`ls | grep factory`
zip -r "${FACTORY_ZIPFILE}" ${FACTORY_MANIFEST}
chmod 644 "${FACTORY_ZIPFILE}"
fi
cd -