From 3e8a33500dc2442871a938afb83cd4f425e54a9c Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 18 Dec 2019 08:27:48 +0000 Subject: [PATCH 1/8] buildsystem: "set -e" error handling not working for addon builds --- config/multithread | 28 +--------------------------- scripts/install_addon | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 29 deletions(-) diff --git a/config/multithread b/config/multithread index ca30caf7a6..4d7e848fdf 100644 --- a/config/multithread +++ b/config/multithread @@ -66,33 +66,7 @@ package_worker() { if [ "${isaddon}" = "yes" -a "${istarget}" = "yes" ]; then if [ ${result} -eq 0 ]; then - ( - 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 + ${SCRIPTS}/install_addon ${pkgname} 2>&1 && result=0 || result=1 fi if [ ${result} -ne 0 ]; then diff --git a/scripts/install_addon b/scripts/install_addon index c6d006676e..91033bccdc 100755 --- a/scripts/install_addon +++ b/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" From f1612894bc619adaa9da766b73d8d641c65f4ff1 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 19 Dec 2019 03:51:41 +0000 Subject: [PATCH 2/8] i2c-tools: fix cpython ABI on py-smbus library --- .../addon-depends/system-tools-depends/i2c-tools/package.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/addons/addon-depends/system-tools-depends/i2c-tools/package.mk b/packages/addons/addon-depends/system-tools-depends/i2c-tools/package.mk index c476d6e29e..dae6680c61 100644 --- a/packages/addons/addon-depends/system-tools-depends/i2c-tools/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/i2c-tools/package.mk @@ -21,6 +21,8 @@ make_target() { AR="$TARGET_AR" \ CFLAGS="$TARGET_CFLAGS" \ CPPFLAGS="$TARGET_CPPFLAGS -I${SYSROOT_PREFIX}/usr/include/$PKG_PYTHON_VERSION" + + python_fix_abi . } makeinstall_target() { From 03cc0e09f644c9697993ade019258eece63dd406 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 19 Dec 2019 04:06:52 +0000 Subject: [PATCH 3/8] audiodecoder.timidity: shared library has changed name --- .../kodi-binary-addons/audiodecoder.timidity/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.timidity/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.timidity/package.mk index 0ed8c4fff3..e806393a39 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.timidity/package.mk +++ b/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/ } From 7a14386f0799e307ef4cba451fc50c17aeeff250 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sat, 21 Dec 2019 23:14:38 +0000 Subject: [PATCH 4/8] Python3: need util-linux for uuid/uuid.h --- packages/lang/Python3/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/lang/Python3/package.mk b/packages/lang/Python3/package.mk index 93fc87ad12..1a6cb45915 100644 --- a/packages/lang/Python3/package.mk +++ b/packages/lang/Python3/package.mk @@ -9,7 +9,7 @@ PKG_LICENSE="OSS" PKG_SITE="http://www.python.org/" PKG_URL="http://www.python.org/ftp/python/$PKG_VERSION/${PKG_NAME::-1}-$PKG_VERSION.tar.xz" PKG_DEPENDS_HOST="zlib:host bzip2:host libffi:host util-linux:host xz:host" -PKG_DEPENDS_TARGET="toolchain Python3:host sqlite expat zlib bzip2 xz openssl libffi readline ncurses" +PKG_DEPENDS_TARGET="toolchain Python3:host sqlite expat zlib bzip2 xz openssl libffi readline ncurses util-linux" PKG_LONGDESC="Python3 is an interpreted object-oriented programming language." PKG_TOOLCHAIN="autotools" From 6b1423ee190b164e381ba0b0c0704e8ca8f0f632 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 19 Dec 2019 00:12:05 +0000 Subject: [PATCH 5/8] wireless-regdb: has no dependencies --- packages/network/wireless-regdb/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/network/wireless-regdb/package.mk b/packages/network/wireless-regdb/package.mk index 0767c4da1f..5e9dd1da3e 100644 --- a/packages/network/wireless-regdb/package.mk +++ b/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" From 54f23276d5a7c41373ed826688c2734676c8c5ab Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 19 Dec 2019 00:14:57 +0000 Subject: [PATCH 6/8] kernel-firmware: has no dependencies --- packages/linux-firmware/kernel-firmware/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/linux-firmware/kernel-firmware/package.mk b/packages/linux-firmware/kernel-firmware/package.mk index a80ac061df..d7f04aba36 100644 --- a/packages/linux-firmware/kernel-firmware/package.mk +++ b/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" From bbd14838a0672bee238966ec476b3994da8f75dd Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 25 Dec 2019 20:03:11 +0000 Subject: [PATCH 7/8] script.config.vdr: needs xmlstarlet --- packages/addons/script/script.config.vdr/package.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/addons/script/script.config.vdr/package.mk b/packages/addons/script/script.config.vdr/package.mk index f43f44c82a..25d807be4c 100644 --- a/packages/addons/script/script.config.vdr/package.mk +++ b/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" PKG_SECTION="" PKG_SHORTDESC="script.config.vdr" PKG_LONGDESC="script.config.vdr" From 075c0350d36495a82658722b08e4ac0c88d04947 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 25 Dec 2019 20:03:31 +0000 Subject: [PATCH 8/8] sundtek-mediatv: needs xmlstarlet --- packages/addons/driver/sundtek-mediatv/package.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/addons/driver/sundtek-mediatv/package.mk b/packages/addons/driver/sundtek-mediatv/package.mk index c7e33f07fc..8edfcb14d6 100644 --- a/packages/addons/driver/sundtek-mediatv/package.mk +++ b/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" 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."