Merge pull request #3621 from MilhouseVH/le10_unpack_should_unpack

buildsystem: small unpack improvements
This commit is contained in:
Christian Hewitt 2019-07-03 05:13:13 +01:00 committed by GitHub
commit 87149455e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions

View File

@ -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

View File

@ -17,9 +17,11 @@ PARENT_PKG="${2:-${PKG_NAME}}"
pkg_lock "${PKG_NAME}" "unpack" "${PARENT_PKG}"
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"
@ -49,6 +51,10 @@ if [ -f "${STAMP}" ]; then
exit 0
fi
pkg_lock_status "ACTIVE" "${PKG_NAME}" "unpack"
${SCRIPTS}/get "${PKG_NAME}"
if [ -d "${SOURCES}/${PKG_NAME}" -o -d "${PKG_DIR}/sources" ]; then
build_msg "CLR_UNPACK" "UNPACK" "${PKG_NAME}" "indent"