This commit is contained in:
Jeremi Piotrowski 2024-07-08 11:52:53 +02:00
parent a344b7edca
commit 2abda355a2
2 changed files with 3 additions and 4 deletions

View File

@ -240,8 +240,9 @@ if [ "${FLAGS_skip_toolchain_update}" -eq "${FLAGS_TRUE}" ]; then
UPDATE_ARGS+=" --skip_toolchain_update"
fi
if [ "${FLAGS_skip_chroot_upgrade}" -eq "${FLAGS_FALSE}" ] ; then
"${SRC_ROOT}/scripts"/update_chroot ${UPDATE_ARGS}
:
fi
"${SRC_ROOT}/scripts"/update_chroot ${UPDATE_ARGS}
# Migrate board roots that were created before the package location
# was standardized to /var/lib/portage/pkgs, build_image will fail if we

View File

@ -103,15 +103,13 @@ EMERGE_DEFAULT_OPTS="--verbose --oneshot"
source "/etc/portage/make.conf.user"
EOF
sudo_clobber "/etc/portage/repos.conf/gentoo-subset.conf" <<EOF
sudo_clobber "/etc/portage/repos.conf/coreos.conf" <<EOF
[DEFAULT]
main-repo = gentoo-subset
[gentoo-subset]
location = ${GENTOO_SUBSET_OVERLAY}
EOF
sudo_clobber "/etc/portage/repos.conf/flatcar-overlay.conf" <<EOF
[flatcar-overlay]
location = ${FLATCAR_OVERLAY}
EOF