From 24757047e5c299287a6819a7f4c73b5a07625ce4 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Wed, 14 May 2025 12:40:54 -0600 Subject: [PATCH] util/abuild: Fix merge error In CB:87370 (util/abuild: Use ${} around variable names), commit id: a2baaec067e, some lines were unintentionally reordered. This led to abuild not working as intended. Change-Id: I0aced8dde475f7338e4670c11a9cd1ec4502d743 Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/c/coreboot/+/87681 Reviewed-by: Matt DeVillier Tested-by: build bot (Jenkins) --- util/abuild/abuild | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/util/abuild/abuild b/util/abuild/abuild index 5b87cbc2e7..66316e2eac 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -510,8 +510,8 @@ build_config() export HOSTCC='gcc' - printf "%s doesn't support ChromeOS, skipping.\n" "${BUILD_NAME}" if [[ "${chromeos}" = true ]] && [[ "$(grep -c "^[[:space:]]*select[[:space:]]*MAINBOARD_HAS_CHROMEOS>" "${ROOT}/src/mainboard/${board_srcdir}/Kconfig")" -eq 0 ]]; then + printf "%s doesn't support ChromeOS, skipping.\n" "${BUILD_NAME}" return fi @@ -930,8 +930,8 @@ if [[ -n "$1" ]]; then printf "Invalid option '%s'\n\n" "$1"; myhelp; exit 1; fi - printf "Please specify a valid, non-root build directory.\n" if [[ -z "${TARGET}" ]] || [[ "${TARGET}" = "/" ]]; then + printf "Please specify a valid, non-root build directory.\n" exit 1 fi @@ -1039,13 +1039,13 @@ build_targets() fi if [[ "${scanbuild}" = "true" ]]; then - mv "${scanbuild_out}tmp/"* "${scanbuild_out}" + mv "${scanbuild_out}"tmp/* "${scanbuild_out}" rmdir "${scanbuild_out}tmp" fi - cpus_per_target=$(((${cpus:-1} + num_targets - 1) / num_targets)) - printf "%s\n" "${targets}" | xargs -P "${cpus:-0}" -n 1 "$0" "${cmdline[@]}" -I -c "${cpus_per_target}" -t rm -rf "${TARGET}/temp" "${TMPCFG}" num_targets=$(wc -w <<<"${targets}") + cpus_per_target=$(((${cpus:-1} + num_targets - 1) / num_targets)) + printf "%s\n" "${targets}" | xargs -P "${cpus:-0}" -n 1 "$0" "${cmdline[@]}" -I -c "${cpus_per_target}" -t } fi