setup_board: copy portage's repos.conf files from the chroot

This commit is contained in:
Michael Marineau 2014-07-19 16:10:34 -07:00
parent 5446f7f06a
commit 3d8948d91f

View File

@ -174,7 +174,6 @@ esac
COREOS_CONFIG="/usr/local/portage/coreos/coreos/config" COREOS_CONFIG="/usr/local/portage/coreos/coreos/config"
BOARD_ROOT="/build/${BOARD_VARIANT}" BOARD_ROOT="/build/${BOARD_VARIANT}"
BOARD_ETC="${BOARD_ROOT}/etc" BOARD_ETC="${BOARD_ROOT}/etc"
BOARD_PROFILE="${BOARD_ETC}/portage/profile"
BOARD_ARCH=$(get_board_arch "$BOARD") BOARD_ARCH=$(get_board_arch "$BOARD")
BOARD_CHOST=$(get_board_chost ${BOARD}) BOARD_CHOST=$(get_board_chost ${BOARD})
PORTAGE_PROFILE=$(get_board_profile "$BOARD") PORTAGE_PROFILE=$(get_board_profile "$BOARD")
@ -218,7 +217,7 @@ if [[ ! -L "${BOARD_ROOT}/packages" ]]; then
fi fi
info "Configuring portage in ${BOARD_ROOT}" info "Configuring portage in ${BOARD_ROOT}"
sudo mkdir -p "${BOARD_PROFILE}" sudo mkdir -p "${BOARD_ETC}/portage/"{profile,repos.conf}
sudo ROOT="${BOARD_ROOT}" eselect profile set --force "${PORTAGE_PROFILE}" sudo ROOT="${BOARD_ROOT}" eselect profile set --force "${PORTAGE_PROFILE}"
# Cleanup/migrate from older make.conf files # Cleanup/migrate from older make.conf files
@ -258,6 +257,8 @@ EMERGE_DEFAULT_OPTS="--oneshot"
source "${BOARD_ETC}/portage/make.conf.user" source "${BOARD_ETC}/portage/make.conf.user"
EOF EOF
sudo cp /etc/portage/repos.conf/* "${BOARD_ETC}"/portage/repos.conf/
generate_all_wrappers generate_all_wrappers
if [[ ${FLAGS_regen_configs} -eq ${FLAGS_FALSE} ]]; then if [[ ${FLAGS_regen_configs} -eq ${FLAGS_FALSE} ]]; then