diff options
| -rw-r--r-- | meta/classes-recipe/populate_sdk_base.bbclass | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes-recipe/populate_sdk_base.bbclass b/meta/classes-recipe/populate_sdk_base.bbclass index 64a4a58bef..917619962c 100644 --- a/meta/classes-recipe/populate_sdk_base.bbclass +++ b/meta/classes-recipe/populate_sdk_base.bbclass | |||
| @@ -74,6 +74,8 @@ TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${SDK_VERSION}" | |||
| 74 | SDK_ARCHIVE_TYPE ?= "tar.xz" | 74 | SDK_ARCHIVE_TYPE ?= "tar.xz" |
| 75 | SDK_XZ_COMPRESSION_LEVEL ?= "-9" | 75 | SDK_XZ_COMPRESSION_LEVEL ?= "-9" |
| 76 | SDK_XZ_OPTIONS ?= "${XZ_DEFAULTS} ${SDK_XZ_COMPRESSION_LEVEL}" | 76 | SDK_XZ_OPTIONS ?= "${XZ_DEFAULTS} ${SDK_XZ_COMPRESSION_LEVEL}" |
| 77 | SDK_ZIP_OPTIONS ?= "-y" | ||
| 78 | |||
| 77 | 79 | ||
| 78 | # To support different sdk type according to SDK_ARCHIVE_TYPE, now support zip and tar.xz | 80 | # To support different sdk type according to SDK_ARCHIVE_TYPE, now support zip and tar.xz |
| 79 | python () { | 81 | python () { |
| @@ -81,7 +83,7 @@ python () { | |||
| 81 | d.setVar('SDK_ARCHIVE_DEPENDS', 'zip-native') | 83 | d.setVar('SDK_ARCHIVE_DEPENDS', 'zip-native') |
| 82 | # SDK_ARCHIVE_CMD used to generate archived sdk ${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE} from input dir ${SDK_OUTPUT}/${SDKPATH} to output dir ${SDKDEPLOYDIR} | 84 | # SDK_ARCHIVE_CMD used to generate archived sdk ${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE} from input dir ${SDK_OUTPUT}/${SDKPATH} to output dir ${SDKDEPLOYDIR} |
| 83 | # recommand to cd into input dir first to avoid archive with buildpath | 85 | # recommand to cd into input dir first to avoid archive with buildpath |
| 84 | d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; zip -r -y ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE} .') | 86 | d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; zip -r ${SDK_ZIP_OPTIONS} ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE} .') |
| 85 | else: | 87 | else: |
| 86 | d.setVar('SDK_ARCHIVE_DEPENDS', 'xz-native') | 88 | d.setVar('SDK_ARCHIVE_DEPENDS', 'xz-native') |
| 87 | d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; tar ${SDKTAROPTS} -cf - . | xz ${SDK_XZ_OPTIONS} > ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE}') | 89 | d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; tar ${SDKTAROPTS} -cf - . | xz ${SDK_XZ_OPTIONS} > ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE}') |
