1 files changed, 3 insertions, 2 deletions

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 *