Pass BOARD and optional COMMAND to the script.

$COMMAND defaults to 'all' if skipped.
Perform pre-build refreshing and post-build renaming only of building is going to be commenced.
pull/471/head
Paul Philippov 2022-09-18 18:36:11 -04:00
parent a9813853d3
commit 7ba5fb2b26
1 changed files with 25 additions and 22 deletions

View File

@ -241,11 +241,8 @@ copy_function() {
} }
uni_build() { uni_build() {
if [ -z "$1" ]; then [ -z "$BOARD" ] && BOARD=$FUNCNAME
BOARD=$FUNCNAME
else
BOARD=$1
fi
SOC=$(echo $BOARD | cut -d '_' -f 1) SOC=$(echo $BOARD | cut -d '_' -f 1)
set -e set -e
@ -259,9 +256,13 @@ uni_build() {
echo_c 33 "\n SoC: $SOC\nBoard: $BOARD\n" echo_c 33 "\n SoC: $SOC\nBoard: $BOARD\n"
if [ "all" = "${COMMAND}" ]; then
fresh $(make BOARD=unknown_unknown_${BOARD} buildroot-version) fresh $(make BOARD=unknown_unknown_${BOARD} buildroot-version)
log_and_run "make BOARD=unknown_unknown_${BOARD} all" fi
log_and_run "make BOARD=unknown_unknown_${BOARD} ${COMMAND}"
if [ "all" = "${COMMAND}" ]; then
if [ "$BOARD" == "ssc335_initramfs" ]; then if [ "$BOARD" == "ssc335_initramfs" ]; then
rename_initramfs rename_initramfs
else else
@ -271,6 +272,7 @@ uni_build() {
if [ ! -z "$NEED_AUTOUP" ]; then if [ ! -z "$NEED_AUTOUP" ]; then
autoup_rootfs autoup_rootfs
fi fi
fi
} }
for i in "${FUNCS[@]}"; do for i in "${FUNCS[@]}"; do
@ -279,8 +281,6 @@ done
####### #######
CMD=$1
if [ $# -eq 0 ]; then if [ $# -eq 0 ]; then
if ! command -v fzf >/dev/null 2>&1; then if ! command -v fzf >/dev/null 2>&1; then
echo -ne "Usage: $0 <variant>\nVariants:" echo -ne "Usage: $0 <variant>\nVariants:"
@ -289,12 +289,15 @@ if [ $# -eq 0 ]; then
exit 1 exit 1
else else
SELECTED=$(find . -path "*/br-ext-chip-*" -name "*_defconfig" | fzf) SELECTED=$(find . -path "*/br-ext-chip-*" -name "*_defconfig" | fzf)
if [ -z "$SELECTED" ]; then [ -z "$SELECTED" ] && exit 1
exit 1 BOARD=$(echo $SELECTED | awk -F_ '{printf "%s_%s", $3, $4}')
fi
CMD=$(echo $SELECTED | awk -F_ '{printf "%s_%s", $3, $4}')
fi fi
else
BOARD=$1
fi fi
echo_c 37 "Building OpenIPC ${CMD}" COMMAND=$2
uni_build $CMD [ -z "$COMMAND" ] && COMMAND=all
echo_c 37 "Building OpenIPC for ${BOARD}"
uni_build $BOARD $COMMAND