diff options
author | Christoph Lauer <christoph.lauer@xtronic.de> | 2023-04-23 10:12:04 +0200 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2023-05-03 04:09:42 -1000 |
commit | 38f85fe6ddea1e88897c2a95d6f661c1f822009e (patch) | |
tree | ef9ef0db1c9c1552bb9cea82429cc6c54be92c55 | |
parent | 62034cd62590ea783f28b0a819f4a2039931bbbb (diff) | |
download | poky-38f85fe6ddea1e88897c2a95d6f661c1f822009e.tar.gz |
populate_sdk_base: add zip options
Add SDK_ZIP_OPTIONS to remove symbolic link creation in zip archive or add options, e.g. for encryption of the zip archive.
(From OE-Core rev: 04b62f9459b401c276255f166d0738b6f902a576)
(From OE-Core rev: b9e0c3ced645cab74b2488a26b8f656a94b2a6f5)
Signed-off-by: Christoph Lauer <christoph.lauer@xtronic.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 396792f0f7..49fdfaa93d 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass | |||
@@ -51,6 +51,8 @@ TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${SDK_VERSION}" | |||
51 | SDK_ARCHIVE_TYPE ?= "tar.xz" | 51 | SDK_ARCHIVE_TYPE ?= "tar.xz" |
52 | SDK_XZ_COMPRESSION_LEVEL ?= "-9" | 52 | SDK_XZ_COMPRESSION_LEVEL ?= "-9" |
53 | SDK_XZ_OPTIONS ?= "${XZ_DEFAULTS} ${SDK_XZ_COMPRESSION_LEVEL}" | 53 | SDK_XZ_OPTIONS ?= "${XZ_DEFAULTS} ${SDK_XZ_COMPRESSION_LEVEL}" |
54 | SDK_ZIP_OPTIONS ?= "-y" | ||
55 | |||
54 | 56 | ||
55 | # To support different sdk type according to SDK_ARCHIVE_TYPE, now support zip and tar.xz | 57 | # To support different sdk type according to SDK_ARCHIVE_TYPE, now support zip and tar.xz |
56 | python () { | 58 | python () { |
@@ -58,7 +60,7 @@ python () { | |||
58 | d.setVar('SDK_ARCHIVE_DEPENDS', 'zip-native') | 60 | d.setVar('SDK_ARCHIVE_DEPENDS', 'zip-native') |
59 | # SDK_ARCHIVE_CMD used to generate archived sdk ${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE} from input dir ${SDK_OUTPUT}/${SDKPATH} to output dir ${SDKDEPLOYDIR} | 61 | # SDK_ARCHIVE_CMD used to generate archived sdk ${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE} from input dir ${SDK_OUTPUT}/${SDKPATH} to output dir ${SDKDEPLOYDIR} |
60 | # recommand to cd into input dir first to avoid archive with buildpath | 62 | # recommand to cd into input dir first to avoid archive with buildpath |
61 | d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; zip -r -y ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE} .') | 63 | d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; zip -r ${SDK_ZIP_OPTIONS} ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE} .') |
62 | else: | 64 | else: |
63 | d.setVar('SDK_ARCHIVE_DEPENDS', 'xz-native') | 65 | d.setVar('SDK_ARCHIVE_DEPENDS', 'xz-native') |
64 | d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; tar ${SDKTAROPTS} -cf - . | xz ${SDK_XZ_OPTIONS} > ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE}') | 66 | d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; tar ${SDKTAROPTS} -cf - . | xz ${SDK_XZ_OPTIONS} > ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE}') |