From e76f0a39c0afc633f674daac9ea28839c02da020 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sat, 29 Jun 2019 11:06:42 +0100 Subject: [PATCH] buildsystem: unpack should recursively unpack, not build --- scripts/build | 5 ----- scripts/unpack | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/build b/scripts/build index c8592f6717..f8e2aa9db7 100755 --- a/scripts/build +++ b/scripts/build @@ -53,11 +53,6 @@ if [ -f ${STAMP} ]; then rm -f ${STAMP} fi -if [ -n "${PKG_DEPENDS_UNPACK}" ]; then - for p in ${PKG_DEPENDS_UNPACK}; do - ${SCRIPTS}/unpack "${p}" "${PARENT_PKG}" - done -fi ${SCRIPTS}/unpack "${PKG_NAME}" "${PARENT_PKG}" # build dependencies, only when PKG_DEPENDS_? is filled diff --git a/scripts/unpack b/scripts/unpack index 2224e8f4e3..0a8a62dbfc 100755 --- a/scripts/unpack +++ b/scripts/unpack @@ -21,6 +21,12 @@ pkg_lock_status "ACTIVE" "${PKG_NAME}" "unpack" ${SCRIPTS}/get "${PKG_NAME}" +if [ -n "${PKG_DEPENDS_UNPACK}" ]; then + for p in ${PKG_DEPENDS_UNPACK}; do + ${SCRIPTS}/unpack "${p}" "${PARENT_PKG}" + done +fi + STAMP="${PKG_BUILD}/.libreelec-unpack" mkdir -p ${BUILD}