Merge pull request #399 from marineam/move

setup_board: explicitly perform all package moves
This commit is contained in:
Michael Marineau 2015-04-17 14:01:19 -07:00
commit 5181e6b71c

View File

@ -89,7 +89,7 @@ generate_all_wrappers() {
info "Generating wrapper scripts" info "Generating wrapper scripts"
for wrapper in 'emerge --root-deps' ebuild eclean equery portageq \ for wrapper in 'emerge --root-deps' ebuild eclean equery portageq \
qcheck qfile qlist; do qcheck qfile qlist emaint; do
_generate_wrapper ${wrapper} _generate_wrapper ${wrapper}
done done
@ -266,6 +266,12 @@ sudo ln -sfT ${BOARD_ROOT}/usr/lib/debug /usr/lib/debug/${BOARD_ROOT}
generate_all_wrappers generate_all_wrappers
# Unclear why this is required but it doesn't happen automatically
info "Performing package updates..."
${EMAINT_WRAPPER} --fix movebin
${EMAINT_WRAPPER} --fix moveinst
${EMAINT_WRAPPER} --fix world
if [[ ${FLAGS_regen_configs} -eq ${FLAGS_FALSE} ]]; then if [[ ${FLAGS_regen_configs} -eq ${FLAGS_FALSE} ]]; then
EMERGE_FLAGS="--select --quiet --root-deps=rdeps" EMERGE_FLAGS="--select --quiet --root-deps=rdeps"
if [[ "${FLAGS_jobs}" -ne -1 ]]; then if [[ "${FLAGS_jobs}" -ne -1 ]]; then