From 3facec5d919e521983a8aee47b7a991705ea7584 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Sat, 29 Jun 2019 11:06:42 +0100
Subject: [PATCH 1/2] 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}

From d43171067818f5560df612a7fb12ed7e123d6e63 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Sat, 29 Jun 2019 11:07:51 +0100
Subject: [PATCH 2/2] buildsystem: scripts/unpack becomes ACTIVE after clean

---
 scripts/unpack | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/unpack b/scripts/unpack
index 0a8a62dbfc..d3aa480329 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -17,10 +17,6 @@ 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}"
@@ -55,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"