From 0c82bdadab200763dd8ca68b3980c2b043c676c5 Mon Sep 17 00:00:00 2001 From: "Sascha Kuehndel (InuSasha)" Date: Fri, 3 Aug 2018 18:12:42 +0200 Subject: [PATCH 1/2] create_addon: two improvments * allow to build addons with sourced `PKG_IS_ADDON` variable * change state of "not supported" messages from `ERROR` to `SKIP` --- scripts/create_addon | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/create_addon b/scripts/create_addon index 6e9819c369..aaa6290af4 100755 --- a/scripts/create_addon +++ b/scripts/create_addon @@ -87,7 +87,7 @@ function find_addons() { if [ $_count -eq 0 ]; then # handle embedded addons here. Should only build when they are explictly specified in the addon list ( . ./config/options "$1" &>/dev/null - [ "$PKG_IS_ADDON" != "embedded" ] && exit 1 + [ "$PKG_IS_ADDON" != "embedded" -a "$PKG_IS_ADDON" != "yes" ] && exit 1 echo $PKG_NAME ) @@ -164,12 +164,12 @@ pack_addon() { } not_supported_arch() { - printf "%${BUILD_INDENT}c $(print_color CLR_WARNING "*** ERROR: $PKG_ADDON_ID: '${DEVICE:-$PROJECT}' not supported ***")\n" ' '>&$SILENT_OUT + printf "%${BUILD_INDENT}c $(print_color CLR_WARNING "*** SKIP: $PKG_ADDON_ID: '${DEVICE:-$PROJECT}' not supported ***")\n" ' '>&$SILENT_OUT exit 0 } not_supported_device() { - printf "%${BUILD_INDENT}c $(print_color CLR_WARNING "*** ERROR: $PKG_ADDON_ID: '$TARGET_ARCH' not supported ***")\n" ' '>&$SILENT_OUT + printf "%${BUILD_INDENT}c $(print_color CLR_WARNING "*** SKIP: $PKG_ADDON_ID: '$TARGET_ARCH' not supported ***")\n" ' '>&$SILENT_OUT exit 0 } From caa24ac9add5652dee070f40e8186671592cf812 Mon Sep 17 00:00:00 2001 From: "Sascha Kuehndel (InuSasha)" Date: Mon, 6 Aug 2018 19:12:55 +0200 Subject: [PATCH 2/2] create_addon: improve done message, a bit --- scripts/create_addon | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/create_addon b/scripts/create_addon index aaa6290af4..a57af2ce6e 100755 --- a/scripts/create_addon +++ b/scripts/create_addon @@ -159,6 +159,8 @@ pack_addon() { sha256sum $ADDON_JENKINS_ADDON_NAME.zip > $ADDON_JENKINS_ADDON_NAME.zip.sha256 ) printf "%${BUILD_INDENT}c $(print_color CLR_INFO "*** creating $ADDON_JENKINS_ADDON_NAME.zip for Jenkins complete ***")\n" ' '>&$SILENT_OUT + else + printf "%${BUILD_INDENT}c $(print_color CLR_INFO "*** creating $PKG_ADDON_ID complete ***")\n" ' '>&$SILENT_OUT fi fi } @@ -300,7 +302,6 @@ for addon in $(tr " " "\n" <<< $addons | sort -u); do addons_failed+="$addon " printf "$(print_color CLR_ERROR "ADDON FAILED $addon")\n" ' '>&$SILENT_OUT else - printf "$(print_color CLR_INFO "ADDON SUCCESS $addon")\n" ' '>&$SILENT_OUT if [ "$remove_success_logs" = "true" ]; then rm -f $log_file fi