Merge pull request #4136 from MilhouseVH/le92_fix_addons_error

buildsystem: "set -e" error handling not working for addon builds [backport]

config/multithread

@@ -66,33 +66,7 @@ package_worker() {
 
   if [ "${isaddon}" = "yes" -a "${istarget}" = "yes" ]; then
     if [ ${result} -eq 0 ]; then
-      (
+      ${SCRIPTS}/install_addon ${pkgname} 2>&1 && result=0 || result=1
-        pkg_lock "${pkgname}" "packadd"
-        pkg_lock_status "ACTIVE" "${pkgname}" "packadd"
-
-        # cleanup old install path
-        rm -rf "${ADDON_BUILD}"
-
-        # install addon parts
-        if pkg_call_exists addon; then
-          pkg_call addon
-        else
-          install_binary_addon "${PKG_ADDON_ID}"
-        fi
-
-        # HACK for packages that provide multiple addons like screensavers.rsxs
-        # addon's addon() in package.mk should take care for exporting
-        # MULTI_ADDONS="addon.boo1 addon.boo2 addon.boo3"
-        if [ -n "${MULTI_ADDONS}" ] ; then
-          for addon in ${MULTI_ADDONS}; do
-            ${SCRIPTS}/install_addon "${PKG_NAME}" "${addon}"
-          done
-        else
-          ${SCRIPTS}/install_addon "${PKG_NAME}" "${PKG_ADDON_ID}"
-        fi
-
-        pkg_lock_status "UNLOCK" "${pkgname}" "packadd" "packed"
-      ) 2>&1 || result=1
     fi
 
     if [ ${result} -ne 0 ]; then

packages/addons/driver/sundtek-mediatv/package.mk

@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="sundtek-mediatv"
 PKG_VERSION="7.0"
@@ -8,7 +9,7 @@ PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"
 PKG_URL=""
-PKG_DEPENDS_TARGET=""
+PKG_DEPENDS_TARGET="xmlstarlet:host p7zip:host"
 PKG_SECTION="driver/dvb"
 PKG_SHORTDESC="Sundtek MediaTV: a Linux driver to add support for SUNDTEK USB DVB devices"
 PKG_LONGDESC="Install this to add support for Sundtek USB DVB devices."

packages/addons/script/script.config.vdr/package.mk

@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="script.config.vdr"
 PKG_VERSION="0345a2a3b98de48cbbaf77768ca6c9289f531e2b"
@@ -9,7 +10,7 @@ PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="https://libreelec.tv"
 PKG_URL="https://github.com/LibreELEC/script.config.vdr/archive/$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET=""
+PKG_DEPENDS_TARGET="xmlstarlet:host p7zip:host"
 PKG_SECTION=""
 PKG_SHORTDESC="script.config.vdr"
 PKG_LONGDESC="script.config.vdr"

packages/linux-firmware/kernel-firmware/package.mk

@@ -8,7 +8,6 @@ PKG_LICENSE="other"
 PKG_SITE="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/"
 PKG_URL="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/$PKG_VERSION.tar.gz"
 PKG_NEED_UNPACK="${PROJECT_DIR}/${PROJECT}/packages/${PKG_NAME} ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/packages/${PKG_NAME}"
-PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="kernel-firmware: kernel related firmware"
 PKG_TOOLCHAIN="manual"
 

packages/mediacenter/kodi-binary-addons/audiodecoder.timidity/package.mk

@@ -22,5 +22,5 @@ addon() {
   install_binary_addon $PKG_ADDON_ID
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
-    cp -P $PKG_BUILD/.$TARGET_NAME/lib/timidity/libtimidity.so $ADDON_BUILD/$PKG_ADDON_ID/
+    cp -P $PKG_BUILD/.$TARGET_NAME/lib/timidity/libtimidity_*.so $ADDON_BUILD/$PKG_ADDON_ID/
 }

packages/network/wireless-regdb/package.mk

@@ -8,6 +8,5 @@ PKG_SHA256="cd917ed86b63ce8d93947979f1f18948f03a4ac0ad89ec25227b36ac00dc54bf"
 PKG_LICENSE="GPL"
 PKG_SITE="http://wireless.kernel.org/en/developers/Regulatory"
 PKG_URL="https://www.kernel.org/pub/software/network/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="wireless-regdb is a regulatory database"
 PKG_TOOLCHAIN="manual"

scripts/install_addon

@@ -5,11 +5,22 @@
 
 . config/options "${1}"
 
+pkg_lock "${PKG_NAME}" "packadd"
+pkg_lock_status "ACTIVE" "${PKG_NAME}" "packadd"
+
+# cleanup old install path
+rm -rf "${ADDON_BUILD}"
+
+# install addon parts
+if pkg_call_exists addon; then
+  pkg_call addon
+else
+  install_binary_addon "${PKG_ADDON_ID}"
+fi
+
 # Make sure we have a value for STRIP
 setup_toolchain target
 
-[ -n "${2}" ] && PKG_ADDON_ID=${2}
-
 ADDON_DIRECTORY="${ADDON_BUILD}/${PKG_ADDON_ID}"
 
 install_addon_files "${ADDON_DIRECTORY}"
@@ -25,6 +36,7 @@ if [ -f ${ADDON_INSTALL_DIR}/${PKG_ADDON_ID}-${ADDONVER}.zip ]; then
     rm ${ADDON_INSTALL_DIR}/${PKG_ADDON_ID}-${ADDONVER}.zip
   else
     build_msg "CLR_WARNING" "*** WARNING: ${PKG_ADDON_ID}-${ADDONVER}.zip already exists. Not overwriting it. ***"
+    pkg_lock_status "UNLOCK" "${PKG_NAME}" "packadd" "already packed"
     exit 0
   fi
 fi
@@ -74,3 +86,5 @@ if [ "${ADDON_JENKINS}" = "yes" ]; then
 else
   build_msg "CLR_INFO" "*** creating  ${PKG_ADDON_ID} complete ***"
 fi
+
+pkg_lock_status "UNLOCK" "${PKG_NAME}" "packadd" "packed"