From d1ec00c932e9bec5d5ba27dfb028e141ec566f9f Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 17 Apr 2015 13:39:27 -0700 Subject: [PATCH] setup_board: explicitly perform all package moves For some reason package moves are not handled automatically in the board build roots. Add explicit calls to emaint to update cached binary packages, installed packages, and the world file. --- setup_board | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/setup_board b/setup_board index 856cb39909..4f65ddfc38 100755 --- a/setup_board +++ b/setup_board @@ -89,7 +89,7 @@ generate_all_wrappers() { info "Generating wrapper scripts" for wrapper in 'emerge --root-deps' ebuild eclean equery portageq \ - qcheck qfile qlist; do + qcheck qfile qlist emaint; do _generate_wrapper ${wrapper} done @@ -266,6 +266,12 @@ sudo ln -sfT ${BOARD_ROOT}/usr/lib/debug /usr/lib/debug/${BOARD_ROOT} 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 EMERGE_FLAGS="--select --quiet --root-deps=rdeps" if [[ "${FLAGS_jobs}" -ne -1 ]]; then