image_to_vm: add --getbinpkg option

Now image_to_vm can be used without first running build_packages.
This commit is contained in:
Michael Marineau 2016-02-23 13:06:49 -08:00
parent 744faa2df4
commit 66ea5974ce
2 changed files with 17 additions and 2 deletions

View File

@ -431,9 +431,14 @@ install_oem_package() {
--nodeps --buildpkgonly --usepkg n \
--quiet "${oem_pkg}"
local getbinpkg
if [[ ${FLAGS_getbinpkg} -eq ${FLAGS_TRUE} ]]; then
getbinpkg=--getbinpkg
fi
info "Installing ${oem_pkg} to OEM partition"
USE="${oem_use}" emerge-${BOARD} --root="${oem_tmp}" \
--root-deps=rdeps --usepkgonly \
--root-deps=rdeps --usepkgonly ${getbinpkg} \
--quiet --jobs=2 "${oem_pkg}"
sudo rsync -a "${oem_tmp}/usr/share/oem/" "${VM_TMP_ROOT}/usr/share/oem/"
sudo rm -rf "${oem_tmp}"

View File

@ -42,6 +42,10 @@ DEFINE_string to "" \
"Destination folder for VM output file(s)"
DEFINE_string oem_pkg "" \
"OEM package to install"
DEFINE_boolean getbinpkg "${FLAGS_FALSE}" \
"Download binary packages from remote repository."
DEFINE_string getbinpkgver "" \
"Use binary packages from a specific version."
# include upload options
. "${BUILD_LIBRARY_DIR}/release_util.sh" || exit 1
@ -67,7 +71,13 @@ if [ -z "${FLAGS_board}" ] ; then
die_notrace "--board is required."
fi
# Loaded after flags are parsed because board_options depends on --board
# If downloading packages is enabled ensure the board is configured properly.
if [[ ${FLAGS_getbinpkg} -eq ${FLAGS_TRUE} ]]; then
"${SRC_ROOT}/scripts/setup_board" --board="${FLAGS_board}" \
--getbinpkgver="${FLAGS_getbinpkgver}" --regen_configs_only
fi
# Loaded late because board_options depends on setup_board
. "${BUILD_LIBRARY_DIR}/board_options.sh" || exit 1