Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/39382 )
Change subject: [TEST] Let abuild always build the default config ......................................................................
[TEST] Let abuild always build the default config
Change-Id: I94075dbaa6fabeb75bdbc92e56f237df80c15cef Signed-off-by: Nico Huber nico.h@gmx.de --- M util/abuild/abuild 1 file changed, 13 insertions(+), 18 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/39382/1
diff --git a/util/abuild/abuild b/util/abuild/abuild index 676a446..b548519 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -516,26 +516,21 @@ local MAINBOARD_LC MAINBOARD_LC=$(echo "$MAINBOARD" | tr '[:upper:]' '[:lower:]')
- # look for config files in the config directory that match the boardname - if [ -n "$( find "$configdir" -maxdepth 1 -name "config.${MAINBOARD_LC}*" -print -quit )" ]; then - for config in "$configdir/config.${MAINBOARD_LC}"*; do - BUILD_NAME="${config##*/}" - BUILD_NAME="${BUILD_NAME##config.}" - BUILD_NAME=$(echo "${BUILD_NAME}" | tr '[:lower:]' '[:upper:]') - echo "Building config $BUILD_NAME" - build_dir=$TARGET/${BUILD_NAME} - build_config "$MAINBOARD" "$build_dir" "$BUILD_NAME" "$config" - remove_target "$BUILD_NAME" + for config in "$configdir/config.${MAINBOARD_LC}"*; do + BUILD_NAME="${config##*/}" + BUILD_NAME="${BUILD_NAME##config.}" + BUILD_NAME=$(echo "${BUILD_NAME}" | tr '[:lower:]' '[:upper:]') + echo "Building config $BUILD_NAME" + build_dir=$TARGET/${BUILD_NAME} + build_config "$MAINBOARD" "$build_dir" "$BUILD_NAME" "$config" + remove_target "$BUILD_NAME" + done
- done - else - echo "Building board $MAINBOARD (using default config)" - build_dir=$TARGET/${MAINBOARD} + echo "Building board $MAINBOARD (using default config)" + build_dir=$TARGET/${MAINBOARD}
- build_config "$MAINBOARD" "$build_dir" "$MAINBOARD" - remove_target "$MAINBOARD" - fi - + build_config "$MAINBOARD" "$build_dir" "$MAINBOARD" + remove_target "$MAINBOARD" }
function remove_target
Hello build bot (Jenkins), Patrick Georgi, Martin Roth, Julius Werner,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/39382
to look at the new patch set (#2).
Change subject: [TEST] Let abuild always build the default config ......................................................................
[TEST] Let abuild always build the default config
Change-Id: I94075dbaa6fabeb75bdbc92e56f237df80c15cef Signed-off-by: Nico Huber nico.h@gmx.de --- M util/abuild/abuild 1 file changed, 4 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/39382/2
Hello build bot (Jenkins), Patrick Georgi, Martin Roth, Julius Werner,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/39382
to look at the new patch set (#5).
Change subject: abuild: Always build the default config ......................................................................
abuild: Always build the default config
Abuild allows us to add config files below `configs/` for each mainboard. So far, these were built instead of the default config. However, that allows to hide errors in the default config. Hence, we should build that too in any case.
Change-Id: I94075dbaa6fabeb75bdbc92e56f237df80c15cef Signed-off-by: Nico Huber nico.h@gmx.de --- M util/abuild/abuild 1 file changed, 4 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/39382/5
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39382 )
Change subject: abuild: Always build the default config ......................................................................
Patch Set 5: Code-Review+1
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39382 )
Change subject: abuild: Always build the default config ......................................................................
Patch Set 5: Code-Review+2
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39382 )
Change subject: abuild: Always build the default config ......................................................................
Patch Set 5: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/39382 )
Change subject: abuild: Always build the default config ......................................................................
abuild: Always build the default config
Abuild allows us to add config files below `configs/` for each mainboard. So far, these were built instead of the default config. However, that allows to hide errors in the default config. Hence, we should build that too in any case.
Change-Id: I94075dbaa6fabeb75bdbc92e56f237df80c15cef Signed-off-by: Nico Huber nico.h@gmx.de Reviewed-on: https://review.coreboot.org/c/coreboot/+/39382 Reviewed-by: Patrick Georgi pgeorgi@google.com Reviewed-by: Angel Pons th3fanbus@gmail.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M util/abuild/abuild 1 file changed, 4 insertions(+), 7 deletions(-)
Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved Angel Pons: Looks good to me, approved
diff --git a/util/abuild/abuild b/util/abuild/abuild index 676a446..9688c8c 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -526,16 +526,13 @@ build_dir=$TARGET/${BUILD_NAME} build_config "$MAINBOARD" "$build_dir" "$BUILD_NAME" "$config" remove_target "$BUILD_NAME" - done - else - echo "Building board $MAINBOARD (using default config)" - build_dir=$TARGET/${MAINBOARD} - - build_config "$MAINBOARD" "$build_dir" "$MAINBOARD" - remove_target "$MAINBOARD" fi
+ echo "Building board $MAINBOARD (using default config)" + build_dir=$TARGET/${MAINBOARD} + build_config "$MAINBOARD" "$build_dir" "$MAINBOARD" + remove_target "$MAINBOARD" }
function remove_target
9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39382 )
Change subject: abuild: Always build the default config ......................................................................
Patch Set 6:
Automatic boot test returned (PASS/FAIL/TOTAL): 3/0/3 Emulation targets: EMULATION_QEMU_X86_Q35 using payload TianoCore : SUCCESS : https://lava.9esec.io/r/1227 EMULATION_QEMU_X86_Q35 using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/1226 EMULATION_QEMU_X86_I440FX using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/1225
Please note: This test is under development and might not be accurate at all!