From 85da96229f238c31d6ae018cb03d1eff5692de6b Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 13 Feb 2019 15:10:54 +0000 Subject: [PATCH] config/multithreaded: install embedded addons too during addon build --- config/multithread | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/multithread b/config/multithread index 2ffa4c6dda..1c14ddfc70 100644 --- a/config/multithread +++ b/config/multithread @@ -53,7 +53,7 @@ export -f json_worker package_worker() { local slot=$1 job=$2 jobs=$3 args="$4" local task pkgname result status - local addon istarget + local addon istarget isaddon export MTJOBID=${slot} MTMAXJOBS=${jobs} @@ -67,7 +67,9 @@ package_worker() { [[ ${pkgname} =~ :target$ || "${pkgname//:/}" = "${pkgname}" ]] && istarget="yes" || istarget="no" - if [ "${MTADDONBUILD}" = "yes" -a "${PKG_IS_ADDON}" = "yes" -a "${istarget}" = "yes" ]; then + [[ "${MTADDONBUILD}" = "yes" && ( "${PKG_IS_ADDON}" = "yes" || "${PKG_IS_ADDON}" = "embedded" ) ]] && isaddon="yes" || isaddon="no" + + if [ "${isaddon}" = "yes" -a "${istarget}" = "yes" ]; then if [ ${result} -eq 0 ]; then ( pkg_lock "${pkgname}" "packadd"