Merge pull request #114 from kinvolk/krnowak/fix-setup-board

setup_board: Copy repos.conf earlier
This commit is contained in:
Krzesimir Nowak 2021-02-04 17:51:26 +01:00 committed by GitHub
commit 17c5038be1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -235,6 +235,7 @@ fi
info "Configuring portage in ${BOARD_ROOT}" info "Configuring portage in ${BOARD_ROOT}"
sudo mkdir -p "${BOARD_ETC}/portage/"{profile,repos.conf} sudo mkdir -p "${BOARD_ETC}/portage/"{profile,repos.conf}
sudo cp /etc/portage/repos.conf/* "${BOARD_ETC}"/portage/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
@ -274,8 +275,6 @@ 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/
# required when using --regen_configs_only # required when using --regen_configs_only
sudo mkdir -p --mode=01777 "${BOARD_ROOT}"{/tmp,/var/tmp} sudo mkdir -p --mode=01777 "${BOARD_ROOT}"{/tmp,/var/tmp}