From 8585eabc5d5b516f46b2980a40b25f49eef5e056 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Fri, 2 Jul 2021 16:26:41 +0200 Subject: util/abuild: Fix overriding results with the default configuration I a file in configs/* has no suffix, then the default configuration will override the results of the build generated by the configfile from configs/*. Fix this by adding a '_' to the buildname. Change-Id: Ic47105fafca41f1905a6569943079623bec5405a Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/56041 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- util/abuild/abuild | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'util/abuild') diff --git a/util/abuild/abuild b/util/abuild/abuild index dc3670b927..fc4c7fe867 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -526,6 +526,13 @@ function build_target BUILD_NAME="${config##*/}" BUILD_NAME="${BUILD_NAME##config.}" BUILD_NAME=$(echo "${BUILD_NAME}" | tr '[:lower:]' '[:upper:]') + echo $BUILD_NAME $MAINBOARD + # If the file in configs/ results in the same build_name as the default config + # append a '_' to differentiate. Otherwise the default configuration would + # override the results. + if [ "${MAINBOARD}" = "${BUILD_NAME}" ]; then + BUILD_NAME=${BUILD_NAME}"_" + fi echo "Building config $BUILD_NAME" build_dir=$TARGET/${BUILD_NAME} build_config "$MAINBOARD" "$build_dir" "$BUILD_NAME" "$config" -- cgit v1.2.3