*: Make catalyst and emerge verbose by default

That way we can see a report of what emerge is going to do and the
status of the use flags for the installed packages. The downside is
that we are going to have reports about using deprecated and
unsupported profile in even more places.
This commit is contained in:
Krzesimir Nowak 2023-02-14 13:20:01 +01:00
parent 520b92ad7e
commit fa48f70a37
11 changed files with 23 additions and 20 deletions

View File

@ -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"

View File

@ -74,7 +74,7 @@ local load=$((NUM_JOBS * 2))
cat <<EOF
export TERM='${TERM}'
export MAKEOPTS='--jobs=${NUM_JOBS} --load-average=${load}'
export EMERGE_DEFAULT_OPTS="\$MAKEOPTS"
export EMERGE_DEFAULT_OPTS="--verbose \$MAKEOPTS"
export PORTAGE_USERNAME=portage
export PORTAGE_GRPNAME=portage
export GENTOO_MIRRORS='$(portageq envvar GENTOO_MIRRORS)'
@ -180,7 +180,7 @@ catalyst_init() {
DEBUG=()
if [[ ${FLAGS_debug} -eq ${FLAGS_TRUE} ]]; then
DEBUG=( --debug --verbose )
DEBUG=("--debug")
fi
# Create output dir, expand path for easy comparison later
@ -264,6 +264,7 @@ build_stage() {
info "Starting $stage"
catalyst \
"${DEBUG[@]}" \
--verbose \
--config "$TEMPDIR/catalyst.conf" \
--file "$TEMPDIR/${stage}.spec" \
--cli "source_subpath=$srcpath"
@ -284,6 +285,7 @@ build_snapshot() {
info "Creating snapshot ${snapshot_path}"
catalyst \
"${DEBUG[@]}" \
--verbose \
--config "$TEMPDIR/catalyst.conf" \
--snapshot "$FLAGS_version"
fi

View File

@ -77,7 +77,7 @@ esac
if [[ $BOARD_GRUB -eq 1 ]]; then
info "Updating GRUB in ${BOARD_ROOT}"
emerge-${BOARD} \
--nodeps --select --quiet --update --getbinpkg --usepkgonly --newuse \
--nodeps --select --verbose --update --getbinpkg --usepkgonly --newuse \
sys-boot/grub
GRUB_SRC="${BOARD_ROOT}/usr/lib/grub/${FLAGS_target}"
fi

View File

@ -18,7 +18,7 @@ get_binary_pkg() {
# Nothing? Maybe we can fetch it.
if [[ -z "${version}" && ${FLAGS_getbinpkg} -eq ${FLAGS_TRUE} ]]; then
emerge-${BOARD} --getbinpkg --usepkgonly --fetchonly --nodeps "${name}" >&2
emerge-${BOARD} --verbose --getbinpkg --usepkgonly --fetchonly --nodeps "${name}" >&2
version=$(pkg_version binary "${name}")
fi

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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}" \

View File

@ -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}"

View File

@ -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[@]}" )

View File

@ -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"