diff options
| author | Patrick Georgi <pgeorgi@chromium.org> | 2015-10-30 23:25:23 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-11-01 14:26:27 +0100 |
| commit | 35261c0d476eff250a695e97be8cd8ceb406a7d3 (patch) | |
| tree | cb83861b6eb54d0830d28509eed4b2505c56db13 /util | |
| parent | 85f4b3c9b3c0ad41c1fc7ca708517b76ef43405b (diff) | |
abuild: change remove_board interface
It's passed the mainboard's directory name (below $TARGET) directly
in preparation of more rework in that area.
Change-Id: I3a82b8673fdea07bc5c957f76f4685c34a805334
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: http://review.coreboot.org/12275
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/abuild/abuild | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/util/abuild/abuild b/util/abuild/abuild index 942698b3f0..40d4b41885 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -324,17 +324,16 @@ function remove_target return 0 fi - VENDOR=$1 - MAINBOARD=$2 + local MAINBOARD=$1 # Save the generated coreboot.rom file of each board. - if [ -r "$TARGET/${VENDOR}_${MAINBOARD}/coreboot.rom" ]; then - cp $TARGET/${VENDOR}_${MAINBOARD}/coreboot.rom \ - ${VENDOR}_${MAINBOARD}_coreboot.rom + if [ -r "$TARGET/${MAINBOARD}/coreboot.rom" ]; then + cp $TARGET/${MAINBOARD}/coreboot.rom \ + ${MAINBOARD}_coreboot.rom fi - printf "Removing build dir for board $VENDOR $MAINBOARD...\n" - rm -rf $TARGET/${VENDOR}_${MAINBOARD} + printf "Removing build dir for board $MAINBOARD...\n" + rm -rf $TARGET/${MAINBOARD} return 0 } @@ -536,7 +535,7 @@ build_all_targets() for VENDOR in $( vendors ); do for MAINBOARD in $( mainboards $VENDOR ); do build_target $VENDOR $MAINBOARD - remove_target $VENDOR $MAINBOARD + remove_target ${VENDOR}_${MAINBOARD} done done } @@ -610,7 +609,7 @@ if [ "$target" != "" ]; then failed=1 else build_target $VENDOR $MAINBOARD - remove_target $VENDOR $MAINBOARD + remove_target ${VENDOR}_${MAINBOARD} test "$mode" != "text" && \ test -f $TARGET/abuild/${VENDOR}_${MAINBOARD}.xml && \ cat $TARGET/abuild/${VENDOR}_${MAINBOARD}.xml >> $REAL_XMLFILE |