From fe07e45b6517b78677419f1b97b8f6276dcdb709 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 30 Oct 2020 21:53:20 +0100 Subject: [PATCH] setup_board: Copy repos.conf earlier eselect calls "portage get_repo_path /build/amd64-usr coreos" at some point. Before updating portage, portageq seemed to take all the information not from /build/amd64-usr (which at the time contained no repo information at all), but rather from /. The newer version of portageq seems to respect the passed root now, so it actually tries to consult the nonexistent repos configuration in /build/amd64-usr and fails. To avoid the failure, perform the copying of the configuration files earlier. --- setup_board | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup_board b/setup_board index 24e3fa11cf..b9f082afee 100755 --- a/setup_board +++ b/setup_board @@ -235,6 +235,7 @@ fi info "Configuring portage in ${BOARD_ROOT}" 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}" # Cleanup/migrate from older make.conf files @@ -274,8 +275,6 @@ EMERGE_DEFAULT_OPTS="--oneshot" source "${BOARD_ETC}/portage/make.conf.user" EOF -sudo cp /etc/portage/repos.conf/* "${BOARD_ETC}"/portage/repos.conf/ - # required when using --regen_configs_only sudo mkdir -p --mode=01777 "${BOARD_ROOT}"{/tmp,/var/tmp}