From 1d132574ac727639a9092b9b0fce95470a06e206 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 14 Feb 2023 13:08:17 +0100 Subject: [PATCH 1/3] build_library/catalyst.sh: Do not use "which" There's a bash built-in named command that could be used instead. --- build_library/catalyst.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_library/catalyst.sh b/build_library/catalyst.sh index 26b5372863..cc470fd9aa 100644 --- a/build_library/catalyst.sh +++ b/build_library/catalyst.sh @@ -174,7 +174,7 @@ catalyst_init() { die_notrace "This script must be run as root." fi - if ! which catalyst &>/dev/null; then + if ! command -v catalyst >/dev/null 2>&1; then die_notrace "catalyst not found, not installed or bad PATH?" fi From 520b92ad7e16688f03bd37e2e9b82a8967e6053b Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 14 Feb 2023 13:10:51 +0100 Subject: [PATCH 2/3] *: Expand short emerge flags and use bash arrays Emerge flags are cryptic in general, but short flags even more so, so expand them. While at it, I noticed some places where bash arrays could be used, so convert those places too. --- bootstrap_sdk | 5 +- build_library/build_image_util.sh | 4 +- build_library/catalyst.sh | 20 +++++--- build_library/grub_install.sh | 4 +- build_library/toolchain_util.sh | 80 ++++++++++++++--------------- build_library/update_chroot_util.sh | 2 +- build_library/vm_image_util.sh | 2 +- build_packages | 2 +- set_official | 2 +- setup_board | 22 ++++---- update_chroot | 2 +- 11 files changed, 77 insertions(+), 68 deletions(-) diff --git a/bootstrap_sdk b/bootstrap_sdk index 2bbdfbff6a..7e633ca16f 100755 --- a/bootstrap_sdk +++ b/bootstrap_sdk @@ -183,7 +183,10 @@ build_stage1() { sed -i "s:^portdir.*:portdir=\"$stage1_repos/gentoo\":" \ "$TEMPDIR/catalyst-stage1.conf" # take the "portage directory" (portage-stable copy) snapshot - catalyst $DEBUG -c "$TEMPDIR/catalyst-stage1.conf" -s "$FLAGS_version-stage1" + catalyst \ + "${DEBUG[@]}" \ + --config "$TEMPDIR/catalyst-stage1.conf" \ + --snapshot "$FLAGS_version-stage1" # Update the stage 1 spec to use the "known-good" portage-stable snapshot # and coreos-overlay copy repository versions from above. diff --git a/build_library/build_image_util.sh b/build_library/build_image_util.sh index 8ef0866f01..2d5a3ee7e6 100755 --- a/build_library/build_image_util.sh +++ b/build_library/build_image_util.sh @@ -181,7 +181,7 @@ emerge_to_image() { sudo -E ROOT="${root_fs_dir}" \ FEATURES="-ebuild-locks" \ PORTAGE_CONFIGROOT="${BUILD_DIR}"/configroot \ - emerge --root-deps=rdeps --usepkgonly --jobs="${NUM_JOBS}" -v "$@" + emerge --root-deps=rdeps --usepkgonly --jobs="${NUM_JOBS}" --verbose "$@" # Shortcut if this was just baselayout [[ "$*" == *sys-apps/baselayout ]] && return @@ -206,7 +206,7 @@ emerge_to_image_unchecked() { sudo -E ROOT="${root_fs_dir}" \ PORTAGE_CONFIGROOT="${BUILD_DIR}"/configroot \ - emerge --root-deps=rdeps --usepkgonly --jobs="${NUM_JOBS}" -v "$@" + emerge --root-deps=rdeps --usepkgonly --jobs="${NUM_JOBS}" --verbose "$@" # Shortcut if this was just baselayout [[ "$*" == *sys-apps/baselayout ]] && return diff --git a/build_library/catalyst.sh b/build_library/catalyst.sh index cc470fd9aa..789a2744cb 100644 --- a/build_library/catalyst.sh +++ b/build_library/catalyst.sh @@ -19,7 +19,7 @@ # Values set in catalyst_init, don't use till after calling it CATALYST_ROOT= -DEBUG= +DEBUG=() BUILDS= BINPKGS= DISTDIR= @@ -178,9 +178,9 @@ catalyst_init() { die_notrace "catalyst not found, not installed or bad PATH?" fi - DEBUG= + DEBUG=() if [[ ${FLAGS_debug} -eq ${FLAGS_TRUE} ]]; then - DEBUG="--debug --verbose" + DEBUG=( --debug --verbose ) fi # Create output dir, expand path for easy comparison later @@ -262,10 +262,11 @@ build_stage() { fi info "Starting $stage" - catalyst $DEBUG \ - -c "$TEMPDIR/catalyst.conf" \ - -f "$TEMPDIR/${stage}.spec" \ - -C "source_subpath=$srcpath" + catalyst \ + "${DEBUG[@]}" \ + --config "$TEMPDIR/catalyst.conf" \ + --file "$TEMPDIR/${stage}.spec" \ + --cli "source_subpath=$srcpath" # Catalyst doesn't clean up after itself... rm -rf "$TEMPDIR/$stage-${ARCH}-${FLAGS_version}" ln -sf "$stage-${ARCH}-${FLAGS_version}.tar.bz2" \ @@ -281,7 +282,10 @@ build_snapshot() { info "Skipping snapshot, ${snapshot_path} exists" else info "Creating snapshot ${snapshot_path}" - catalyst $DEBUG -c "$TEMPDIR/catalyst.conf" -s "$FLAGS_version" + catalyst \ + "${DEBUG[@]}" \ + --config "$TEMPDIR/catalyst.conf" \ + --snapshot "$FLAGS_version" fi } diff --git a/build_library/grub_install.sh b/build_library/grub_install.sh index b046e981d0..78dd849fe3 100755 --- a/build_library/grub_install.sh +++ b/build_library/grub_install.sh @@ -76,7 +76,9 @@ esac if [[ $BOARD_GRUB -eq 1 ]]; then info "Updating GRUB in ${BOARD_ROOT}" - emerge-${BOARD} --nodeps --select -qugKN sys-boot/grub + emerge-${BOARD} \ + --nodeps --select --quiet --update --getbinpkg --usepkgonly --newuse \ + sys-boot/grub GRUB_SRC="${BOARD_ROOT}/usr/lib/grub/${FLAGS_target}" fi [[ -d "${GRUB_SRC}" ]] || die "GRUB not installed at ${GRUB_SRC}" diff --git a/build_library/toolchain_util.sh b/build_library/toolchain_util.sh index 74aef88266..eccbecba9e 100644 --- a/build_library/toolchain_util.sh +++ b/build_library/toolchain_util.sh @@ -233,21 +233,21 @@ configure_crossdev_overlay() { local location="$2" # may be called from either catalyst (root) or update_chroot (user) - local sudo="env" + local sudo=("env") if [[ $(id -u) -ne 0 ]]; then - sudo="sudo -E" + sudo=("sudo" "-E") fi - $sudo mkdir -p "${root}${location}/"{profiles,metadata} + "${sudo[@]}" mkdir -p "${root}${location}/"{profiles,metadata} echo "x-crossdev" | \ - $sudo tee "${root}${location}/profiles/repo_name" > /dev/null - $sudo tee "${root}${location}/metadata/layout.conf" > /dev/null < /dev/null + "${sudo[@]}" tee "${root}${location}/metadata/layout.conf" > /dev/null < /dev/null < /dev/null </dev/null + "${sudo[@]}" crossdev "${cross_flags[@]}" --init-target + "${sudo[@]}" tee "${cross_cfg}" <<<"${cross_cfg_data}" >/dev/null fi # Check if any packages need to be built from source. If so do a full @@ -407,16 +407,16 @@ install_cross_toolchain() { --pretend "${emerge_atoms[@]}" | grep -q '^\[ebuild' then echo "Doing a full bootstrap via crossdev" - $sudo crossdev "${cross_flags[@]}" --stage4 + "${sudo[@]}" crossdev "${cross_flags[@]}" --stage4 else echo "Installing existing binaries" - $sudo emerge "${emerge_flags[@]}" "${emerge_atoms[@]}" + "${sudo[@]}" emerge "${emerge_flags[@]}" "${emerge_atoms[@]}" if [ "${cbuild}" = "x86_64-pc-linux-gnu" ] && [ "${cross_chost}" = aarch64-cros-linux-gnu ] && \ [ ! -d /usr/lib/rust-*/rustlib/aarch64-unknown-linux-gnu ] && [ ! -d /usr/lib/rustlib/aarch64-unknown-linux-gnu ]; then # If no aarch64 folder exists, warn about the situation but don't compile Rust here or download it as binary package echo "WARNING: No aarch64 cross-compilation Rust libraries found!" - echo "In case building fails, make sure the old Rust version is deleted with: sudo emerge -C virtual/rust dev-lang/rust" - echo "Then install it again with: sudo emerge "${emerge_flags[@]}" virtual/rust" + echo "In case building fails, make sure the old Rust version is deleted with: sudo emerge --unmerge virtual/rust dev-lang/rust" + echo "Then install it again with: sudo emerge ${emerge_flags[@]} virtual/rust" echo "This will download the binary package or build from source." fi fi @@ -424,7 +424,7 @@ install_cross_toolchain() { # Setup environment and wrappers for our shiny new toolchain binutils_set_latest_profile "${cross_chost}" gcc_set_latest_profile "${cross_chost}" - $sudo CC_QUIET=1 sysroot-config --install-links "${cross_chost}" + "${sudo[@]}" CC_QUIET=1 sysroot-config --install-links "${cross_chost}" } # Build/install toolchain dependencies into the cross sysroot for a @@ -437,9 +437,9 @@ install_cross_libs() { local package_provided="$ROOT/etc/portage/profile/package.provided" # may be called from either catalyst (root) or setup_board (user) - local sudo="env" + local sudo=("env") if [[ $(id -u) -ne 0 ]]; then - sudo="sudo -E" + sudo=("sudo" "-E") fi CBUILD="$(portageq envvar CBUILD)" \ @@ -450,26 +450,26 @@ install_cross_libs() { # In order to get a dependency list we must calculate it before # updating package.provided. Otherwise portage will no-op. - $sudo rm -f "${package_provided}/cross-${cross_chost}" + "${sudo[@]}" rm -f "${package_provided}/cross-${cross_chost}" local cross_deps=$(ROOT="$ROOT" SYSROOT="$ROOT" _get_dependency_list \ - "$@" "${TOOLCHAIN_PKGS[@]}" | $sudo tee \ + "$@" "${TOOLCHAIN_PKGS[@]}" | "${sudo[@]}" tee \ "$ROOT/etc/portage/cross-${cross_chost}-depends") # Add toolchain to packages.provided since they are on the host system if [[ -f "${package_provided}" ]]; then # emerge-wrapper is trying a similar trick but doesn't work - $sudo rm -f "${package_provided}" + "${sudo[@]}" rm -f "${package_provided}" fi - $sudo mkdir -p "${package_provided}" + "${sudo[@]}" mkdir -p "${package_provided}" local native_pkg cross_pkg cross_pkg_version for native_pkg in "${TOOLCHAIN_PKGS[@]}"; do cross_pkg="${native_pkg/*\//cross-${cross_chost}/}" cross_pkg_version=$(portageq match / "${cross_pkg}") echo "${native_pkg%/*}/${cross_pkg_version#*/}" - done | $sudo tee "${package_provided}/cross-${cross_chost}" >/dev/null + done | "${sudo[@]}" tee "${package_provided}/cross-${cross_chost}" >/dev/null # OK, clear as mud? Install those dependencies now! - PORTAGE_CONFIGROOT="$ROOT" $sudo emerge --root="$ROOT" --sysroot="$ROOT" "$@" -u $cross_deps + PORTAGE_CONFIGROOT="$ROOT" "${sudo[@]}" emerge --root="$ROOT" --sysroot="$ROOT" "$@" --update $cross_deps } install_cross_rust() { @@ -478,16 +478,16 @@ install_cross_rust() { local cbuild="$(portageq envvar CBUILD)" # may be called from either catalyst (root) or upgrade_chroot (user) - local sudo="env" + local sudo=("env") if [[ $(id -u) -ne 0 ]]; then - sudo="sudo -E" + sudo=("sudo" "-E") fi if [ "${cbuild}" = "x86_64-pc-linux-gnu" ] && [ "${cross_chost}" = "aarch64-cros-linux-gnu" ]; then echo "Building Rust for arm64" # If no aarch64 folder exists, try to remove any existing Rust packages. - [ ! -d /usr/lib/rustlib/aarch64-unknown-linux-gnu ] && ($sudo emerge -C dev-lang/rust || true) - $sudo emerge "${emerge_flags[@]}" dev-lang/rust + [ ! -d /usr/lib/rustlib/aarch64-unknown-linux-gnu ] && ("${sudo[@]}" emerge --unmerge dev-lang/rust || true) + "${sudo[@]}" emerge "${emerge_flags[@]}" dev-lang/rust fi } @@ -501,12 +501,12 @@ binutils_set_latest_profile() { fi # may be called from either catalyst (root) or upgrade_chroot (user) - local sudo="env" + local sudo=("env") if [[ $(id -u) -ne 0 ]]; then - sudo="sudo -E" + sudo=("sudo" "-E") fi - $sudo binutils-config "${latest}" + "${sudo[@]}" binutils-config "${latest}" } # Get the latest GCC profile for a given CHOST @@ -535,10 +535,10 @@ gcc_set_latest_profile() { fi # may be called from either catalyst (root) or upgrade_chroot (user) - local sudo="env" + local sudo=("env") if [[ $(id -u) -ne 0 ]]; then - sudo="sudo -E" + sudo=("sudo" "-E") fi - $sudo gcc-config "${latest}" + "${sudo[@]}" gcc-config "${latest}" } diff --git a/build_library/update_chroot_util.sh b/build_library/update_chroot_util.sh index a6ebd2a8cf..e76fbeb365 100644 --- a/build_library/update_chroot_util.sh +++ b/build_library/update_chroot_util.sh @@ -55,7 +55,7 @@ remove_hard_blocks() { done if [[ ${#pkgs_to_drop[@]} -gt 0 ]]; then info "Dropping the following packages to avoid hard blocks: ${pkgs_to_drop[@]}" - "${emerge_cmd}" -C "${pkgs_to_drop[@]}" + "${emerge_cmd}" --unmerge "${pkgs_to_drop[@]}" else info "No hard blockers to remove" fi diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh index ac7e65d89b..3bf79e44d1 100644 --- a/build_library/vm_image_util.sh +++ b/build_library/vm_image_util.sh @@ -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 -qugN sys-firmware/edk2-aarch64 + emerge-${BOARD} --nodeps --select --quiet --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 aaf7158596..946da09bae 100755 --- a/build_packages +++ b/build_packages @@ -130,7 +130,7 @@ fi . "${BUILD_LIBRARY_DIR}/test_image_content.sh" || exit 1 # Setup all the emerge command/flags. -EMERGE_FLAGS=( -uDNv --backtrack=30 --select ) +EMERGE_FLAGS=( --update --deep --newuse --verbose --backtrack=30 --select ) REBUILD_FLAGS=() EMERGE_CMD=( "emerge-${FLAGS_board}" ) if [[ "${FLAGS_fetchonly}" -eq "${FLAGS_TRUE}" ]]; then diff --git a/set_official b/set_official index b8f3f7f52d..630e20252f 100755 --- a/set_official +++ b/set_official @@ -34,4 +34,4 @@ else sudo rm -f "${BOARD_ROOT}/etc/portage/package.use/official" fi -emerge-${BOARD} -v --quiet-build=y --nospinner coreos-base/coreos-au-key +emerge-${BOARD} --verbose --quiet-build=y --nospinner coreos-base/coreos-au-key diff --git a/setup_board b/setup_board index 541a41d029..e43b8e4ac0 100755 --- a/setup_board +++ b/setup_board @@ -297,23 +297,23 @@ ${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+=" --jobs=${NUM_JOBS}" - EMERGE_TOOLCHAIN_FLAGS="${EMERGE_FLAGS}" + EMERGE_FLAGS=( --select --quiet --root-deps=rdeps ) + EMERGE_FLAGS+=( "--jobs=${NUM_JOBS}" ) + EMERGE_TOOLCHAIN_FLAGS=( "${EMERGE_FLAGS[@]}" ) if [[ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" && \ "${FLAGS_getbinpkg}" -eq "${FLAGS_TRUE}" ]] then if [[ "${FLAGS_usepkgonly}" -eq "${FLAGS_TRUE}" ]]; then - EMERGE_FLAGS+=" --usepkgonly --rebuilt-binaries n" + EMERGE_FLAGS+=( --usepkgonly --rebuilt-binaries n ) else - EMERGE_FLAGS+=" --usepkg" + EMERGE_FLAGS+=( --usepkg ) fi - EMERGE_FLAGS+=" --getbinpkg" + EMERGE_FLAGS+=( --getbinpkg ) fi info "Installing baselayout" - "${EMERGE_WRAPPER}" ${EMERGE_FLAGS} --nodeps sys-apps/baselayout + "${EMERGE_WRAPPER}" "${EMERGE_FLAGS[@]}" --nodeps sys-apps/baselayout if [[ "${FLAGS_usepkg}" -ne "${FLAGS_TRUE}" || "${FLAGS_getbinpkg}" -ne "${FLAGS_TRUE}" ]] @@ -321,22 +321,22 @@ if [[ ${FLAGS_regen_configs} -eq ${FLAGS_FALSE} ]]; then # When binary packages are disabled we need to make sure the cross # sysroot includes any build dependencies for the toolchain. info "Installing toolchain build dependencies" - install_cross_libs "${BOARD_CHOST}" ${EMERGE_FLAGS} --buildpkg=n + install_cross_libs "${BOARD_CHOST}" "${EMERGE_FLAGS[@]}" --buildpkg=n info "Building toolchain dependencies" "${EMERGE_WRAPPER}" --buildpkg --buildpkgonly \ --root="/usr/${BOARD_CHOST}" --sysroot="/usr/${BOARD_CHOST}" \ - ${EMERGE_TOOLCHAIN_FLAGS} $(< "/usr/${BOARD_CHOST}/etc/portage/cross-${BOARD_CHOST}-depends") + "${EMERGE_TOOLCHAIN_FLAGS[@]}" $(< "/usr/${BOARD_CHOST}/etc/portage/cross-${BOARD_CHOST}-depends") info "Building toolchain" "${EMERGE_WRAPPER}" --buildpkg --buildpkgonly \ --root="/usr/${BOARD_CHOST}" --sysroot="/usr/${BOARD_CHOST}" \ - ${EMERGE_TOOLCHAIN_FLAGS} "${TOOLCHAIN_PKGS[@]}" + "${EMERGE_TOOLCHAIN_FLAGS[@]}" "${TOOLCHAIN_PKGS[@]}" fi info "Installing toolchain" "${EMERGE_WRAPPER}" \ --usepkgonly --getbinpkg --rebuilt-binaries n \ - ${EMERGE_TOOLCHAIN_FLAGS} "${TOOLCHAIN_PKGS[@]}" + "${EMERGE_TOOLCHAIN_FLAGS[@]}" "${TOOLCHAIN_PKGS[@]}" fi if [[ ${FLAGS_regen_configs_only} -eq ${FLAGS_FALSE} ]]; then diff --git a/update_chroot b/update_chroot index 9df5da6a30..f753b4a0ec 100755 --- a/update_chroot +++ b/update_chroot @@ -183,7 +183,7 @@ done "${BUILD_LIBRARY_DIR}/set_lsb_release" --root / -EMERGE_FLAGS=( -uNv --with-bdeps=y --select ) +EMERGE_FLAGS=( --update --newuse --verbose --with-bdeps=y --select ) REBUILD_FLAGS=() if [ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" ]; then EMERGE_FLAGS+=( --usepkg ) From fa48f70a37d861b8ab400fcc5d3448aa06eb958e Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 14 Feb 2023 13:20:01 +0100 Subject: [PATCH 3/3] *: 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. --- bootstrap_sdk | 1 + build_library/catalyst.sh | 6 ++++-- build_library/grub_install.sh | 2 +- build_library/prod_image_util.sh | 2 +- build_library/test_oem_pkgs | 2 +- build_library/vm_image_util.sh | 6 +++--- build_packages | 4 ++-- build_torcx_store | 4 ++-- rebuild_packages | 2 +- setup_board | 4 ++-- update_chroot | 10 +++++----- 11 files changed, 23 insertions(+), 20 deletions(-) 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"