mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-08 05:26:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(*): Use binary package for baselayout

Browse Source 
It is no longer necessary to use the build USE flag or avoid binary
packages when installing baselayout for the first time.
This commit is contained in:
Michael Marineau 2014-06-09 19:05:18 -07:00
parent 09faef6d02
commit 0d29e73534
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build_library/build_image_util.sh
View File

@ -153,10 +153,9 @@ start_image() {
mount "${disk_img}" "${root_fs_dir}" mount "${disk_img}" "${root_fs_dir}"
trap "cleanup_mounts '${root_fs_dir}' && delete_prompt" EXIT trap "cleanup_mounts '${root_fs_dir}' && delete_prompt" EXIT
# First thing first, install baselayout with USE=build to create a # First thing first, install baselayout to create a working filesystem.
# working directory tree. Don't use binpkgs due to the use flag change. emerge-${BOARD} --root="${root_fs_dir}" \
sudo -E USE=build "emerge-${BOARD}" --root="${root_fs_dir}" \ --usepkgonly --oneshot --quiet --nodeps sys-apps/baselayout
--usepkg=n --buildpkg=n --oneshot --quiet --nodeps sys-apps/baselayout
# FIXME(marineam): Work around glibc setting EROOT=$ROOT # FIXME(marineam): Work around glibc setting EROOT=$ROOT
# https://bugs.gentoo.org/show_bug.cgi?id=473728#c12 # https://bugs.gentoo.org/show_bug.cgi?id=473728#c12

16
setup_board
View File

@ -267,14 +267,6 @@ EOF
generate_all_wrappers generate_all_wrappers
if [[ ${FLAGS_regen_configs} -eq ${FLAGS_FALSE} ]]; then if [[ ${FLAGS_regen_configs} -eq ${FLAGS_FALSE} ]]; then
info "Installing baselayout"
# First thing first, install baselayout with USE=build to create a
# working directory tree. Don't use binpkgs due to the use flag change.
sudo -E USE=build "${EMERGE_WRAPPER}" --usepkg=n --buildpkg=n \
--oneshot --quiet --nodeps sys-apps/baselayout
# Now time for tool chain happy fun time
EMERGE_FLAGS="--select --quiet --root-deps=rdeps" EMERGE_FLAGS="--select --quiet --root-deps=rdeps"
if [[ "${FLAGS_jobs}" -ne -1 ]]; then if [[ "${FLAGS_jobs}" -ne -1 ]]; then
EMERGE_FLAGS+=" --jobs=${FLAGS_jobs}" EMERGE_FLAGS+=" --jobs=${FLAGS_jobs}"
@ -283,7 +275,8 @@ if [[ ${FLAGS_regen_configs} -eq ${FLAGS_FALSE} ]]; then
if [[ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" && \ if [[ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" && \
"${FLAGS_getbinpkg}" -eq "${FLAGS_TRUE}" ]] "${FLAGS_getbinpkg}" -eq "${FLAGS_TRUE}" ]]
then then
EMERGE_FLAGS+=" --usepkgonly --getbinpkg" EMERGE_FLAGS+=" --usepkg --getbinpkg"
EMERGE_TOOLCHAIN_FLAGS="${EMERGE_FLAGS} --usepkgonly"
else else
# When binary packages are disabled we need to make sure the cross # When binary packages are disabled we need to make sure the cross
# sysroot includes any build dependencies for the toolchain. # sysroot includes any build dependencies for the toolchain.
@ -291,9 +284,12 @@ if [[ ${FLAGS_regen_configs} -eq ${FLAGS_FALSE} ]]; then
install_cross_libs "${BOARD_CHOST}" ${EMERGE_FLAGS} --buildpkg=n install_cross_libs "${BOARD_CHOST}" ${EMERGE_FLAGS} --buildpkg=n
fi fi
info "Installing baselayout"
"${EMERGE_WRAPPER}" ${EMERGE_FLAGS} --nodeps sys-apps/baselayout
info "Installing toolchain" info "Installing toolchain"
SYSROOT="/usr/${BOARD_CHOST}" "${EMERGE_WRAPPER}" \ SYSROOT="/usr/${BOARD_CHOST}" "${EMERGE_WRAPPER}" \
${EMERGE_FLAGS} "${TOOLCHAIN_PKGS[@]}" ${EMERGE_TOOLCHAIN_FLAGS} "${TOOLCHAIN_PKGS[@]}"
fi fi
if [ $FLAGS_default -eq $FLAGS_TRUE ] ; then if [ $FLAGS_default -eq $FLAGS_TRUE ] ; then