diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2021-07-02 16:26:41 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2021-07-13 20:20:15 +0000 |
| commit | 8585eabc5d5b516f46b2980a40b25f49eef5e056 (patch) | |
| tree | 0a029973cf799105c86a2fdd44f6cf26ff45537f /util/abuild | |
| parent | 4dcac1304356fbc4e7c83d9eb024a0b0bde9f94e (diff) | |
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>
Diffstat (limited to 'util/abuild')
| -rwxr-xr-x | util/abuild/abuild | 7 |
1 files changed, 7 insertions, 0 deletions
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" |