diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2019-01-29 09:41:15 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-01-29 08:02:04 +0000 |
commit | e2e0faabe64b922df8865ca1df23768ebc3b1fcf (patch) | |
tree | cd3ce4fb3af1b0225c361074fd7cdc85f7f3c6c6 | |
parent | 6210fb49bc0c64fdb66590eaf49019ee6e3e8a2c (diff) | |
download | meta-boot2qt-e2e0faabe64b922df8865ca1df23768ebc3b1fcf.tar.gz |
Use 7za instead of 7zr in bbclasses
7zr is no longer built by default, so use 7za instead.
Change-Id: I413017a38f0d18c29316442a2414cfeff9609d2c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r-- | meta-boot2qt/classes/populate_b2qt_sdk.bbclass | 2 | ||||
-rw-r--r-- | meta-boot2qt/classes/qbsp-image.bbclass | 2 | ||||
-rw-r--r-- | meta-boot2qt/classes/qbsp.bbclass | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/meta-boot2qt/classes/populate_b2qt_sdk.bbclass b/meta-boot2qt/classes/populate_b2qt_sdk.bbclass index ad863da..ff4b677 100644 --- a/meta-boot2qt/classes/populate_b2qt_sdk.bbclass +++ b/meta-boot2qt/classes/populate_b2qt_sdk.bbclass | |||
@@ -57,6 +57,6 @@ fakeroot tar_sdk_sdkmingw32() { | |||
57 | if [ -e ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z ]; then | 57 | if [ -e ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z ]; then |
58 | rm ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z | 58 | rm ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z |
59 | fi | 59 | fi |
60 | 7zr a ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z * | 60 | 7za a ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z * |
61 | } | 61 | } |
62 | 62 | ||
diff --git a/meta-boot2qt/classes/qbsp-image.bbclass b/meta-boot2qt/classes/qbsp-image.bbclass index 71d1d45..4255194 100644 --- a/meta-boot2qt/classes/qbsp-image.bbclass +++ b/meta-boot2qt/classes/qbsp-image.bbclass | |||
@@ -53,7 +53,7 @@ fakeroot do_qbsp_image () { | |||
53 | done | 53 | done |
54 | 54 | ||
55 | cd ${S}/qbsp | 55 | cd ${S}/qbsp |
56 | 7zr a ${IMGDEPLOYDIR}/${IMAGE_NAME}.7z . | 56 | 7za a ${IMGDEPLOYDIR}/${IMAGE_NAME}.7z . |
57 | 57 | ||
58 | rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.7z | 58 | rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.7z |
59 | ln -s ${IMAGE_NAME}.7z ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.7z | 59 | ln -s ${IMAGE_NAME}.7z ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.7z |
diff --git a/meta-boot2qt/classes/qbsp.bbclass b/meta-boot2qt/classes/qbsp.bbclass index d61e12b..c5916ce 100644 --- a/meta-boot2qt/classes/qbsp.bbclass +++ b/meta-boot2qt/classes/qbsp.bbclass | |||
@@ -109,13 +109,13 @@ prepare_qbsp() { | |||
109 | 109 | ||
110 | mkdir -p ${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain | 110 | mkdir -p ${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain |
111 | if [ "${SDK_POSTFIX}" = "7z" ]; then | 111 | if [ "${SDK_POSTFIX}" = "7z" ]; then |
112 | 7zr x ${DEPLOY_DIR}/sdk/${SDK_NAME} -o${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain/ | 112 | 7za x ${DEPLOY_DIR}/sdk/${SDK_NAME} -o${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain/ |
113 | else | 113 | else |
114 | cp ${DEPLOY_DIR}/sdk/${SDK_NAME} ${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain/ | 114 | cp ${DEPLOY_DIR}/sdk/${SDK_NAME} ${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain/ |
115 | fi | 115 | fi |
116 | 116 | ||
117 | cd ${B}/toolchain | 117 | cd ${B}/toolchain |
118 | 7zr a ${COMPONENT_PATH}/data/toolchain.7z * | 118 | 7za a ${COMPONENT_PATH}/data/toolchain.7z * |
119 | 119 | ||
120 | # Image component | 120 | # Image component |
121 | COMPONENT_PATH="${B}/pkg/${QBSP_INSTALLER_COMPONENT}.system" | 121 | COMPONENT_PATH="${B}/pkg/${QBSP_INSTALLER_COMPONENT}.system" |
@@ -126,10 +126,10 @@ prepare_qbsp() { | |||
126 | patch_installer_files ${COMPONENT_PATH}/meta | 126 | patch_installer_files ${COMPONENT_PATH}/meta |
127 | 127 | ||
128 | mkdir -p ${B}/images/${QBSP_INSTALL_PATH}/images | 128 | mkdir -p ${B}/images/${QBSP_INSTALL_PATH}/images |
129 | 7zr x ${DEPLOY_DIR_IMAGE}/${IMAGE_PACKAGE} -o${B}/images/${QBSP_INSTALL_PATH}/images/ | 129 | 7za x ${DEPLOY_DIR_IMAGE}/${IMAGE_PACKAGE} -o${B}/images/${QBSP_INSTALL_PATH}/images/ |
130 | 130 | ||
131 | cd ${B}/images | 131 | cd ${B}/images |
132 | 7zr a ${COMPONENT_PATH}/data/image.7z * | 132 | 7za a ${COMPONENT_PATH}/data/image.7z * |
133 | 133 | ||
134 | # License component | 134 | # License component |
135 | if [ -n "${QBSP_LICENSE_FILE}" ]; then | 135 | if [ -n "${QBSP_LICENSE_FILE}" ]; then |
@@ -160,7 +160,7 @@ create_qbsp() { | |||
160 | rm -f ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}-${PV}.qbsp | 160 | rm -f ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}-${PV}.qbsp |
161 | 161 | ||
162 | cd ${B}/repository | 162 | cd ${B}/repository |
163 | 7zr a ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}-${PV}.qbsp * | 163 | 7za a ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}-${PV}.qbsp * |
164 | } | 164 | } |
165 | 165 | ||
166 | python do_qbsp() { | 166 | python do_qbsp() { |