From 2f608fe379081690dd90529a5dcd072252b4dbee Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Mon, 30 Dec 2019 19:34:37 +0100 Subject: [PATCH] Adjust build targets and address small backend issue --- config/targets.conf | 76 +++++++++++++-------------------------------- lib/build-all-ng.sh | 10 ++---- 2 files changed, 25 insertions(+), 61 deletions(-) diff --git a/config/targets.conf b/config/targets.conf index 6e1ec53931..7d46d44e2b 100644 --- a/config/targets.conf +++ b/config/targets.conf @@ -11,7 +11,6 @@ bananapi current bionic cli stable yes bananapi current stretch cli stable yes bananapi current bullseye cli stable yes bananapi current buster minimal stable yes -bananapi dev buster minimal beta yes # Bananapi M2+ H3 @@ -19,7 +18,6 @@ bananapim2plus current buster desktop stable yes bananapim2plus current bionic cli stable yes bananapim2plus current stretch cli stable no bananapim2plus current bullseye cli stable yes -bananapim2plus dev buster minimal beta yes # Bananapi M2U R40 @@ -38,7 +36,6 @@ bananapim64 current bionic minimal stable yes bananapim64 current buster minimal stable yes bananapim64 current stretch cli stable yes bananapim64 current bullseye cli stable yes -bananapim64 dev buster minimal beta yes # Bananapi R2 @@ -53,7 +50,6 @@ bananapipro current bionic cli stable yes bananapipro current stretch cli stable yes bananapipro current bullseye cli stable yes bananapipro current buster minimal stable yes -bananapipro dev buster minimal beta yes # Clearfog Base clearfogbase legacy buster cli stable yes @@ -82,7 +78,6 @@ cubietruck current buster desktop stable yes cubietruck current buster cli stable yes cubietruck current bionic cli stable yes cubietruck current stretch cli stable yes -cubietruck dev buster minimal beta yes # Cubox-i cubox-i current buster cli stable yes @@ -137,7 +132,6 @@ lime2 current buster desktop stable yes lime2 current buster cli stable yes lime2 current bionic cli stable yes lime2 current stretch cli stable yes -lime2 dev buster minimal beta yes # lime-a64 @@ -145,7 +139,6 @@ lime-a64 current bionic minimal stable yes lime-a64 current buster minimal stable yes lime-a64 current bionic cli stable yes lime-a64 current buster cli stable yes -lime-a64 dev buster minimal beta yes # MACCHIATObin Double Shot @@ -165,6 +158,7 @@ nanopct3 legacy buster minimal stable yes nanopct3 legacy buster cli stable yes nanopct3 legacy bionic desktop stable yes nanopct3 legacy bionic minimal stable yes +nanopct3 legacy bullseye cli stable yes # nanopct3plus @@ -172,6 +166,7 @@ nanopct3plus legacy buster cli stable yes nanopct3plus legacy buster minimal stable yes nanopct3plus legacy bionic desktop stable yes nanopct3plus legacy bionic minimal stable yes +nanopct3plus legacy bullseye cli stable yes # nanopct4 @@ -187,36 +182,36 @@ nanopct4 current bionic cli stable yes nanopi-r1 current buster cli stable yes nanopi-r1 current stretch cli stable yes nanopi-r1 current bionic cli stable yes -nanopi-r1 dev buster minimal beta yes +nanopi-r1 current bullseye minimal stable yes # nanopiair nanopiair current buster cli stable yes nanopiair current stretch cli stable yes nanopiair current bionic cli stable yes -nanopiair current eoan cli stable yes -nanopiair dev buster minimal beta yes +nanopiair current bullseye cli stable yes # nanopiduo nanopiduo current buster cli stable yes nanopiduo current stretch cli stable yes nanopiduo current bionic cli stable yes -nanopiduo dev buster minimal beta yes +nanopiduo current bullseye minimal stable yes # nanopiduo2 nanopiduo2 current buster cli stable yes nanopiduo2 current stretch cli stable yes nanopiduo2 current bionic cli stable yes -nanopiduo2 current eoan cli stable yes -nanopiduo2 dev buster minimal beta yes +nanopiduo2 current bullseye cli stable yes # nanopifire3 nanopifire3 legacy buster cli stable yes nanopifire3 legacy buster minimal stable yes +nanopifire3 legacy buster desktop stable yes nanopifire3 legacy bionic cli stable yes +nanopifire3 legacy bullseye cli stable yes # nanopik1plus @@ -224,7 +219,6 @@ nanopik1plus current buster desktop stable yes nanopik1plus current buster cli stable yes nanopik1plus current bionic cli stable yes nanopik1plus current stretch cli stable yes -nanopik1plus dev buster minimal beta yes # nanopik2-905 @@ -232,7 +226,6 @@ nanopik2-s905 current buster cli stable yes nanopik2-s905 current buster minimal stable yes nanopik2-s905 current stretch cli stable yes nanopik2-s905 current bionic desktop stable yes -nanopik2-s905 dev buster minimal beta yes # nanopim1 @@ -240,7 +233,6 @@ nanopim1 current buster desktop stable yes nanopim1 current buster cli stable yes nanopim1 current bionic cli stable yes nanopim1 current stretch cli stable yes -nanopim1 dev buster minimal beta yes # zeropi zeropi current buster minimal stable yes @@ -252,6 +244,7 @@ zeropi current bullseye cli stable yes nanopim3 legacy buster cli stable yes nanopim3 legacy buster minimal stable yes nanopim3 legacy bionic desktop stable yes +nanopim3 legacy bullseye cli stable yes # nanopim4 @@ -276,24 +269,21 @@ nanopim4v2 current bionic cli stable yes nanopineo current buster cli stable yes nanopineo current stretch cli stable yes nanopineo current bionic cli stable yes -nanopineo current eoan cli stable yes -nanopineo dev buster minimal beta yes +nanopineo current bullseye cli stable yes # nanopineocore2 nanopineo2 current buster cli stable yes nanopineo2 current stretch cli stable yes nanopineo2 current bionic cli stable yes -nanopineo2 dev buster minimal beta yes +nanopineo2 current buster minimal stable yes # nanopineo2black nanopineo2black current buster cli stable yes -nanopineo2black current stretch cli stable yes nanopineo2black current stretch minimal stable yes nanopineo2black current bionic cli stable yes -nanopineo2black current eoan cli stable yes -nanopineo2black dev buster minimal beta yes +nanopineo2black current bullseye cli stable yes # nanopineo4 @@ -308,13 +298,13 @@ nanopineo4 current bionic cli stable yes nanopineocore2 current buster cli stable yes nanopineocore2 current stretch cli stable yes nanopineocore2 current bionic cli stable yes -nanopineocore2 dev buster minimal beta yes +nanopineocore2 current bullseye minimal stable yes # nanopineoplus2 nanopineoplus2 current buster cli stable yes nanopineoplus2 current stretch cli stable yes -nanopineoplus2 dev buster minimal beta yes +nanopineoplus2 current bullseye minimal stable yes # Odroid C1 @@ -354,7 +344,6 @@ orangepi2 current buster desktop stable yes orangepi2 current buster cli stable yes orangepi2 current bionic cli stable yes orangepi2 current stretch cli stable yes -orangepi2 dev buster minimal beta yes # orangepi 3 @@ -375,8 +364,8 @@ orangepi-r1 current bionic minimal stable yes orangepi-rk3399 legacy buster cli stable yes orangepi-rk3399 legacy bullseye cli stable yes orangepi-rk3399 legacy bionic desktop stable yes -orangepi-rk3399 legacy buster desktop stable yes -orangepi-rk3399 dev buster minimal beta yes +orangepi-rk3399 current buster desktop stable yes +orangepi-rk3399 current bionic minimal stable yes # Firefly rk3399 @@ -392,7 +381,6 @@ orangepilite current buster desktop stable yes orangepilite current buster cli stable yes orangepilite current bionic cli stable yes orangepilite current stretch cli stable yes -orangepilite dev buster minimal beta yes # orangepilite2 @@ -405,6 +393,7 @@ orangepilite2 current buster minimal stable yes orangepioneplus current buster cli stable yes orangepioneplus current stretch cli stable yes +orangepioneplus current bionic desktop stable yes orangepioneplus current bionic cli stable yes orangepioneplus current buster minimal stable yes @@ -414,7 +403,6 @@ orangepione current buster desktop stable yes orangepione current buster cli stable yes orangepione current bionic cli stable yes orangepione current stretch cli stable yes -orangepione dev buster minimal beta yes # orangepipc @@ -422,7 +410,6 @@ orangepipc current buster desktop stable yes orangepipc current buster cli stable yes orangepipc current bionic cli stable yes orangepipc current stretch cli stable yes -orangepipc dev buster minimal beta yes # orangepipc2 @@ -430,7 +417,6 @@ orangepipc2 current buster desktop stable yes orangepipc2 current buster cli stable yes orangepipc2 current bionic cli stable yes orangepipc2 current stretch cli stable yes -orangepipc2 dev buster minimal beta yes # orangepipcplus @@ -438,7 +424,6 @@ orangepipcplus current buster desktop stable yes orangepipcplus current buster cli stable yes orangepipcplus current bionic cli stable yes orangepipcplus current stretch cli stable yes -orangepipcplus dev buster minimal beta yes # orangepiplus @@ -446,7 +431,6 @@ orangepiplus current buster desktop stable yes orangepiplus current buster cli stable yes orangepiplus current bionic cli stable yes orangepiplus current stretch cli stable yes -orangepiplus dev buster minimal beta yes # orangepiplus2e @@ -454,14 +438,12 @@ orangepiplus2e current buster desktop stable yes orangepiplus2e current buster cli stable yes orangepiplus2e current bionic cli stable yes orangepiplus2e current stretch cli stable yes -orangepiplus2e dev buster minimal beta yes # Orangepi Prime orangepiprime current buster cli stable yes orangepiprime current stretch cli stable yes orangepiprime current buster desktop stable yes -orangepiprime dev buster minimal beta yes # Orangepi Win @@ -469,7 +451,6 @@ orangepiwin current buster cli stable yes orangepiwin current buster desktop stable yes orangepiwin current stretch cli stable yes orangepiwin current bionic cli stable yes -orangepiwin dev buster minimal beta yes # orangepizero @@ -477,7 +458,6 @@ orangepizero current buster cli stable yes orangepizero current stretch cli stable yes orangepizero current bionic cli stable yes orangepizero current bullseye cli stable yes -orangepizero dev buster minimal beta yes # orangepizeroplus @@ -485,21 +465,18 @@ orangepizeroplus current buster cli stable yes orangepizeroplus current stretch cli stable yes orangepizeroplus current bullseye cli stable yes orangepizeroplus current bionic cli stable yes -orangepizeroplus dev buster minimal beta yes # orangepizeroplus2-h3 orangepizeroplus2-h3 current buster cli stable yes orangepizeroplus2-h3 current stretch cli stable yes orangepizeroplus2-h3 current bullseye cli stable yes -orangepizeroplus2-h3 dev buster minimal beta yes # orangepizeroplus2-h5 orangepizeroplus2-h5 current buster cli stable yes orangepizeroplus2-h5 current stretch cli stable yes orangepizeroplus2-h5 current bullseye cli stable yes -orangepizeroplus2-h5 dev buster minimal beta yes # LinkSprite pcDuino3 @@ -513,20 +490,17 @@ pine64 current buster cli stable yes pine64 current buster desktop stable yes pine64 current bionic cli stable yes pine64 current stretch cli stable yes -pine64 dev buster minimal beta yes # Pine64so pine64so current buster cli stable yes pine64so current stretch cli stable yes pine64so current bionic cli stable yes -pine64so dev buster minimal beta yes # Pinebook A64 pinebook-a64 current bionic desktop stable yes pinebook-a64 current buster desktop stable yes -pinebook-a64 dev buster desktop beta yes # Pine H64 @@ -546,7 +520,6 @@ renegade legacy buster cli stable yes renegade current buster cli stable yes renegade legacy bionic desktop stable yes renegade current bionic desktop stable yes -renegade dev buster minimal beta yes # Rock64 @@ -554,7 +527,6 @@ rock64 legacy buster cli stable yes rock64 current buster cli stable yes rock64 legacy bionic desktop stable yes rock64 current bionic desktop stable yes -rock64 dev buster minimal beta yes # Rockpi 4b @@ -562,7 +534,6 @@ rockpi-4b legacy buster cli stable yes rockpi-4b current buster cli stable yes rockpi-4b legacy bionic desktop stable yes rockpi-4b current buster desktop stable yes -rockpi-4b dev buster minimal beta yes # Rockpi 4a @@ -570,13 +541,12 @@ rockpi-4a legacy buster cli stable yes rockpi-4a current buster cli stable yes rockpi-4a legacy bionic desktop stable yes rockpi-4a current buster desktop stable yes -rockpi-4a dev buster minimal beta yes # Rockpi S rockpi-s legacy buster cli stable yes -rockpi-s legacy buster minimal stable yes -rockpi-s legacy bullseye minimal beta yes +rockpi-s legacy bionic minimal stable yes +rockpi-s legacy bullseye minimal stable yes # Rock64pro @@ -589,12 +559,12 @@ rockpro64 current bionic cli stable yes teres-a64 current bionic desktop stable yes teres-a64 current buster desktop stable yes -teres-a64 dev bullseye desktop beta yes # Tinkerboard -tinkerboard legacy buster cli stable yes -tinkerboard legacy bionic desktop stable yes +#tinkerboard legacy buster cli stable yes +#tinkerboard legacy bionic desktop stable yes +#tinkerboard legacy bionic cli stable yes tinkerboard current bionic desktop stable yes tinkerboard current buster minimal stable yes tinkerboard current bullseye cli stable yes @@ -605,7 +575,6 @@ tritium-h3 current buster desktop stable yes tritium-h3 current buster cli stable yes tritium-h3 current bionic desktop stable yes tritium-h3 current bionic cli stable yes -tritium-h3 dev buster minimal beta yes # tritium-h5 @@ -613,7 +582,6 @@ tritium-h5 current buster desktop stable yes tritium-h5 current buster cli stable yes tritium-h5 current bionic desktop stable yes tritium-h5 current bionic cli stable yes -tritium-h5 dev buster minimal beta yes # xt-q8l-v10 diff --git a/lib/build-all-ng.sh b/lib/build-all-ng.sh index 7e6e0e67a8..c0da7122ea 100644 --- a/lib/build-all-ng.sh +++ b/lib/build-all-ng.sh @@ -104,13 +104,9 @@ pack_upload () if [[ -n "${SEND_TO_SERVER}" ]]; then ssh "${SEND_TO_SERVER}" "mkdir -p ${SEND_TO_LOCATION}${BOARD}/{archive,nightly}" & display_alert "Uploading" "Please wait!" "info" - nice -n 19 bash -c "while ! rsync -arP $DESTIMG/. -e 'ssh -p 22' ${SEND_TO_SERVER}:${SEND_TO_LOCATION}${BOARD}/${subdir}; \ - do sleep 5; done; rm -r $DESTIMG" & - + nice -n 19 bash -c "rsync -arP --info=progress2,stats1 --ignore-existing --remove-source-files --prune-empty-dirs $DESTIMG/ -e 'ssh -p 22' ${SEND_TO_SERVER}:${SEND_TO_LOCATION}${BOARD}/${subdir}" & else - - mv $DESTIMG/* $DEST/images - + mv $DESTIMG/*.* $DEST/images/ fi } @@ -213,7 +209,7 @@ function build_all() # unset also board related variables unset BOARDFAMILY DESKTOP_AUTOLOGIN DEFAULT_CONSOLE FULL_DESKTOP MODULES_CURRENT MODULES_LEGACY MODULES_DEV \ BOOTCONFIG MODULES_BLACKLIST_LEGACY MODULES_BLACKLIST_CURRENT MODULES_BLACKLIST_DEV DEFAULT_OVERLAYS SERIALCON \ - BUILD_MINIMAL + BUILD_MINIMAL RELEASE read -r BOARD BRANCH RELEASE BUILD_TARGET BUILD_STABILITY BUILD_IMAGE <<< "${line}"