3 files changed, 7 insertions, 2 deletions

diff --git a/classes/populate_b2qt_sdk.bbclass b/classes/populate_b2qt_sdk.bbclass
index 5bd0902..fc64842 100644
--- a/classes/populate_b2qt_sdk.bbclass
+++ b/classes/populate_b2qt_sdk.bbclass
@@ -46,6 +46,8 @@ replace_sysroot_symlink() {
         done
 }
 
+do_populate_sysroot[depends] += "p7zip-native:do_populate_sysroot"
+
 fakeroot tar_sdk_sdkmingw32() {
         replace_sysroot_symlink ${SDK_OUTPUT}${SDKTARGETSYSROOT} ${SDK_OUTPUT}${SDKTARGETSYSROOT}
         replace_sysroot_symlink ${SDK_OUTPUT}${SDKPATHNATIVE} ${SDK_OUTPUT}${SDKPATHNATIVE}
diff --git a/classes/qbsp-image.bbclass b/classes/qbsp-image.bbclass
index 9ea3cd8..b8da767 100644
--- a/classes/qbsp-image.bbclass
+++ b/classes/qbsp-image.bbclass
@@ -29,6 +29,8 @@
 
 QBSP_IMAGE_CONTENT ??= ""
 
+do_image_complete[depends] += "p7zip-native:do_populate_sysroot"
+
 fakeroot do_qbsp_image () {
     if [ -z "${QBSP_IMAGE_CONTENT}" ]; then
         exit 0
diff --git a/classes/qbsp.bbclass b/classes/qbsp.bbclass
index 2dd42d0..8beb55f 100644
--- a/classes/qbsp.bbclass
+++ b/classes/qbsp.bbclass
@@ -42,13 +42,14 @@ SRC_URI = "\
 
 INHIBIT_DEFAULT_DEPS = "1"
 do_qbsp[depends] += "\
+    p7zip-native:do_populate_sysroot \
     installer-framework:do_populate_sysroot \
     ${QBSP_SDK_TASK}:do_populate_sdk \
     ${QBSP_IMAGE_TASK}:do_image_complete \
     "
 
 QBSP_VERSION ?= "${PV}${VERSION_AUTO_INCREMENT}"
-QBSP_INSTALLER_COMPONENT ?= "${MACHINE}"
+QBSP_INSTALLER_COMPONENT ?= "${@d.getVar('MACHINE', True).replace('-','')}"
 QBSP_INSTALL_PATH ?= "/Extras/${MACHINE}"
 
 QBSP_LICENSE_FILE ?= ""
@@ -122,7 +123,7 @@ prepare_qbsp() {
     patch_installer_files ${COMPONENT_PATH}/meta
 
     mkdir -p ${B}/images/${QBSP_INSTALL_PATH}/images
-    7zr x ${IMGDEPLOYDIR}/${IMAGE_PACKAGE} -o${B}/images/${QBSP_INSTALL_PATH}/images/
+    7zr x ${DEPLOY_DIR_IMAGE}/${IMAGE_PACKAGE} -o${B}/images/${QBSP_INSTALL_PATH}/images/
 
     cd ${B}/images
     7zr a ${COMPONENT_PATH}/data/image.7z *