GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Patrick Georgi 2015-10-30 23:25:23 +01:00 committed by Patrick Georgi
parent 85f4b3c9b3
commit 35261c0d47
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
util/abuild/abuild
View File

@ -324,17 +324,16 @@ function remove_target
return 0 return 0
fi fi
VENDOR=$1 local MAINBOARD=$1
MAINBOARD=$2
# Save the generated coreboot.rom file of each board. # Save the generated coreboot.rom file of each board.
if [ -r "$TARGET/${VENDOR}_${MAINBOARD}/coreboot.rom" ]; then if [ -r "$TARGET/${MAINBOARD}/coreboot.rom" ]; then
cp $TARGET/${VENDOR}_${MAINBOARD}/coreboot.rom \ cp $TARGET/${MAINBOARD}/coreboot.rom \
${VENDOR}_${MAINBOARD}_coreboot.rom ${MAINBOARD}_coreboot.rom
fi fi
printf "Removing build dir for board $VENDOR $MAINBOARD...\n" printf "Removing build dir for board $MAINBOARD...\n"
rm -rf $TARGET/${VENDOR}_${MAINBOARD} rm -rf $TARGET/${MAINBOARD}
return 0 return 0
} }
@ -536,7 +535,7 @@ build_all_targets()
for VENDOR in $( vendors ); do for VENDOR in $( vendors ); do
for MAINBOARD in $( mainboards $VENDOR ); do for MAINBOARD in $( mainboards $VENDOR ); do
build_target $VENDOR $MAINBOARD build_target $VENDOR $MAINBOARD
remove_target $VENDOR $MAINBOARD remove_target ${VENDOR}_${MAINBOARD}
done done
done done
} }
@ -610,7 +609,7 @@ if [ "$target" != "" ]; then
failed=1 failed=1
else else
build_target $VENDOR $MAINBOARD build_target $VENDOR $MAINBOARD
remove_target $VENDOR $MAINBOARD remove_target ${VENDOR}_${MAINBOARD}
test "$mode" != "text" && \ test "$mode" != "text" && \
test -f $TARGET/abuild/${VENDOR}_${MAINBOARD}.xml && \ test -f $TARGET/abuild/${VENDOR}_${MAINBOARD}.xml && \
cat $TARGET/abuild/${VENDOR}_${MAINBOARD}.xml >> $REAL_XMLFILE cat $TARGET/abuild/${VENDOR}_${MAINBOARD}.xml >> $REAL_XMLFILE