Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/56041 )
Change subject: util/abuild: Fix overriding results with the default configuration ......................................................................
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 arthur@aheymans.xyz Reviewed-on: https://review.coreboot.org/c/coreboot/+/56041 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Patrick Georgi pgeorgi@google.com --- M util/abuild/abuild 1 file changed, 7 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved
diff --git a/util/abuild/abuild b/util/abuild/abuild index dc3670b..fc4c7fe 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -526,6 +526,13 @@ 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"