diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-12-27 16:11:52 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-01-02 06:41:43 +0000 |
commit | 7f56f11cefe2fd258e2ba53d0bae098613457d66 (patch) | |
tree | dd64ce73243405ce48f404ce40497cc5075f7713 | |
parent | 0303ce3b821d1402c856fd637ef51d8bc3af04bf (diff) | |
download | meta-boot2qt-7f56f11cefe2fd258e2ba53d0bae098613457d66.tar.gz |
Use 7zr instead of the full 7z binary
7zr is already available is some distros without need to install
additional utils.
Change-Id: Iabcbf98b3db66d04ab7c16b3316d6ff309ec90cc
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r-- | classes/populate_b2qt_sdk.bbclass | 2 | ||||
-rw-r--r-- | classes/qbsp-image.bbclass | 2 | ||||
-rw-r--r-- | classes/qbsp.bbclass | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/classes/populate_b2qt_sdk.bbclass b/classes/populate_b2qt_sdk.bbclass index 2902f96..5bd0902 100644 --- a/classes/populate_b2qt_sdk.bbclass +++ b/classes/populate_b2qt_sdk.bbclass | |||
@@ -55,6 +55,6 @@ fakeroot tar_sdk_sdkmingw32() { | |||
55 | if [ -e ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z ]; then | 55 | if [ -e ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z ]; then |
56 | rm ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z | 56 | rm ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z |
57 | fi | 57 | fi |
58 | 7z a ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z sysroots | 58 | 7zr a ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z sysroots |
59 | } | 59 | } |
60 | 60 | ||
diff --git a/classes/qbsp-image.bbclass b/classes/qbsp-image.bbclass index c80aa23..13fb365 100644 --- a/classes/qbsp-image.bbclass +++ b/classes/qbsp-image.bbclass | |||
@@ -44,7 +44,7 @@ fakeroot do_qbsp_image () { | |||
44 | done | 44 | done |
45 | 45 | ||
46 | cd ${S}/qbsp | 46 | cd ${S}/qbsp |
47 | 7z a ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.7z . | 47 | 7zr a ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.7z . |
48 | 48 | ||
49 | rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.7z | 49 | rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.7z |
50 | ln -s ${IMAGE_NAME}.7z ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.7z | 50 | ln -s ${IMAGE_NAME}.7z ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.7z |
diff --git a/classes/qbsp.bbclass b/classes/qbsp.bbclass index 3216edb..a13db65 100644 --- a/classes/qbsp.bbclass +++ b/classes/qbsp.bbclass | |||
@@ -105,13 +105,13 @@ prepare_qbsp() { | |||
105 | 105 | ||
106 | mkdir -p ${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain | 106 | mkdir -p ${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain |
107 | if [ "${SDK_POSTFIX}" = "7z" ]; then | 107 | if [ "${SDK_POSTFIX}" = "7z" ]; then |
108 | 7z x ${DEPLOY_DIR}/sdk/${SDK_NAME} -o${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain/ | 108 | 7zr x ${DEPLOY_DIR}/sdk/${SDK_NAME} -o${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain/ |
109 | else | 109 | else |
110 | cp ${DEPLOY_DIR}/sdk/${SDK_NAME} ${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain/ | 110 | cp ${DEPLOY_DIR}/sdk/${SDK_NAME} ${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain/ |
111 | fi | 111 | fi |
112 | 112 | ||
113 | cd ${B}/toolchain | 113 | cd ${B}/toolchain |
114 | 7z a ${COMPONENT_PATH}/data/toolchain.7z * | 114 | 7zr a ${COMPONENT_PATH}/data/toolchain.7z * |
115 | 115 | ||
116 | # Image component | 116 | # Image component |
117 | COMPONENT_PATH="${B}/pkg/${QBSP_INSTALLER_COMPONENT}.system" | 117 | COMPONENT_PATH="${B}/pkg/${QBSP_INSTALLER_COMPONENT}.system" |
@@ -122,10 +122,10 @@ prepare_qbsp() { | |||
122 | patch_installer_files ${COMPONENT_PATH}/meta | 122 | patch_installer_files ${COMPONENT_PATH}/meta |
123 | 123 | ||
124 | mkdir -p ${B}/images/${QBSP_INSTALL_PATH}/images | 124 | mkdir -p ${B}/images/${QBSP_INSTALL_PATH}/images |
125 | 7z x ${DEPLOY_DIR_IMAGE}/${IMAGE_PACKAGE} -o${B}/images/${QBSP_INSTALL_PATH}/images/ | 125 | 7zr x ${DEPLOY_DIR_IMAGE}/${IMAGE_PACKAGE} -o${B}/images/${QBSP_INSTALL_PATH}/images/ |
126 | 126 | ||
127 | cd ${B}/images | 127 | cd ${B}/images |
128 | 7z a ${COMPONENT_PATH}/data/image.7z * | 128 | 7zr a ${COMPONENT_PATH}/data/image.7z * |
129 | 129 | ||
130 | # License component | 130 | # License component |
131 | if [ -n "${QBSP_LICENSE_FILE}" ]; then | 131 | if [ -n "${QBSP_LICENSE_FILE}" ]; then |
@@ -155,7 +155,7 @@ create_qbsp() { | |||
155 | rm -f ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}.qbsp | 155 | rm -f ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}.qbsp |
156 | 156 | ||
157 | cd ${B}/repository | 157 | cd ${B}/repository |
158 | 7z a ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}.qbsp * | 158 | 7zr a ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}.qbsp * |
159 | } | 159 | } |
160 | 160 | ||
161 | python do_qbsp() { | 161 | python do_qbsp() { |