diff --git a/bootstrap_sdk b/bootstrap_sdk index 7e633ca16f..8478cf0662 100755 --- a/bootstrap_sdk +++ b/bootstrap_sdk @@ -185,6 +185,7 @@ build_stage1() { # take the "portage directory" (portage-stable copy) snapshot catalyst \ "${DEBUG[@]}" \ + --verbose \ --config "$TEMPDIR/catalyst-stage1.conf" \ --snapshot "$FLAGS_version-stage1" diff --git a/build_library/catalyst.sh b/build_library/catalyst.sh index 789a2744cb..43626bcf43 100644 --- a/build_library/catalyst.sh +++ b/build_library/catalyst.sh @@ -74,7 +74,7 @@ local load=$((NUM_JOBS * 2)) cat <&2 + emerge-${BOARD} --verbose --getbinpkg --usepkgonly --fetchonly --nodeps "${name}" >&2 version=$(pkg_version binary "${name}") fi diff --git a/build_library/test_oem_pkgs b/build_library/test_oem_pkgs index 3ca99da7b4..b6c1230c09 100755 --- a/build_library/test_oem_pkgs +++ b/build_library/test_oem_pkgs @@ -37,6 +37,6 @@ for oem in "${VALID_OEM_PACKAGES[@]/#/oem-}"; do for use in "${uses[@]}"; do info "Checking ${oem}${use:+[${use}]}" USE="${use}" emerge-${BOARD} --usepkg --getbinpkg \ - --emptytree --pretend --quiet "coreos-base/${oem}" + --emptytree --pretend --verbose "coreos-base/${oem}" done done diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh index 3bf79e44d1..55ba775fe5 100644 --- a/build_library/vm_image_util.sh +++ b/build_library/vm_image_util.sh @@ -471,7 +471,7 @@ install_oem_package() { info "Building ${oem_pkg}" USE="${oem_use}" emerge-${BOARD} \ --nodeps --buildpkgonly --usepkg n \ - --quiet "${oem_pkg}" + --verbose "${oem_pkg}" local getbinpkg if [[ ${FLAGS_getbinpkg} -eq ${FLAGS_TRUE} ]]; then @@ -482,7 +482,7 @@ install_oem_package() { USE="${oem_use}" emerge-${BOARD} \ --root="${oem_tmp}" --sysroot="${oem_tmp}" \ --root-deps=rdeps --usepkgonly ${getbinpkg} \ - --quiet --jobs=2 "${oem_pkg}" + --verbose --jobs=2 "${oem_pkg}" sudo rsync -a "${oem_tmp}/usr/share/oem/" "${VM_TMP_ROOT}/usr/share/oem/" sudo rm -rf "${oem_tmp}" } @@ -734,7 +734,7 @@ _write_qemu_uefi_conf() { arm64-usr) # Get edk2 files into local build workspace. info "Updating edk2 in /build/${BOARD}" - emerge-${BOARD} --nodeps --select --quiet --update --getbinpkg --newuse sys-firmware/edk2-aarch64 + emerge-${BOARD} --nodeps --select --verbose --update --getbinpkg --newuse sys-firmware/edk2-aarch64 # Create 64MiB flash device image files. dd if=/dev/zero bs=1M count=64 of="$(_dst_dir)/${flash_rw}" \ status=none diff --git a/build_packages b/build_packages index 946da09bae..c225f08e16 100755 --- a/build_packages +++ b/build_packages @@ -131,7 +131,7 @@ fi # Setup all the emerge command/flags. EMERGE_FLAGS=( --update --deep --newuse --verbose --backtrack=30 --select ) -REBUILD_FLAGS=() +REBUILD_FLAGS=( --verbose ) EMERGE_CMD=( "emerge-${FLAGS_board}" ) if [[ "${FLAGS_fetchonly}" -eq "${FLAGS_TRUE}" ]]; then EMERGE_CMD+=( --fetchonly ) @@ -285,7 +285,7 @@ info "Merging board packages now" sudo -E "${EMERGE_CMD[@]}" "${EMERGE_FLAGS[@]}" "$@" info "Removing obsolete packages" -sudo -E "${EMERGE_CMD[@]}" --quiet --depclean @unavailable +sudo -E "${EMERGE_CMD[@]}" --verbose --depclean @unavailable if [[ "${FLAGS_usepkgonly}" -eq "${FLAGS_FALSE}" ]]; then if "portageq-${BOARD}" list_preserved_libs "${BOARD_ROOT}" >/dev/null; then diff --git a/build_torcx_store b/build_torcx_store index 6bc95b1ba2..7e4018c0d5 100755 --- a/build_torcx_store +++ b/build_torcx_store @@ -80,7 +80,7 @@ function torcx_build() ( --buildpkgonly \ --nodeps \ --oneshot \ - --quiet \ + --verbose \ --root-deps=rdeps \ "${pkgs[@]}" @@ -89,7 +89,7 @@ function torcx_build() ( --jobs="${NUM_JOBS}" \ --nodeps \ --oneshot \ - --quiet \ + --verbose \ --root="${tmproot}" \ --root-deps=rdeps \ --sysroot="${tmproot}" \ diff --git a/rebuild_packages b/rebuild_packages index 60aae4ea79..424431676b 100755 --- a/rebuild_packages +++ b/rebuild_packages @@ -74,7 +74,7 @@ if [[ "${#rebuild_atoms[@]}" -eq 0 ]]; then info "No ebuild changes detected" else info "Rebuilding ${#rebuild_atoms[@]} packages..." - emerge-$BOARD "--jobs=${NUM_JOBS}" "${rebuild_atoms[@]}" + emerge-$BOARD --verbose "--jobs=${NUM_JOBS}" "${rebuild_atoms[@]}" info "Checking build root" test_image_content "${BOARD_ROOT}" diff --git a/setup_board b/setup_board index e43b8e4ac0..68473a3973 100755 --- a/setup_board +++ b/setup_board @@ -269,7 +269,7 @@ PORTAGE_BINHOST="${BOARD_BINHOST}" # Generally there isn't any need to add packages to @world by default. # You can use --select to override this. -EMERGE_DEFAULT_OPTS="--oneshot" +EMERGE_DEFAULT_OPTS="--oneshot --verbose" # Enable provenance reporting by default. Produced files are in /usr/share/SLSA GENERATE_SLSA_PROVENANCE="true" @@ -297,7 +297,7 @@ ${EMAINT_WRAPPER} --fix moveinst ${EMAINT_WRAPPER} --fix world if [[ ${FLAGS_regen_configs} -eq ${FLAGS_FALSE} ]]; then - EMERGE_FLAGS=( --select --quiet --root-deps=rdeps ) + EMERGE_FLAGS=( --select --verbose --root-deps=rdeps ) EMERGE_FLAGS+=( "--jobs=${NUM_JOBS}" ) EMERGE_TOOLCHAIN_FLAGS=( "${EMERGE_FLAGS[@]}" ) diff --git a/update_chroot b/update_chroot index f753b4a0ec..f4d303e267 100755 --- a/update_chroot +++ b/update_chroot @@ -99,7 +99,7 @@ MAKEOPTS="--jobs=${NUM_JOBS} --load-average=$((NUM_JOBS * 2))" # Generally there isn't any need to add packages to @world by default. # You can use --select to override this. -EMERGE_DEFAULT_OPTS="--oneshot" +EMERGE_DEFAULT_OPTS="--verbose --oneshot" # Allow the user to override or define additional settings. source "/etc/portage/make.conf.user" @@ -184,7 +184,7 @@ done "${BUILD_LIBRARY_DIR}/set_lsb_release" --root / EMERGE_FLAGS=( --update --newuse --verbose --with-bdeps=y --select ) -REBUILD_FLAGS=() +REBUILD_FLAGS=( --verbose ) if [ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" ]; then EMERGE_FLAGS+=( --usepkg ) if [[ "${FLAGS_usepkgonly}" -eq "${FLAGS_TRUE}" ]]; then @@ -208,7 +208,7 @@ EMERGE_CMD="emerge" # In first pass, update portage and toolchains. Lagged updates of both # can cause serious issues later. info "Updating basic system packages" -sudo -E ${EMERGE_CMD} --quiet "${EMERGE_FLAGS[@]}" \ +sudo -E ${EMERGE_CMD} "${EMERGE_FLAGS[@]}" \ sys-apps/portage \ sys-devel/crossdev \ sys-devel/sysroot-wrappers \ @@ -230,7 +230,7 @@ if [[ "${FLAGS_skip_toolchain_update}" -eq "${FLAGS_FALSE}" && \ for cross_chost in "${CROSS_CHOSTS[@]}"; do info "Updating cross ${cross_chost} toolchain" - install_cross_toolchain "${cross_chost}" --quiet "${EMERGE_FLAGS[@]}" + install_cross_toolchain "${cross_chost}" "${EMERGE_FLAGS[@]}" done fi @@ -259,7 +259,7 @@ sudo -E ${EMERGE_CMD} "${EMERGE_FLAGS[@]}" \ coreos-devel/sdk-depends world info "Removing obsolete packages" -sudo -E ${EMERGE_CMD} --quiet --depclean @unavailable +sudo -E ${EMERGE_CMD} --verbose --depclean @unavailable if portageq list_preserved_libs / >/dev/null; then info "Rebuilding packages linked against old libraries"