MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

meta: support tar.zst SDK_ARCHIVE_TYPE

Browse Source 
zst is much faster than the default xz, test result on my Precision
5680 machine:

Installing a tar.xz SDK takes 37 seconds while tar.zst only takes 17
seconds.

Let's introduce support for tar.zst.

Also add a sanity check for supported archive types.

(From OE-Core rev: 1d22562a89e91f19b818b8f9bc214be941303980)

Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ming Liu 2024-10-27 11:43:18 +01:00 committed by Richard Purdie
parent afc74c1e17
commit d296b21d56
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meta/classes-recipe/populate_sdk_base.bbclass
View File

@ -84,6 +84,7 @@ SDK_XZ_OPTIONS ?= "${XZ_DEFAULTS} ${SDK_XZ_COMPRESSION_LEVEL}"
SDK_ZIP_OPTIONS ?= "-y"
SDK_7ZIP_OPTIONS ?= "-mx=9 -mm=BZip2"
SDK_7ZIP_TYPE ?= "7z"
SDK_ZSTD_COMPRESSION_LEVEL = "-17"
# To support different sdk type according to SDK_ARCHIVE_TYPE, now support zip and tar.xz
python () {
@ -95,9 +96,16 @@ python () {
elif d.getVar('SDK_ARCHIVE_TYPE') == '7zip':
d.setVar('SDK_ARCHIVE_DEPENDS', 'p7zip-native')
d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; 7za a -r ${SDK_7ZIP_OPTIONS} ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_7ZIP_TYPE} .')
else:
elif d.getVar('SDK_ARCHIVE_TYPE') == 'tar.zst':
d.setVar('SDK_ARCHIVE_DEPENDS', 'zstd-native')
d.setVar('SDK_ARCHIVE_CMD',
'cd ${SDK_OUTPUT}/${SDKPATH}; tar ${SDKTAROPTS} -cf - . | zstd -f -k -T0 -c ${SDK_ZSTD_COMPRESSION_LEVEL} > ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE}')
elif d.getVar('SDK_ARCHIVE_TYPE') == 'tar.xz':
d.setVar('SDK_ARCHIVE_DEPENDS', 'xz-native')
d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; tar ${SDKTAROPTS} -cf - . | xz ${SDK_XZ_OPTIONS} > ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE}')
d.setVar('SDK_ARCHIVE_CMD',
'cd ${SDK_OUTPUT}/${SDKPATH}; tar ${SDKTAROPTS} -cf - . | xz ${SDK_XZ_OPTIONS} > ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE}')
else:
bb.fatal("Invalid SDK_ARCHIVE_TYPE: %s, the supported SDK archive types are: zip, 7z, tar.xz, tar.zst" % d.getVar('SDK_ARCHIVE_TYPE'))
}
SDK_RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"

6
meta/files/toolchain-shar-extract.sh
View File

@ -255,6 +255,12 @@ if [ @SDK_ARCHIVE_TYPE@ = "zip" ]; then
else
rm sdk.zip && exit 1
fi
elif [ @SDK_ARCHIVE_TYPE@ = "tar.zst" ]; then
if [ -z "$(command -v zstd)" ]; then
echo "Aborted, zstd is required to extract the SDK archive, please make sure it's installed on your system!"
exit 1
fi
tail -n +$payload_offset "$0"| zstd -T0 -dc | $SUDO_EXEC tar mx -C $target_sdk_dir --checkpoint=.2500 $EXTRA_TAR_OPTIONS || exit 1
else
if [ -z "$(command -v xz)" ]; then
echo "Aborted, xz is required to extract the SDK archive, please make sure it's installed on your system!"