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

Build factory install shim by ebuild

Browse Source 
Now that we have an ebuild for factory install shim, let's move to that
instead of base image.

BUG=chrome-os-partner:16712
TEST=Test network boot, install shim, RMA shim on Link.
     Test install shim on Snow.
CQ-DEPEND=CL:39952

Change-Id: Ib6a7a598087647b44a4aeca970e293ea72023890
Signed-off-by: Vic Yang <victoryang@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/39955
Reviewed-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
This commit is contained in:
Vic Yang 2012-12-18 22:31:46 +08:00 committed by Gerrit
parent 74f163b587
commit 8e0cd07e03
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build_image
View File

@ -113,9 +113,9 @@ done
# TODO: <prebuild hook> # TODO: <prebuild hook>
# Tweak flags, configure extra USE flags, and add packages for the factory BASE_PACKAGE="chromeos-base/chromeos"
# Tweak flags, configure extra USE flags, and set base packages for the factory
# install shim. # install shim.
EXTRA_PACKAGES=""
if should_build_image ${CHROMEOS_FACTORY_INSTALL_SHIM_NAME}; then if should_build_image ${CHROMEOS_FACTORY_INSTALL_SHIM_NAME}; then
# TODO: Build a separated ebuild for the install shim to reduce size. # TODO: Build a separated ebuild for the install shim to reduce size.
INSTALL_MASK="${FACTORY_SHIM_INSTALL_MASK}" INSTALL_MASK="${FACTORY_SHIM_INSTALL_MASK}"
@ -123,8 +123,8 @@ if should_build_image ${CHROMEOS_FACTORY_INSTALL_SHIM_NAME}; then
# Add the cros_factory_install boot arg. # Add the cros_factory_install boot arg.
FLAGS_boot_args="${FLAGS_boot_args} cros_factory_install" FLAGS_boot_args="${FLAGS_boot_args} cros_factory_install"
# Factory install needs to have the factory installer added. BASE_PACKAGE="chromeos-base/chromeos-installshim"
EXTRA_PACKAGES="${EXTRA_PACKAGES} chromeos-base/chromeos-factoryinstall"
# On x86/amd64, we boot the factory install shim from an SD card using # On x86/amd64, we boot the factory install shim from an SD card using
# initramfs for our root. On ARM, we boot the factory install shim over the # initramfs for our root. On ARM, we boot the factory install shim over the
# network, so we don't require initramfs, but we do require fbconsole to fix # network, so we don't require initramfs, but we do require fbconsole to fix

2
build_library/base_image_util.sh
View File

@ -197,7 +197,7 @@ create_base_image() {
# runtime packages for chrome os. This builds up a chrome os image from # runtime packages for chrome os. This builds up a chrome os image from
# binary packages with runtime dependencies only. We use INSTALL_MASK to # binary packages with runtime dependencies only. We use INSTALL_MASK to
# trim the image size as much as possible. # trim the image size as much as possible.
emerge_to_image --root="${root_fs_dir}" chromeos ${EXTRA_PACKAGES} emerge_to_image --root="${root_fs_dir}" ${BASE_PACKAGE}
# Set /etc/lsb-release on the image. # Set /etc/lsb-release on the image.
"${OVERLAY_CHROMEOS_DIR}/scripts/cros_set_lsb_release" \ "${OVERLAY_CHROMEOS_DIR}/scripts/cros_set_lsb_release" \

4
build_library/build_image_util.sh
View File

@ -94,14 +94,14 @@ parse_build_image_args() {
check_blacklist() { check_blacklist() {
info "Verifying that the base image does not contain a blacklisted package." info "Verifying that the base image does not contain a blacklisted package."
info "Generating list of packages for chromeos-base/chromeos." info "Generating list of packages for ${BASE_PACKAGE}."
local package_blacklist_file="${BUILD_LIBRARY_DIR}/chromeos_blacklist" local package_blacklist_file="${BUILD_LIBRARY_DIR}/chromeos_blacklist"
if [ ! -e "${package_blacklist_file}" ]; then if [ ! -e "${package_blacklist_file}" ]; then
warn "Missing blacklist file." warn "Missing blacklist file."
return return
fi fi
local blacklisted_packages=$(${SCRIPTS_DIR}/get_package_list \ local blacklisted_packages=$(${SCRIPTS_DIR}/get_package_list \
--board="${BOARD}" chromeos-base/chromeos \ --board="${BOARD}" "${BASE_PACKAGE}" \
| grep -x -f "${package_blacklist_file}") | grep -x -f "${package_blacklist_file}")
if [ -n "${blacklisted_packages}" ]; then if [ -n "${blacklisted_packages}" ]; then
die "Blacklisted packages found: ${blacklisted_packages}." die "Blacklisted packages found: ${blacklisted_packages}."

2
build_packages
View File

@ -169,8 +169,8 @@ if [[ $# -eq 0 ]]; then
PACKAGES+=( chromeos-base/chromeos-dev-init ) PACKAGES+=( chromeos-base/chromeos-dev-init )
fi fi
if [[ "${FLAGS_withfactory}" -eq "${FLAGS_TRUE}" ]]; then if [[ "${FLAGS_withfactory}" -eq "${FLAGS_TRUE}" ]]; then
PACKAGES+=( chromeos-base/chromeos-installshim )
PACKAGES+=( chromeos-base/chromeos-factory ) PACKAGES+=( chromeos-base/chromeos-factory )
PACKAGES+=( chromeos-base/chromeos-factoryinstall )
PACKAGES+=( chromeos-base/factorytest-init ) PACKAGES+=( chromeos-base/factorytest-init )
PACKAGES+=( chromeos-base/chromeos-hwid ) PACKAGES+=( chromeos-base/chromeos-hwid )
fi fi