From 355a306301411e804f579e21cbf0257b6ca88a80 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Sat, 20 Jun 2020 20:49:03 +0200 Subject: [PATCH] [Backend] Few improvements to the build-all Signed-off-by: Igor Pecovnik --- config/targets.conf | 1 + lib/build-all-ng.sh | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/config/targets.conf b/config/targets.conf index 727882be0b..ea880fe8d2 100644 --- a/config/targets.conf +++ b/config/targets.conf @@ -428,6 +428,7 @@ odroidc1 legacy focal cli stable yes odroidc1 legacy buster cli stable yes odroidc1 legacy bionic cli stable yes odroidc1 legacy bullseye cli stable yes +odroidc1 current focal cli stable no # Odroid C2 diff --git a/lib/build-all-ng.sh b/lib/build-all-ng.sh index 37f1675737..18504b0f62 100644 --- a/lib/build-all-ng.sh +++ b/lib/build-all-ng.sh @@ -307,7 +307,10 @@ function build_all() if [[ "${BUILD_STABILITY}" == "${STABILITY}" ]]; then # check if currnt hash is the same as upstream - if [[ $(check_hash) != idential || "$IGNORE_HASH" == yes ]]; then + if [[ "$IGNORE_HASH" != yes ]]; then + local store_hash=$(check_hash) + fi + if [[ "$store_hash" != idential ]]; then ((n+=1)) @@ -322,7 +325,11 @@ function build_all() done display_alert "Building ${n}." - build_main + if [[ "$KERNEL_ONLY" == "no" ]]; then + build_main & + else + build_main + fi # create BSP for all boards elif [[ "${BSP_BUILD}" == yes ]]; then @@ -341,7 +348,7 @@ function build_all() for RELEASE in "${RELTARGETS[@]}" do display_alert "BSP for ${BOARD} ${BRANCH} ${RELEASE}." - if [[ $IGNORE_HASH == yes ]]; then + if [[ "$IGNORE_HASH" == yes && "$KERNEL_ONLY" != "yes" ]]; then build_main & sleep 0.5 else @@ -405,7 +412,7 @@ do done # bump version in case there was a change -if [[ $n -gt 0 && -n $SEND_TO_SERVER ]]; then +if [[ $n -gt 0 && -n ${SEND_TO_SERVER} && -z ${REBUILD_IMAGES} ]]; then cd ${SRC} CURRENT_VERSION=$(cat VERSION)